From 931e10ff09ed3bade33570755347367e3bf0f842 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 21 九月 2023 19:39:36 +0800
Subject: [PATCH] 1.修改出入库的验证逻辑方式

---
 controllers/operation.go |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/controllers/operation.go b/controllers/operation.go
index 11cbd9c..97f68b3 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -293,11 +293,7 @@
 		if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{Status: constvar.OperationStatus_Finish}); err != nil {
 			return err
 		}
-		if operationType.BaseOperationType == constvar.BaseOperationTypeIncoming {
-			if err := models.NewMaterialSearch().Orm.Exec("update material INNER JOIN wms_operation_details on wms_operation_details.product_id=material.id INNER JOIN wms_operation on wms_operation.id=wms_operation_details.operation_id set material.amount=material.amount + wms_operation_details.amount where wms_operation.id=?", id).Error; err != nil {
-				return err
-			}
-		} else if operationType.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+		if operationType.BaseOperationType != constvar.BaseOperationTypeInternal {
 			var listProdtId []string
 			var listProdt []*models.Material
 			mapProdt := make(map[string]decimal.Decimal)
@@ -312,18 +308,34 @@
 			if err := models.NewMaterialSearch().Orm.Where("id IN ?", listProdtId).Find(&listProdt).Error; err != nil {
 				return err
 			}
-			for _, v := range listProdt {
-				if value, ok := mapProdt[v.ID]; !ok {
-					return errors.New("浜у搧绉嶇被寮傚父")
-				} else {
-					if v.Amount.LessThan(value) {
-						return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String()))
+			if operationType.BaseOperationType == constvar.BaseOperationTypeIncoming {
+				for k, v := range listProdt {
+					if value, ok := mapProdt[v.ID]; !ok {
+						return errors.New("浜у搧绉嶇被寮傚父")
+					} else {
+						listProdt[k].Amount.Add(value)
+						if err := tx.Save(listProdt[k]).Error; err != nil {
+							return err
+						}
 					}
 				}
 			}
-			if err := models.NewMaterialSearch().Orm.Exec("update material INNER JOIN wms_operation_details on wms_operation_details.product_id=material.id INNER JOIN wms_operation on wms_operation.id=wms_operation_details.operation_id set material.amount=material.amount - wms_operation_details.amount where wms_operation.id=?", id).Error; err != nil {
-				return err
+			if operationType.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+				for k, v := range listProdt {
+					if value, ok := mapProdt[v.ID]; !ok {
+						return errors.New("浜у搧绉嶇被寮傚父")
+					} else {
+						if v.Amount.LessThan(value) {
+							return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String()))
+						}
+						listProdt[k].Amount.Sub(value)
+						if err := tx.Save(listProdt[k]).Error; err != nil {
+							return err
+						}
+					}
+				}
 			}
+
 		}
 		return nil
 	}); err != nil {

--
Gitblit v1.8.0