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 | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/api/v1/purchase/purchase.go b/api/v1/purchase/purchase.go
index 64d2b2a..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"
@@ -264,7 +265,7 @@
SupplierName: data.Supplier.Name,
Product: product,
Source: "SRM_PURCHASE",
- OperationSource: purchase_wms.OperationSource_OperationSourcePurchase,
+ OperationSource: common.OperationSource_OperationSourcePurchase,
SalesDetailsNumber: data.SourceOrder,
})
if err != nil {
@@ -414,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
@@ -688,7 +689,7 @@
Product: product,
Source: "SRM_PURCHASE",
WarehouseName: purchaseData.Warehouse,
- OperationSource: purchase_wms.OperationSource_OperationSourcePurchase,
+ OperationSource: common.OperationSource_OperationSourcePurchase,
SalesDetailsNumber: purchaseData.SourceOrder,
})
if err != nil {
@@ -776,7 +777,7 @@
Product: product,
Source: "SRM_PURCHASE",
WarehouseName: purchaseData.Warehouse,
- OperationSource: purchase_wms.OperationSource_OperationSourcePurchase,
+ OperationSource: common.OperationSource_OperationSourcePurchase,
SalesDetailsNumber: purchaseData.SourceOrder,
})
if err != nil {
--
Gitblit v1.8.0