From a8914a16b23e93f6bfd12bcfd5cbe8b24cf7eb84 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 07 四月 2024 21:49:01 +0800
Subject: [PATCH] 发货支持仓库传参

---
 controllers/reorder_rule_controller.go |  104 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 89 insertions(+), 15 deletions(-)

diff --git a/controllers/reorder_rule_controller.go b/controllers/reorder_rule_controller.go
index 0c04e43..2a42385 100644
--- a/controllers/reorder_rule_controller.go
+++ b/controllers/reorder_rule_controller.go
@@ -12,6 +12,9 @@
 	"wms/extend/util"
 	"wms/models"
 	"wms/pkg/timex"
+	"wms/proto/init_client"
+	"wms/proto/inventory_order"
+	"wms/proto/purchase_wms"
 	"wms/request"
 )
 
@@ -114,7 +117,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, "鏌ヨ閲嶈璐ц鍒欏垪琛ㄥけ璐�")
@@ -147,17 +150,17 @@
 	var pa []request.ProductAmount
 	search := models.NewOperationDetailsSearch()
 	search.Orm = search.Orm.Model(&models.OperationDetails{}).
-		Select("wms_operation_details.product_id, wms_operation_details.amount, wms_operation.to_location_id as to_location_id, " +
-			"wms_operation.from_location_id as from_location_id, wms_operation.base_operation_type").
+		Select("wms_operation_details.product_id, wms_operation_details.amount, wms_operation_details.to_location_id as to_location_id, " +
+			"wms_operation_details.from_location_id as from_location_id, wms_operation.base_operation_type").
 		Joins("left join wms_operation on wms_operation_details.operation_id = wms_operation.id")
 	if len(productIds) > 0 {
 		search.Orm.Where("wms_operation_details.product_id in (?)", productIds)
 	}
 	if len(toLocationIds) > 0 {
-		search.Orm.Where("wms_operation.to_location_id in (?)", toLocationIds)
+		search.Orm.Where("wms_operation_details.to_location_id in (?)", toLocationIds)
 	}
 	if len(fromLocationIds) > 0 {
-		search.Orm.Where("wms_operation.from_location_id in (?)", fromLocationIds)
+		search.Orm.Where("wms_operation_details.from_location_id in (?)", fromLocationIds)
 	}
 	if len(status) > 0 {
 		search.Orm.Where("wms_operation.status in (?)", status)
@@ -216,7 +219,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 +257,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,45 +287,99 @@
 		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙f瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
 		return
 	}
+	if params.Route == "閲囪喘" {
+		client := purchase_wms.NewPurchaseServiceClient(init_client.SrmConn)
+		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(init_client.ApsConn)
+	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
 	details.ProductId = params.ProductId
 	details.Amount = params.OrderNumber
+	details.FromLocationID = 1
+	details.ToLocationID = params.LocationId
 	operation.Details = append(operation.Details, &details)
 	operation.BaseOperationType = constvar.BaseOperationTypeIncoming
 	operation.Status = constvar.OperationStatus_Ready
 	operation.OperationTypeId = operationType.Id
 	operation.OperationTypeName = operationType.Name
 	operation.OperationDate = timex.TimeToString2(time.Now())
-	//todo 渚涘簲鍟嗕綅缃�
-	operation.FromLocationID = 1
+	operation.LocationID = params.LocationId
 	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(init_client.SrmConn)
+	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