From efbe2bd4bbc6444dad4ab5fe8d7e839c38230805 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 12 四月 2024 16:22:57 +0800
Subject: [PATCH] 库存报表修改
---
controllers/operation.go | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 4925631..63cfdad 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -538,9 +538,6 @@
return err
}
}
- if operation.Source != "" {
- go UpdatePurchaseStatus(operation.Source, operation.SourceNumber)
- }
}
@@ -582,9 +579,6 @@
return errors.New("褰撳墠浠撳簱娌℃湁璇ヤ骇鍝�,璇峰厛鍏ュ簱")
}
}
- if operation.Source != "" {
- go UpdateOutStatus(operation.Source, operation.SourceNumber, 4)
- }
}
if operation.BaseOperationType == constvar.BaseOperationTypeInternal {
@@ -624,6 +618,17 @@
if err != nil {
util.ResponseFormat(c, code.RequestError, err.Error())
return
+ }
+ //淇敼鍏朵粬绯荤粺璁㈠崟鐘舵��
+ if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
+ if operation.Source != "" {
+ go UpdatePurchaseStatus(operation.Source, operation.SourceNumber)
+ go UpdateOutsourceOrder(operation.Source, operation.SourceNumber, operation.Id, listDetails)
+ }
+ } else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+ if operation.Source != "" {
+ go UpdateOutStatus(operation.Source, operation.SourceNumber, 4)
+ }
}
util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
@@ -724,6 +729,28 @@
_, err = cl.UpdatePurchaseStatus(context.Background(), &purchase_wms.UpdatePurchaseStatusRequest{Number: number})
if err != nil {
logx.Errorf("grpc dial UpdatePurchaseStatus service error: %v", err)
+ }
+ }
+}
+
+func UpdateOutsourceOrder(source, number string, operationId int, details []*models.OperationDetails) {
+ if source == "APS_OUTSOURCING_RECEIVE" {
+ products := make([]*inventory_order.OperationProduct, 0)
+ for _, detail := range details {
+ if operationId == detail.OperationID {
+ var op inventory_order.OperationProduct
+ op.ProductNumber = detail.ProductId
+ op.Amount = detail.Amount.IntPart()
+ products = append(products, &op)
+ }
+ }
+ cl := inventory_order.NewInventoryOrderServiceClient(init_client.ApsConn)
+ _, err := cl.UpdateOutsourceOrder(context.Background(), &inventory_order.UpdateOutsourceOrderRequest{
+ OutsourceNumber: number,
+ Products: products,
+ })
+ if err != nil {
+ logx.Errorf("grpc dial UpdateOutsourceOrder service error: %v", err)
}
}
}
@@ -1076,7 +1103,10 @@
}
db := mysqlx.GetDB().Table("wms_operation").
- Select("wms_operation.id as operation_id,wms_operation.number,wms_operation.base_operation_type,material.id AS product_id,material.`name` AS product_name,wms_operation_details.amount,material.unit,wms_operation_details.from_location_id,from_location.`name` AS from_location,wms_operation_details.to_location_id,to_location.`name` AS to_location,wms_operation.operation_date as date,wms_operation.`status`").
+ Select("wms_operation.id as operation_id,wms_operation.number,wms_operation.base_operation_type,material.id AS product_id," +
+ "material.`name` AS product_name,wms_operation_details.amount,material.unit,wms_operation_details.from_location_id," +
+ "from_location.`name` AS from_location,wms_operation_details.to_location_id,to_location.`name` AS to_location," +
+ "wms_operation.operation_date as date,wms_operation.`status`,material.weight").
InnerJoins("inner join wms_operation_details ON wms_operation_details.operation_id = wms_operation.id").
InnerJoins("INNER JOIN material ON material.id = wms_operation_details.product_id").
InnerJoins("INNER JOIN wms_location AS from_location ON from_location.id = wms_operation_details.from_location_id").
--
Gitblit v1.8.0