From ea02a2a9a8219d44b103f0a31cf9fc81ff8495e1 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 23 九月 2023 16:57:48 +0800
Subject: [PATCH] 产品列表添加类型名称

---
 controllers/operation.go |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/controllers/operation.go b/controllers/operation.go
index 1c25adc..32d16bb 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -5,7 +5,6 @@
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/shopspring/decimal"
-	"github.com/spf13/cast"
 	"gorm.io/gorm"
 	"strconv"
 	"wms/constvar"
@@ -65,9 +64,9 @@
 		if location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeVendor)).First(); err != nil {
 			return err
 		} else {
-			params.FromLocationId = location.Id
+			params.FromLocationID = location.Id
 		}
-		if params.ToLocationId == 0 {
+		if params.ToLocationID == 0 {
 			return errors.New("璇烽�夋嫨鐩爣浣嶇疆")
 		}
 	}
@@ -75,17 +74,17 @@
 		if location, err := models.NewLocationSearch().SetType(int(constvar.LocationTypeCustomer)).First(); err != nil {
 			return err
 		} else {
-			params.ToLocationId = location.Id
+			params.ToLocationID = location.Id
 		}
-		if params.FromLocationId == 0 {
+		if params.FromLocationID == 0 {
 			return errors.New("璇烽�夋嫨婧愪綅缃�")
 		}
 	}
 	if operationType.BaseOperationType == constvar.BaseOperationTypeInternal {
-		if params.ToLocationId == 0 {
+		if params.ToLocationID == 0 {
 			return errors.New("璇烽�夋嫨鐩爣浣嶇疆")
 		}
-		if params.FromLocationId == 0 {
+		if params.FromLocationID == 0 {
 			return errors.New("璇烽�夋嫨婧愪綅缃�")
 		}
 	}
@@ -112,12 +111,12 @@
 	//妫�鏌ユ槑缁嗛儴鍒�
 	for _, v := range params.Details {
 		if v.ProductId == "" {
-			return errors.New("productID涓�0")
+			return errors.New("productID涓虹┖")
 		}
 		if v.ProductName == "" {
 			return errors.New("浜у搧鍚嶇О寮傚父")
 		}
-		if v.Quantity.IsNegative() {
+		if v.Amount.IsNegative() {
 			return errors.New("浜у搧鏁伴噺鍑洪敊")
 		}
 	}
@@ -170,15 +169,9 @@
 // @Summary   淇敼鍏ュ簱/鍑哄簱淇℃伅
 // @Produce   application/json
 // @Param     object  body request.UpdateOperation true  "鍏ュ簱淇℃伅"
-// @Param     id  path int true  "鍏ュ簱淇℃伅id"
 // @Success   200 {object} util.Response "鎴愬姛"
-// @Router    /api-wms/v1/operation/operation/{id} [put]
+// @Router    /api-wms/v1/operation/update [post]
 func (slf OperationController) Update(c *gin.Context) {
-	id := cast.ToUint(c.Param("id"))
-	if id == 0 {
-		util.ResponseFormat(c, code.RequestParamError, "绌虹殑璁板綍id")
-		return
-	}
 	var reqParams request.UpdateOperation
 	var params models.Operation
 	if err := c.BindJSON(&reqParams); err != nil {
@@ -203,6 +196,10 @@
 	}
 	if err := models.WithTransaction(func(tx *gorm.DB) error {
 		if err := models.NewOperationDetailsSearch().SetOrm(tx).SetOperationId(params.Id).Delete(); err != nil {
+			return err
+		}
+		operationSearch := models.NewOperationSearch().SetOrm(tx)
+		if err := operationSearch.Orm.Model(&params).Association("Details").Replace(params.Details); err != nil {
 			return err
 		}
 		if err := models.NewOperationSearch().SetOrm(tx).SetID(params.Id).Save(&params); err != nil {
@@ -310,7 +307,7 @@
 			}
 			for _, v := range listDetails {
 				listProdtId = append(listProdtId, v.ProductId)
-				mapProdt[v.ProductId] = v.Quantity
+				mapProdt[v.ProductId] = v.Amount
 			}
 			if err := models.NewMaterialSearch().Orm.Where("id IN ?", listProdtId).Find(&listProdt).Error; err != nil {
 				return err

--
Gitblit v1.8.0