From 51b5ceb5ac07e5fba7efc616700c7b69d5a16c77 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 23 三月 2024 09:32:32 +0800
Subject: [PATCH] 质检修改
---
api/v1/purchase/purchase.go | 14 +++++++-------
service/purchase/purchase.go | 6 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/api/v1/purchase/purchase.go b/api/v1/purchase/purchase.go
index 26e101b..188cdb2 100644
--- a/api/v1/purchase/purchase.go
+++ b/api/v1/purchase/purchase.go
@@ -585,6 +585,12 @@
return
}
server := service.PurchaseService{}
+ purchaseData, err := server.GetPurchase(params.PurchaseId)
+ if err != nil {
+ global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
+ response.FailWithMessage("鑾峰彇澶辫触", c)
+ return
+ }
if params.Status == purchase.Unqualified {
err := server.UpdatePurchaseQualityInspection(params.Ids, params.Status)
if err != nil {
@@ -593,12 +599,6 @@
return
}
} else if params.Status == purchase.InWarehouse {
- purchaseData, err := server.GetPurchase(params.PurchaseId)
- if err != nil {
- global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
- response.FailWithMessage("鑾峰彇澶辫触", c)
- return
- }
inspectionList, err := server.GetPurchaseQualityInspectionList(params.Ids)
if err != nil {
global.GVA_LOG.Error("鑾峰彇澶辫触!", zap.Error(err))
@@ -633,7 +633,7 @@
return
}
}
- err = server.UpdatePurchaseStatus(params.PurchaseId, purchase.WaitInspection)
+ err = server.UpdatePurchaseStatus(purchaseData.Number, purchase.WaitInspection)
if err != nil {
global.GVA_LOG.Error("鐘舵�佹洿鏂板け璐�!", zap.Error(err))
response.FailWithMessage("鐘舵�佹洿鏂板け璐�", c)
diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index f77f0c2..1fbe313 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -402,14 +402,14 @@
return list, err
}
-func (slf *PurchaseService) UpdatePurchaseStatus(purchaseId uint, status int) error {
+func (slf *PurchaseService) UpdatePurchaseStatus(number string, status int) error {
var total int64
- err := global.GVA_DB.Model(&purchase.PurchaseQualityInspection{}).Where("status = ?", status).Count(&total).Error
+ err := global.GVA_DB.Model(&purchase.PurchaseQualityInspection{}).Where("purchase_number = ?", number).Where("status = ?", status).Count(&total).Error
if err != nil {
return err
}
if total == 0 {
- err = global.GVA_DB.Model(&purchase.Purchase{}).Where("id = ?", purchaseId).Updates(map[string]interface{}{"status": purchase.OrderStatusReceived}).Error
+ err = global.GVA_DB.Model(&purchase.Purchase{}).Where("number = ?", number).Updates(map[string]interface{}{"status": purchase.OrderStatusReceived}).Error
if err != nil {
return err
}
--
Gitblit v1.8.0