From f72fb9ca31fbf27b4abbc0156e60ea162f58df81 Mon Sep 17 00:00:00 2001
From: dsmzx <dsmzx@123.com>
Date: 星期四, 13 六月 2024 15:30:50 +0800
Subject: [PATCH] 出入库调拨产品明细增加备注字段（同步产品的备注字段）

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

diff --git a/controllers/operation.go b/controllers/operation.go
index e334da1..d519e04 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -17,6 +17,7 @@
 	"wms/constvar"
 	"wms/extend/code"
 	"wms/extend/util"
+	"wms/middleware"
 	"wms/models"
 	"wms/pkg/logx"
 	"wms/pkg/mysqlx"
@@ -75,7 +76,8 @@
 		util.ResponseFormat(c, code.RequestParamError, err.Error())
 		return
 	}
-
+	userInfo := middleware.GetUserInfo(c)
+	params.CreatedBy = userInfo.Username
 	params.Status = constvar.OperationStatus_Ready
 	//params.Number = strconv.FormatInt(time.Now().Unix(), 10)
 	params.BaseOperationType = operationType.BaseOperationType
@@ -88,6 +90,25 @@
 	if numberNum > 0 {
 		util.ResponseFormat(c, code.RequestParamError, "鍗曞彿宸插瓨鍦�")
 		return
+	}
+
+	var productIds []string
+	for _, v := range params.Details {
+		productIds = append(productIds, v.ProductId)
+	}
+	products, err := models.NewMaterialSearch().SetIDs(productIds).FindNotTotal()
+	if err != nil {
+		logx.Errorf("MonthStats get products err:%v", err)
+		return
+	}
+	productMap := models.MaterialMap(products)
+	for key, value := range productMap {
+		for i := 0; i < len(params.Details); i++ {
+			if key == params.Details[i].ProductId {
+				params.Details[i].Note = value.Note
+				break
+			}
+		}
 	}
 
 	if err := models.NewOperationSearch().Create(&params); err != nil {
@@ -343,11 +364,16 @@
 	}
 	operation, err := models.NewOperationSearch().SetID(id).First()
 	if err != nil {
-		util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏冲嚭鍏ュ簱淇℃伅:"+err.Error())
+		util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏冲嚭鍏ュ簱鍗曟嵁:"+err.Error())
+		return
+	}
+	userInfo := middleware.GetUserInfo(c)
+	if operation.CreatedBy != userInfo.Username {
+		util.ResponseFormat(c, code.RequestError, "鍒汉鐨勫嚭鍏ュ簱鍗曟嵁鏃犳硶杩涜鍒犻櫎")
 		return
 	}
 	if operation.Status != constvar.OperationStatus_Ready {
-		util.ResponseFormat(c, code.RequestError, "璇ュ叆搴撲俊鎭棤娉曡繘琛屽垹闄�")
+		util.ResponseFormat(c, code.RequestError, "璇ュ嚭鍏ュ簱鍗曟嵁鏃犳硶杩涜鍒犻櫎")
 		return
 	}
 	if err := models.WithTransaction(func(tx *gorm.DB) error {
@@ -411,9 +437,14 @@
 			mapLocAmount[strconv.Itoa(v.LocationId)+v.ProductId] = v
 		}
 	}
+	userInfo := middleware.GetUserInfo(c)
 
 	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 {
+		if err := models.NewOperationSearch().SetOrm(tx).SetID(id).Update(&models.Operation{
+			Status:    constvar.OperationStatus_Finish,
+			CheckedBy: userInfo.Username,
+			CheckedAt: time.Now(),
+			AuditDate: time.Now().Format("2006-01-02 15:04:05")}); err != nil {
 			return err
 		}
 		if err := AddMoveHistory([]*models.Operation{operation}, tx); err != nil {
@@ -532,6 +563,8 @@
 					Comment:           operation.Comment,
 					BaseOperationType: constvar.BaseOperationTypeInternal,
 					Details:           details,
+					CheckedAt:         time.Now(),
+					CheckedBy:         userInfo.Username,
 				}).Error; err != nil {
 					return err
 				}
@@ -638,6 +671,7 @@
 		util.ResponseFormat(c, code.RequestError, err.Error())
 		return
 	}
+
 	//淇敼鍏朵粬绯荤粺璁㈠崟鐘舵��
 	if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
 		if operation.Source != "" {

--
Gitblit v1.8.0