From c7b298c3d2bd922df7514f8a5ca37a0c7f6e5686 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 29 三月 2024 20:00:52 +0800
Subject: [PATCH] 收货数量修改
---
api/v1/purchase/purchase.go | 24 +++++++++++++++++++++---
model/purchase/response/purchase.go | 2 +-
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/api/v1/purchase/purchase.go b/api/v1/purchase/purchase.go
index b542d03..e571258 100644
--- a/api/v1/purchase/purchase.go
+++ b/api/v1/purchase/purchase.go
@@ -367,13 +367,20 @@
response.FailWithMessage("鍙傛暟缂哄け", c)
return
}
- data, err := service.NewPurchaseService().GetPurchase(uint(id))
+ server := service.NewPurchaseService()
+ data, err := server.GetPurchase(uint(id))
if err != nil {
global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
response.FailWithMessage("鑾峰彇澶辫触", c)
return
}
- productList, err := service.NewPurchaseService().GetPurchaseProductList(uint(id))
+ productList, err := server.GetPurchaseProductList(uint(id))
+ if err != nil {
+ global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
+ response.FailWithMessage("鑾峰彇澶辫触", c)
+ return
+ }
+ confirmInfo, err := server.GetPurchaseProductConfirmInfo(data.Number)
if err != nil {
global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
response.FailWithMessage("鑾峰彇澶辫触", c)
@@ -397,7 +404,6 @@
oi.Status = operation.Status
oi.Principal = data.Principal
oi.WarehouseName = data.Warehouse
- oi.SendAmount = operation.Amount
if operation.OverTime != "" {
oi.OverTime = operation.OverTime
oi.OverAmount = operation.Amount
@@ -410,6 +416,12 @@
oi.Unit = products.Product.Unit
oi.Specifications = products.Product.Specifications
oi.ModelNumber = products.Product.ModelNumber
+ break
+ }
+ }
+ for _, confirm := range confirmInfo {
+ if operation.ProductId == confirm.ProductId {
+ oi.SendAmount = confirm.OverReceiveAmount.IntPart()
break
}
}
@@ -426,6 +438,12 @@
oi.Unit = products.Product.Unit
oi.Specifications = products.Product.Specifications
oi.ModelNumber = products.Product.ModelNumber
+ for _, confirm := range confirmInfo {
+ if products.Product.Number == confirm.ProductId {
+ oi.SendAmount = confirm.OverReceiveAmount.IntPart()
+ break
+ }
+ }
operationInfos = append(operationInfos, oi)
}
}
diff --git a/model/purchase/response/purchase.go b/model/purchase/response/purchase.go
index 953ab7a..a66dcc4 100644
--- a/model/purchase/response/purchase.go
+++ b/model/purchase/response/purchase.go
@@ -56,7 +56,7 @@
Specifications string `json:"specifications"` //瑙勬牸
ModelNumber string `json:"modelNumber"` //鍨嬪彿
Amount decimal.Decimal `json:"amount"` //閲囪喘鏁�
- SendAmount int64 `json:"sendAmount"` //鍙戣揣鏁�
+ SendAmount int64 `json:"sendAmount"` //鏀惰揣鏁�
OverAmount int64 `json:"overAmount"` //鍏ュ簱鏁�
Unit string `json:"unit"` //鍗曚綅
PurchasePrice decimal.Decimal `json:"purchasePrice"` //鍗曚环
--
Gitblit v1.8.0