From 860881901f09b48939b13c16a99c4324e122704b Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 01 十二月 2023 16:22:12 +0800
Subject: [PATCH] 出库确认bug修改

---
 controllers/operation.go |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/controllers/operation.go b/controllers/operation.go
index 938ea40..60384dd 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -362,7 +362,7 @@
 		util.ResponseFormat(c, code.RequestError, "璇ュ嚭鍏ュ簱淇℃伅鏃犳硶瀹屾垚")
 		return
 	}
-	if err := models.WithTransaction(func(tx *gorm.DB) error {
+	err = models.WithTransaction(func(tx *gorm.DB) error {
 
 		if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish, AuditDate: time.Now().Format("2006-01-02 15:04:05")}); err != nil {
 			return err
@@ -555,10 +555,10 @@
 				}
 				locAmount, res := models.NewLocationProductAmountSearch().
 					SetProductId(v.ID).
-					SetLocationId(operation.ToLocationID).
+					SetLocationId(operation.FromLocationID).
 					FirstRes()
 				if res.Error != nil {
-					return err
+					return res.Error
 				}
 				if locAmount.Amount.LessThan(value) {
 					return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String()))
@@ -722,7 +722,8 @@
 			}
 		}
 		return nil
-	}); err != nil {
+	})
+	if err != nil {
 		util.ResponseFormat(c, code.RequestError, err.Error())
 		return
 	}

--
Gitblit v1.8.0