From 96844c22ef3fba86a55e0af1b51bc1009d6fa950 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 20 十月 2023 11:57:48 +0800
Subject: [PATCH] 1.库存盘点bug修改

---
 controllers/product_controller.go |   52 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/controllers/product_controller.go b/controllers/product_controller.go
index c1f3d00..b9c02b5 100644
--- a/controllers/product_controller.go
+++ b/controllers/product_controller.go
@@ -403,11 +403,8 @@
 
 	db := models.NewOperationSearch().Orm.Table("wms_operation").Select("wms_operation.id,wms_operation.number,wms_operation.source_number,wms_operation.status,wms_operation.from_location_id,wms_operation.to_location_id,wms_operation.operation_date,wms_operation.contacter_id,wms_operation.contacter_name,wms_operation.company_id,wms_operation.company_name,wms_operation.comment,wms_operation_details.product_id,material.name as product_name,material.unit,wms_operation_details.amount").InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").InnerJoins("inner join material on material.id=wms_operation_details.product_id")
 
-	if params.SourceNumber != "" {
-		db = db.Where("wms_operation.source_number like ?", fmt.Sprintf("%%%v%%", params.SourceNumber))
-	}
 	if params.Number != "" {
-		db = db.Where("wms_operation.number like ?", fmt.Sprintf("%%%v%%", params.Number))
+		db = db.Where("wms_operation.number like ? or wms_operation.source_number like ? or material.name like ?", fmt.Sprintf("%%%v%%", params.Number), fmt.Sprintf("%%%v%%", params.Number), fmt.Sprintf("%%%v%%", params.Number))
 	}
 	db = db.Where("wms_operation.operation_type_id=?", 0)
 	var (
@@ -425,7 +422,7 @@
 	if params.Page*params.PageSize > 0 {
 		db = db.Offset((params.Page - 1) * params.PageSize).Limit(params.PageSize)
 	}
-	if err := db.Find(&records).Error; err != nil {
+	if err := db.Order("wms_operation.created_at desc").Find(&records).Error; err != nil {
 		util.ResponseFormat(c, code.RequestError, fmt.Errorf("find count err: %v", err))
 		return
 	}
@@ -486,6 +483,21 @@
 				}
 				listProdt[k].Amount = listProdt[k].Amount.Sub(value)
 				if err := tx.Save(listProdt[k]).Error; err != nil {
+					return err
+				}
+				var locAmount models.LocationProductAmount
+				if err := models.NewLocationProductAmountSearch().Orm.
+					Table("wms_location_product_amount").
+					Joins("inner join wms_location_product on wms_location_product.id=wms_location_product_amount.location_product_id").
+					Where("wms_location_product.product_id=? and wms_location_product.location_id=?", v.ID, operation.FromLocationID).
+					First(&locAmount).Error; err != nil {
+					return err
+				}
+				if locAmount.Amount.LessThan(value) {
+					return errors.New(fmt.Sprintf("浜у搧锛�%v,搴撳瓨锛�%v,鍑哄簱锛�%v,鏁伴噺涓嶅锛屾棤娉曞畬鎴愬嚭搴撴搷浣�", v.Name, v.Amount.String(), value.String()))
+				}
+				locAmount.Amount = locAmount.Amount.Sub(value)
+				if err := models.NewLocationProductAmountSearch().SetID(locAmount.Id).Update(&locAmount); err != nil {
 					return err
 				}
 			}
@@ -566,3 +578,33 @@
 	}
 	util.ResponseFormat(c, code.Success, "娣诲姞鎴愬姛")
 }
+
+// ListHistory
+// @Tags      浜у搧
+// @Summary   浜у搧浣嶇疆鍘嗗彶淇℃伅
+// @Produce   application/json
+// @Param		 object  body  request.QueryOperationHistory true  "鏌ヨ鍙傛暟"
+// @Success   200 {object} util.ResponseList{data=[]models.Operation}	"鎴愬姛"
+// @Router    /api-wms/v1/product/listHistory [post]
+func (slf ProductController) ListHistory(c *gin.Context) {
+	var params request.QueryOperationHistory
+	if err := c.BindJSON(&params); err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�:"+err.Error())
+		return
+	}
+	if !params.PageInfo.Check() {
+		util.ResponseFormat(c, code.RequestParamError, "椤电爜淇℃伅閿欒")
+		return
+	}
+
+	search := models.NewOperationSearch().SetPage(params.Page, params.PageSize).SetPreload(true).SetOrder("created_at desc")
+	search.SetOrm(search.Orm.InnerJoins("inner join wms_operation_details on wms_operation_details.operation_id=wms_operation.id").Where("wms_operation_details.product_id=? and (wms_operation.from_location_id=? or wms_operation.to_location_id=?)", params.ProductId, params.LocationId, params.LocationId))
+
+	list, total, err := search.Find()
+	if err != nil {
+		util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+		return
+	}
+
+	util.ResponseFormatListWithPage(c, code.Success, list, int(total), params.Page, params.PageSize)
+}

--
Gitblit v1.8.0