From 2ee651f6d5612cdec35f6e5f8d9d5ff7c66b7ec4 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 19 四月 2024 16:57:09 +0800
Subject: [PATCH] 更改接口前置
---
api/v1/purchase/purchase.go | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/api/v1/purchase/purchase.go b/api/v1/purchase/purchase.go
index b81fe5a..8d07ab6 100644
--- a/api/v1/purchase/purchase.go
+++ b/api/v1/purchase/purchase.go
@@ -10,6 +10,7 @@
"srm/model/common/response"
"srm/model/purchase"
purchaserequest "srm/model/purchase/request"
+ "srm/proto/common"
"srm/proto/purchase_wms"
"strconv"
"strings"
@@ -238,13 +239,13 @@
return
}
warehouse := ""
+ data, err := service.NewPurchaseService().GetPurchase(uint(params.Id))
+ if err != nil {
+ global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
+ response.FailWithMessage("鑾峰彇澶辫触", c)
+ return
+ }
if params.Status == purchase.OrderStatusReceived {
- data, err := service.NewPurchaseService().GetPurchase(uint(params.Id))
- if err != nil {
- global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
- response.FailWithMessage("鑾峰彇澶辫触", c)
- return
- }
productList, err := service.NewPurchaseService().GetPurchaseProductList(uint(params.Id))
if err != nil {
global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
@@ -260,11 +261,12 @@
}
client := purchase_wms.NewPurchaseServiceClient(purchase_wms.PurchaseConn)
resp, err := client.PurchaseToWms(context.Background(), &purchase_wms.PurchaseToWmsRequest{
- Number: data.Number,
- SupplierName: data.Supplier.Name,
- Product: product,
- Source: "SRM_PURCHASE",
- OperationSource: purchase_wms.OperationSource_OperationSourcePurchase,
+ Number: data.Number,
+ SupplierName: data.Supplier.Name,
+ Product: product,
+ Source: "SRM_PURCHASE",
+ OperationSource: common.OperationSource_OperationSourcePurchase,
+ SalesDetailsNumber: data.SourceOrder,
})
if err != nil {
global.GVA_LOG.Error("grpc璋冪敤澶辫触!", zap.Error(err))
@@ -413,7 +415,7 @@
iwi.Status = operation.Status
iwi.Principal = data.Principal
iwi.WarehouseName = data.Warehouse
- if operation.OverTime != "" {
+ if operation.OverTime != "" && operation.Status == 4 {
iwi.OverTime = operation.OverTime
iwi.OverAmount = operation.Amount
pi.OverAmount = pi.OverAmount + operation.Amount
@@ -681,13 +683,14 @@
}
client := purchase_wms.NewPurchaseServiceClient(purchase_wms.PurchaseConn)
_, err = client.PurchaseToWms(context.Background(), &purchase_wms.PurchaseToWmsRequest{
- Number: purchaseData.Number,
- SupplierName: purchaseData.Supplier.Name,
- SupplierId: int64(purchaseData.SupplierId),
- Product: product,
- Source: "SRM_PURCHASE",
- WarehouseName: purchaseData.Warehouse,
- OperationSource: purchase_wms.OperationSource_OperationSourcePurchase,
+ Number: purchaseData.Number,
+ SupplierName: purchaseData.Supplier.Name,
+ SupplierId: int64(purchaseData.SupplierId),
+ Product: product,
+ Source: "SRM_PURCHASE",
+ WarehouseName: purchaseData.Warehouse,
+ OperationSource: common.OperationSource_OperationSourcePurchase,
+ SalesDetailsNumber: purchaseData.SourceOrder,
})
if err != nil {
global.GVA_LOG.Error("grpc璋冪敤澶辫触!", zap.Error(err))
@@ -768,13 +771,14 @@
}
client := purchase_wms.NewPurchaseServiceClient(purchase_wms.PurchaseConn)
_, err = client.PurchaseToWms(context.Background(), &purchase_wms.PurchaseToWmsRequest{
- Number: purchaseData.Number,
- SupplierName: purchaseData.Supplier.Name,
- SupplierId: int64(purchaseData.SupplierId),
- Product: product,
- Source: "SRM_PURCHASE",
- WarehouseName: purchaseData.Warehouse,
- OperationSource: purchase_wms.OperationSource_OperationSourcePurchase,
+ Number: purchaseData.Number,
+ SupplierName: purchaseData.Supplier.Name,
+ SupplierId: int64(purchaseData.SupplierId),
+ Product: product,
+ Source: "SRM_PURCHASE",
+ WarehouseName: purchaseData.Warehouse,
+ OperationSource: common.OperationSource_OperationSourcePurchase,
+ SalesDetailsNumber: purchaseData.SourceOrder,
})
if err != nil {
global.GVA_LOG.Error("grpc璋冪敤澶辫触!", zap.Error(err))
--
Gitblit v1.8.0