From 2b3b678a0e0156e68415aa287fdf85d05583a5b4 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 21 九月 2023 15:10:08 +0800
Subject: [PATCH] 1.修改出入库列表显示异常的问题

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

diff --git a/controllers/operation.go b/controllers/operation.go
index 97ba0fd..f340d6c 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -65,9 +65,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 +75,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("璇烽�夋嫨婧愪綅缃�")
 		}
 	}
@@ -117,7 +117,7 @@
 		if v.ProductName == "" {
 			return errors.New("浜у搧鍚嶇О寮傚父")
 		}
-		if v.Quantity.IsNegative() {
+		if v.Amount.IsNegative() {
 			return errors.New("浜у搧鏁伴噺鍑洪敊")
 		}
 	}
@@ -172,7 +172,7 @@
 // @Param     object  body request.UpdateOperation true  "鍏ュ簱淇℃伅"
 // @Param     id  path int true  "鍏ュ簱淇℃伅id"
 // @Success   200 {object} util.Response "鎴愬姛"
-// @Router    /api-wms/v1/operation/operation/{id} [post]
+// @Router    /api-wms/v1/operation/operation/{id} [put]
 func (slf OperationController) Update(c *gin.Context) {
 	id := cast.ToUint(c.Param("id"))
 	if id == 0 {
@@ -315,7 +315,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