From d1cb09e7a23e7221b6c090ad33e4481a5b79f615 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 29 十一月 2023 17:44:29 +0800
Subject: [PATCH] 出入库报表搜索增加几个字段

---
 controllers/reorder_rule_controller.go |   92 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 84 insertions(+), 8 deletions(-)

diff --git a/controllers/reorder_rule_controller.go b/controllers/reorder_rule_controller.go
index 0c04e43..13002bd 100644
--- a/controllers/reorder_rule_controller.go
+++ b/controllers/reorder_rule_controller.go
@@ -3,15 +3,21 @@
 import (
 	"github.com/gin-gonic/gin"
 	"github.com/shopspring/decimal"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
+	"wms/conf"
 	"wms/constvar"
 	"wms/extend/code"
 	"wms/extend/util"
 	"wms/models"
+	"wms/pkg/logx"
 	"wms/pkg/timex"
+	"wms/proto/inventory_order"
+	"wms/proto/purchase_wms"
 	"wms/request"
 )
 
@@ -114,7 +120,7 @@
 		rule.Prediction = rule.Amount.Add(rule.Prediction)
 	}
 	//鍑哄簱灏辩华
-	operationType = []constvar.BaseOperationType{constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeInternal}
+	operationType = []constvar.BaseOperationType{constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeInternal, constvar.BaseOperationTypeDisuse}
 	amount, err = GetProductAmount(productIds, nil, locationIds, status, operationType)
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鏌ヨ閲嶈璐ц鍒欏垪琛ㄥけ璐�")
@@ -216,7 +222,7 @@
 	}
 	prediction = amount.Add(prediction)
 	//鍑哄簱灏辩华
-	operationType = []constvar.BaseOperationType{constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeInternal}
+	operationType = []constvar.BaseOperationType{constvar.BaseOperationTypeOutgoing, constvar.BaseOperationTypeInternal, constvar.BaseOperationTypeDisuse}
 	list, err = GetProductAmount(productIds, nil, locationIds, status, operationType)
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "鏌ヨ閲嶈璐ц鍒欏垪琛ㄥけ璐�")
@@ -254,6 +260,23 @@
 	util.ResponseFormat(c, code.Success, "鏇存柊鎴愬姛")
 }
 
+var InventoryOrderServiceConn *grpc.ClientConn
+
+func InitInventoryOrderServiceConn() {
+	var err error
+	InventoryOrderServiceConn, err = grpc.Dial(conf.GrpcServerConf.ApsAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	if err != nil {
+		logx.Errorf("grpc dial product service error: %v", err.Error())
+		return
+	}
+}
+
+func CloseInventoryOrderServiceConn() {
+	if InventoryOrderServiceConn != nil {
+		InventoryOrderServiceConn.Close()
+	}
+}
+
 // OrderAgain
 // @Tags      閲嶈璐ц鍒�
 // @Summary   鍐嶈涓�娆�
@@ -267,18 +290,46 @@
 		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
 		return
 	}
+	if params.Route == "閲囪喘" {
+		client := purchase_wms.NewPurchaseServiceClient(PurchaseServiceConn)
+		resp, err := client.GetSupplierListByProductId(c, &purchase_wms.GetSupplierListByProductIdRequest{ProductId: params.ProductId})
+		if err != nil {
+			util.ResponseFormat(c, code.RequestParamError, "grpc璋冪敤澶辫触")
+			return
+		}
+		util.ResponseFormat(c, code.Success, resp.List)
+		return
+	}
+	client := inventory_order.NewInventoryOrderServiceClient(InventoryOrderServiceConn)
+	order, err := client.CreateNewOrder(c, &inventory_order.CreateNewOrderRequest{
+		OrderNumber: params.OrderNumber.IntPart(),
+		Unit:        params.Unit,
+		ProductId:   params.ProductId,
+		Customer:    "WMS鎺ㄩ��",
+	})
+	if err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "grpc璋冪敤澶辫触")
+		return
+	}
+	err = orderAgain(params, order.OrderId)
+	if err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "閲嶈澶辫触")
+		return
+	}
+	util.ResponseFormat(c, code.Success, "閲嶈鎴愬姛")
+}
+
+func orderAgain(params models.ReorderRule, SourceNumber string) error {
 	location, err := models.NewLocationSearch().SetID(params.LocationId).First()
 	if err != nil {
-		util.ResponseFormat(c, code.RequestParamError, "鏌ヨ浣嶇疆淇℃伅澶辫触")
-		return
+		return err
 	}
 	houseCode := strings.Split(location.JointName, "/")[0]
 	var operationType models.OperationType
 	err = models.NewOperationTypeSearch().Orm.Model(&models.OperationType{}).Joins("left join wms_warehouse on wms_job_type.warehouse_id = wms_warehouse.id").
 		Where("wms_job_type.base_operation_type = 1 and wms_warehouse.code = ?", houseCode).First(&operationType).Error
 	if err != nil {
-		util.ResponseFormat(c, code.RequestParamError, "鏌ヨ浣嶇疆淇℃伅澶辫触")
-		return
+		return err
 	}
 	var operation models.Operation
 	var details models.OperationDetails
@@ -294,18 +345,43 @@
 	operation.FromLocationID = 1
 	operation.Number = strconv.FormatInt(time.Now().Unix(), 10)
 	operation.ToLocationID = params.LocationId
+	operation.SourceNumber = SourceNumber
 
 	err = models.WithTransaction(func(db *gorm.DB) error {
 		if err = models.NewOperationSearch().SetOrm(db).Create(&operation); err != nil {
 			return err
 		}
 		params.OrderNumber = decimal.NewFromInt(0)
-		err = models.NewReorderRuleSearch().SetID(params.Id).Update(&params)
+		err = models.NewReorderRuleSearch().SetOrm(db).SetID(params.Id).Update(&params)
 		return err
 	})
+
+	return err
+}
+
+// SubmitOrder
+// @Tags      閲嶈璐ц鍒�
+// @Summary   鍐嶈涓�娆�
+// @Produce   application/json
+// @Param     object  body  models.ReorderRule true  "鍙傛暟"
+// @Success   200 {object} util.Response "鎴愬姛"
+// @Router    /api-wms/v1/reorderRule/submitOrder [post]
+func (slf ReorderRuleController) SubmitOrder(c *gin.Context) {
+	var params models.ReorderRule
+	client := purchase_wms.NewPurchaseServiceClient(PurchaseServiceConn)
+	resp, err := client.CreatePurchaseByWms(c, &purchase_wms.CreatePurchaseByWmsRequest{
+		SupplierId: params.SupplierId,
+		ProductId:  params.ProductId,
+		Amount:     params.OrderNumber.IntPart(),
+		Source:     "APS",
+	})
+	if err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "grpc璋冪敤澶辫触")
+		return
+	}
+	err = orderAgain(params, resp.PurchaseNumber)
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, "閲嶈澶辫触")
 		return
 	}
-	util.ResponseFormat(c, code.Success, "閲嶈鎴愬姛")
 }

--
Gitblit v1.8.0