From 73b6baf6af3d88cdcb0e2df7932a9bd96b0b85c5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 01 七月 2024 22:32:34 +0800
Subject: [PATCH] 月度统计出入库按类型汇总报表定时任务和手动跑任务接口

---
 controllers/operation.go |   72 +++++++++++++++++++++++++-----------
 1 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/controllers/operation.go b/controllers/operation.go
index af310c4..d948560 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -63,26 +63,42 @@
 		return
 	}
 
-	if err := slf.FormatLocation(&params); err != nil {
-		util.ResponseFormat(c, code.RequestParamError, err.Error())
-		return
-	}
-
 	if CheckDetailsRepeat(params.Details) {
 		util.ResponseFormat(c, code.RequestParamError, "鏄庣粏涓笉鑳藉瓨鍦ㄩ噸澶嶇殑浜у搧")
 		return
 	}
 
-	operationType, err := models.NewOperationTypeSearch().SetID(uint(params.OperationTypeId)).First()
-	if err != nil {
-		util.ResponseFormat(c, code.RequestParamError, err.Error())
-		return
+	if params.BaseOperationType != constvar.BaseOperationTypeAdjust {
+		if err := slf.FormatLocation(&params); err != nil {
+			util.ResponseFormat(c, code.RequestParamError, err.Error())
+			return
+		}
+
+		var operationType *models.OperationType
+		var err error
+		if params.OperationTypeId == 0 {
+			operationType, err := models.NewOperationTypeSearch().
+				SetWarehouseId(params.WarehouseId).SetBaseOperationType(params.BaseOperationType).
+				First()
+			if err != nil || params.WarehouseId != operationType.WarehouseId {
+				util.ResponseFormat(c, code.RequestParamError, "鍙傛暟缂哄け")
+				return
+			}
+		} else {
+			operationType, err = models.NewOperationTypeSearch().SetID(uint(params.OperationTypeId)).First()
+			if err != nil {
+				util.ResponseFormat(c, code.RequestParamError, err.Error())
+				return
+			}
+		}
+		params.BaseOperationType = operationType.BaseOperationType
+		params.WarehouseId = operationType.WarehouseId
 	}
+
 	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
 
 	var numberNum int64
 	if err := mysqlx.GetDB().Model(&models.Operation{}).Where("number=?", params.Number).Count(&numberNum).Error; err != nil {
@@ -93,7 +109,7 @@
 		util.ResponseFormat(c, code.RequestParamError, "鍗曞彿宸插瓨鍦�")
 		return
 	}
-	err = models.WithTransaction(func(db *gorm.DB) error {
+	err := models.WithTransaction(func(db *gorm.DB) error {
 		if err := models.NewOperationSearch().Create(&params); err != nil {
 			return err
 		}
@@ -137,6 +153,7 @@
 	return false
 }
 
+// FormatLocation 浣嶇疆妫�鏌�
 func (slf OperationController) FormatLocation(params *models.Operation) error {
 	operationType, err := models.NewOperationTypeSearch().SetID(uint(params.OperationTypeId)).First()
 	if err != nil {
@@ -191,16 +208,22 @@
 	}
 
 	if params.OperationTypeId == 0 && int(params.BaseOperationType) == 0 {
-		return errors.New("鏈瘑鍒璁板綍绫诲瀷")
+		return errors.New("鏈瘑鍒璁板綍绫诲瀷1")
+	}
+
+	if params.BaseOperationType != 0 {
+		if params.WarehouseId == 0 {
+			return errors.New("鏈瘑鍒璁板綍绫诲瀷2")
+		}
 	}
 
 	if params.OperationDate == "" {
 		return errors.New("璇烽�夋嫨瀹夋帓鏃ユ湡")
 	}
 
-	if params.LocationID == 0 {
-		return errors.New("璇烽�夋嫨婧愪綅缃�")
-	}
+	//if params.LocationID == 0 {
+	//	return errors.New("璇烽�夋嫨婧愪綅缃�")
+	//}
 
 	if len(params.Details) <= 0 {
 		return errors.New("璇锋坊鍔犳槑缁嗕俊鎭�")
@@ -251,7 +274,7 @@
 // @Summary   鍏ュ簱/鍑哄簱鍒楄〃
 // @Produce   application/json
 // @Param		 object  body  request.OperationList true  "鏌ヨ鍙傛暟"
-// @Success   200 {object} util.Response	"鎴愬姛"
+// @Success   200 {object} util.ResponseList{data=[]models.Operation}	"鎴愬姛"
 // @Router    /api-wms/v1/operation/list [post]
 func (slf OperationController) List(c *gin.Context) {
 	var params request.OperationList
@@ -282,7 +305,9 @@
 		costMap[material.ID] = material.Cost
 		salePriceMap[material.ID] = material.SalePrice
 	}
-	list, total, err := search.SetOperationTypeId(params.OperationTypeId).SetPreload(true).SetOrder("created_at desc").Find()
+	list, total, err := search.SetOperationTypeId(params.OperationTypeId).
+		SetBaseOperationType(params.BaseOperationType).
+		SetPreload(true).SetOrder("created_at desc").Find()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
 		return
@@ -303,8 +328,8 @@
 	if !params.PageInfo.Check() {
 		return errors.New("鏁版嵁鍒嗛〉淇℃伅閿欒")
 	}
-	if params.OperationTypeId == 0 {
-		return errors.New("operationTypeId涓�0")
+	if params.OperationTypeId == 0 && params.BaseOperationType == 0 {
+		return errors.New("operationTypeId鍜宐aseOperationType涓嶈兘鍚屾椂涓�0")
 	}
 	return nil
 }
@@ -339,9 +364,12 @@
 		util.ResponseFormat(c, code.RequestParamError, "鏄庣粏涓笉鑳藉瓨鍦ㄩ噸澶嶇殑浜у搧")
 		return
 	}
-	if err := slf.FormatLocation(&params); err != nil {
-		util.ResponseFormat(c, code.RequestParamError, err.Error())
-		return
+
+	if params.BaseOperationType != constvar.BaseOperationTypeAdjust {
+		if err := slf.FormatLocation(&params); err != nil {
+			util.ResponseFormat(c, code.RequestParamError, err.Error())
+			return
+		}
 	}
 	if err := models.WithTransaction(func(tx *gorm.DB) error {
 		if err := models.NewOperationDetailsSearch().SetOrm(tx).SetOperationId(params.Id).Delete(); err != nil {

--
Gitblit v1.8.0