From aeed976c2999e2cea097cdee38d8baeefe323f3d Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 30 三月 2024 16:15:59 +0800
Subject: [PATCH] 修改
---
proto/product_inventory/server.go | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/proto/product_inventory/server.go b/proto/product_inventory/server.go
index 274d478..8bd4069 100644
--- a/proto/product_inventory/server.go
+++ b/proto/product_inventory/server.go
@@ -174,6 +174,7 @@
operation.ReceiverPhone = req.Phone
operation.ReceiverAddr = req.Address
operation.Source = req.Source
+ operation.OperationSource = constvar.OperationSource(req.OperationSource)
operation.CompanyID = int(req.ClientId)
operation.CompanyName = req.ClientName
if req.DeliverType == 1 {
@@ -330,6 +331,7 @@
}
func (s *Server) OrderProductOutput(ctx context.Context, req *OrderProductOutputRequest) (resp *OrderProductOutputResponse, err error) {
+ resp = new(OrderProductOutputResponse)
if req.OrderNumber == "" || len(req.Products) == 0 {
return nil, errors.New("鍙傛暟缂哄け")
}
@@ -435,6 +437,9 @@
} else {
locationSendAmount = productAmount
}
+ if locationSendAmount.LessThanOrEqual(decimal.Zero) {
+ continue
+ }
productInfoList = append(productInfoList, &service.ProductInfo{
ProductID: productNumber,
Amount: locationSendAmount,
@@ -442,21 +447,22 @@
productHasSendAmount[productNumber] = productHasSendAmount[productNumber].Add(locationSendAmount)
}
outputInfoList = append(outputInfoList, &service.OutputInfo{
- LocationID: int(locationID),
- WarehouseID: int(LocationIDWarehouseIDMap[locationID]),
- Products: productInfoList,
- OperationID: 0,
- SourceNumber: req.OrderNumber,
+ LocationID: int(locationID),
+ WarehouseID: int(LocationIDWarehouseIDMap[locationID]),
+ Products: productInfoList,
+ OperationID: 0,
+ SourceNumber: req.OrderNumber,
+ SaleDetailsNumber: req.OrderNumber,
})
}
err = service.AddOutputOperations(outputInfoList)
if err != nil {
+ logx.Errorf("OrderProductOutput AddOutputOperations err:%v", err)
return nil, err
}
-
resp.Code = 1
resp.Msg = "success"
- return nil, nil
+ return resp, nil
}
--
Gitblit v1.8.0