From a9ad4cabc4d303532fbd743538f7480c0eef5a69 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 05 七月 2024 14:58:42 +0800
Subject: [PATCH] 库存盘点验证时的出入库数量使用盘点时的库存数量计算

---
 controllers/report_forms_controller.go |   83 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 76 insertions(+), 7 deletions(-)

diff --git a/controllers/report_forms_controller.go b/controllers/report_forms_controller.go
index 49e8fca..334e1d7 100644
--- a/controllers/report_forms_controller.go
+++ b/controllers/report_forms_controller.go
@@ -444,7 +444,7 @@
 // @Produce   application/json
 // @Param     object  body  request.GetMonthStats true  "鏌ヨ鍙傛暟"
 // @Param     Authorization	header string true "token"
-// @Success   200 {object} util.ResponseList{data=[]models.MonthStats}	"鎴愬姛"
+// @Success   200 {object} util.ResponseList{data=[]models.WarehouseMonthStats}	"鎴愬姛"
 // @Router    /api-wms/v1/forms/warehouseMonthStats [post]
 func (slf ReportFormsController) WarehouseMonthStats(c *gin.Context) {
 	var params request.GetMonthStats
@@ -466,6 +466,8 @@
 		return
 	}
 
+	params.Preload = true
+
 	result, err := monthFormsService.Query(params)
 	if err != nil {
 		logx.Errorf("MonthStats query err:%v", err)
@@ -473,17 +475,18 @@
 		return
 	}
 
-	now := time.Now().Local()
-	today := now.Day()
-	nowMonth := now.Format("2006-01")
+	if len(result) == 0 {
+		util.ResponseFormatList(c, code.Success, result, int(total))
+		return
+	}
 
-	day, dateStr, _ := service.NewSystemConfigService().GetInventoryCutOffPoint()
-	if nowMonth == params.Date && today < day || today == day && now.Format("15:04") < dateStr { //鏈湀鏈嚦缁撶畻鏃堕棿鐐�
+	nowMonth := time.Now().Local().Format("2006-01")
+	if nowMonth == params.Date {
 		productIds := make([]string, 0, len(result))
 		for _, item := range result {
 			productIds = append(productIds, item.ProductId)
 		}
-		statsRecords, err := service.GetCurrentWarehouseStats(params.Date, params.WarehouseID, productIds)
+		statsRecords, err := service.GetCurrentWarehouseStats(params.Date, params.WarehouseID, productIds, true)
 		if err != nil {
 			util.ResponseFormat(c, code.InternalError, "鍐呴儴閿欒")
 			return
@@ -504,4 +507,70 @@
 	}
 
 	util.ResponseFormatList(c, code.Success, result, int(total))
+
+}
+
+// DoWareHouseMonthStats
+// @Tags      鎶ヨ〃
+// @Summary   鎵嬪姩璺戞湀搴︾粺璁″簱瀛樻姤琛�
+// @Produce   application/json
+// @Param     object  body  request.DoWarehouseMonthStats true  "鏌ヨ鍙傛暟"
+// @Param     Authorization	header string true "token"
+// @Success   200 {object} util.ResponseList{data=[]models.MonthStats}	"鎴愬姛"
+// @Router    /api-wms/v1/forms/doWarehouseMonthStats [post]
+func (slf ReportFormsController) DoWareHouseMonthStats(c *gin.Context) {
+	var params request.DoMonthStats
+	if err := c.BindJSON(&params); err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+		return
+	}
+
+	if params.Token != constvar.DoMonthStatsToken {
+		return
+	}
+
+	task.WarehouseMonthStats()
+	util.ResponseFormat(c, code.Success, nil)
+}
+
+// DownloadWarehouseMonthStats
+// @Tags      鎶ヨ〃
+// @Summary   涓嬭浇鎸変粨搴撶粺璁℃湀搴︾粺璁″簱瀛樻姤琛�
+// @Produce   application/json
+// @Param     object  body  request.GetMonthStats true  "鏌ヨ鍙傛暟"
+// @Param     Authorization	header string true "token"
+// @Success   200 {object} util.ResponseList{data=[]models.MonthStats}	"鎴愬姛"
+// @Router    /api-wms/v1/forms/downloadWarehouseMonthStats [post]
+func (slf ReportFormsController) DownloadWarehouseMonthStats(c *gin.Context) {
+	var params request.GetMonthStats
+	if err := c.BindJSON(&params); err != nil {
+		util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
+		return
+	}
+
+	if params.WarehouseID == 0 {
+		util.ResponseFormat(c, code.RequestParamError, "浠撳簱ID鍙傛暟缂哄け")
+		return
+	}
+
+	params.Preload = true
+	monthFormsService := service.NewWarehouseMonthFormsService()
+	list, err := monthFormsService.FetchAll(params)
+	if err != nil {
+		logx.Errorf("DownloadMonthStats FetchAll err:%v", err)
+		util.ResponseFormat(c, code.InternalError, "鏌ヨ澶辫触")
+		return
+	}
+	filename, err := monthFormsService.Export(list)
+	if err != nil {
+		logx.Errorf("DownloadMonthStats Export err:%v", err)
+		util.ResponseFormat(c, code.InternalError, "瀵煎嚭鏁版嵁鍒版枃浠跺け璐�")
+		return
+	}
+
+	fileContentDisposition := "attachment;filename=\"" + url.QueryEscape(filename) + "\""
+	c.Header("Content-Type", "application/xlsx")
+	c.Header("Content-Disposition", fileContentDisposition)
+	c.File(filename)
+	defer os.Remove(filename)
 }

--
Gitblit v1.8.0