From 72025bc1118c62acb57bba645ed142faddc410a7 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 01 八月 2024 17:41:54 +0800
Subject: [PATCH] 注释掉已不用的盘点接口
---
service/month_forms.go | 125 ++++++++++++-----------------------------
1 files changed, 36 insertions(+), 89 deletions(-)
diff --git a/service/month_forms.go b/service/month_forms.go
index aca3f1a..34a9cc5 100644
--- a/service/month_forms.go
+++ b/service/month_forms.go
@@ -11,7 +11,6 @@
"wms/models"
"wms/pkg/logx"
"wms/request"
- "wms/utils"
)
type MonthFormsService struct{}
@@ -68,110 +67,53 @@
return "", err
}
- // 璁剧疆琛ㄥご
- f.SetCellValue("Sheet1", "A1", "浜у搧缂栫爜")
- f.SetCellValue("Sheet1", "B1", "浜у搧鍚嶇О")
- f.SetCellValue("Sheet1", "C1", "鏈熷垵搴撳瓨")
- f.MergeCell("Sheet1", "C1", "F1") // 鍚堝苟鍗曞厓鏍�
- f.SetCellValue("Sheet1", "G1", "鏈湀鍏ュ簱")
- f.MergeCell("Sheet1", "G1", "J1") // 鍚堝苟鍗曞厓鏍�
- f.SetCellValue("Sheet1", "K1", "鏈湀鍑哄簱")
- f.MergeCell("Sheet1", "K1", "N1") // 鍚堝苟鍗曞厓鏍�
- f.SetCellValue("Sheet1", "O1", "鏈熸湯搴撳瓨")
- f.MergeCell("Sheet1", "O1", "R1") // 鍚堝苟鍗曞厓鏍�
+ unitData, unitIndexMap := GetAllUnits()
+ unitLen := len(unitData)
- unitData := []string{"浠�", "鍖�", "绫�", "閲嶉噺"}
- for i, header := range unitData {
- cell := getColumnAlphabet(i+3) + "2"
- f.SetCellValue("Sheet1", cell, header)
- }
- for i, header := range unitData {
- cell := getColumnAlphabet(i+7) + "2"
- f.SetCellValue("Sheet1", cell, header)
- }
- for i, header := range unitData {
- cell := getColumnAlphabet(i+11) + "2"
- f.SetCellValue("Sheet1", cell, header)
- }
- for i, header := range unitData {
- cell := getColumnAlphabet(i+15) + "2"
- f.SetCellValue("Sheet1", cell, header)
- }
-
- // 璁剧疆琛ㄥご鏍峰紡
- style := &excelize.Style{
- Border: nil,
- Fill: excelize.Fill{
- Type: "pattern",
- Pattern: 1,
- Shading: 0,
- },
- Font: &excelize.Font{
- Bold: true,
- },
- Alignment: &excelize.Alignment{
- Horizontal: "center",
- },
- }
- titleStyle, err := f.NewStyle(style)
+ // 鑷畾涔夎〃澶�
+ headers := []interface{}{"浜у搧缂栫爜", "浜у搧鍚嶇О", map[string][]string{"鏈熷垵搴撳瓨": unitData}, map[string][]string{"鏈湀鍏ュ簱": unitData}, map[string][]string{"鏈湀鍑哄簱": unitData}, map[string][]string{"鏈熸湯搴撳瓨": unitData}}
+ lastColumnNumber, err := SetExcelHeaders(headers, f)
if err != nil {
- return
+ return "", err
}
- f.SetCellStyle("Sheet1", "A1", "R2", titleStyle)
+
+ f.MergeCell("Sheet1", "A1", "A2") // 鍚堝苟鍗曞厓鏍�
+ f.MergeCell("Sheet1", "B1", "B2") // 鍚堝苟鍗曞厓鏍�
+
+ titleStyle, err := SetHeaderStyle(f)
+ if err != nil {
+ return "", err
+ }
+
+ lastColumn := getColumnAlphabet(lastColumnNumber)
+ f.SetCellStyle("Sheet1", "A1", lastColumn+"2", titleStyle)
// 璁剧疆鍒楀
f.SetColWidth("Sheet1", "A", "B", 30)
- f.SetColWidth("Sheet1", "C", "R", 15)
+ f.SetColWidth("Sheet1", "C", lastColumn, 15)
for i, v := range dataList {
- column := strconv.Itoa(i + 3)
- f.SetCellValue("Sheet1", "A"+column, v.ProductId)
- f.SetCellValue("Sheet1", "B"+column, v.ProductName)
- f.SetCellValue("Sheet1", "C"+column, v.BeginAmount)
+ row := strconv.Itoa(i + 3)
+ f.SetCellValue("Sheet1", "A"+row, v.ProductId)
+ f.SetCellValue("Sheet1", "B"+row, v.ProductName)
+
+ v.BeginMoreUnitsArr = append(v.BeginMoreUnitsArr, models.UnitItems{Amount: v.BeginAmount, Unit: v.Unit})
for _, v := range v.BeginMoreUnitsArr {
- switch v.Unit {
- case "浠�":
- f.SetCellValue("Sheet1", "D"+column, v.Amount)
- case "鍖�":
- f.SetCellValue("Sheet1", "E"+column, v.Amount)
- case "绫�":
- f.SetCellValue("Sheet1", "F"+column, v.Amount)
- }
+ f.SetCellValue("Sheet1", getColumnAlphabet(3+unitIndexMap[v.Unit])+row, v.Amount)
}
- f.SetCellValue("Sheet1", "G"+column, v.InputAmount)
+ v.InputMoreUnitsArr = append(v.InputMoreUnitsArr, models.UnitItems{Amount: v.InputAmount, Unit: v.Unit})
for _, v := range v.InputMoreUnitsArr {
- switch v.Unit {
- case "浠�":
- f.SetCellValue("Sheet1", "H"+column, v.Amount)
- case "鍖�":
- f.SetCellValue("Sheet1", "I"+column, v.Amount)
- case "绫�":
- f.SetCellValue("Sheet1", "J"+column, v.Amount)
- }
+ f.SetCellValue("Sheet1", getColumnAlphabet(3+unitLen*1+unitIndexMap[v.Unit])+row, v.Amount)
}
- f.SetCellValue("Sheet1", "K"+column, v.OutputAmount)
+ v.OutputMoreUnitsArr = append(v.OutputMoreUnitsArr, models.UnitItems{Amount: v.OutputAmount, Unit: v.Unit})
for _, v := range v.OutputMoreUnitsArr {
- switch v.Unit {
- case "浠�":
- f.SetCellValue("Sheet1", "L"+column, v.Amount)
- case "鍖�":
- f.SetCellValue("Sheet1", "M"+column, v.Amount)
- case "绫�":
- f.SetCellValue("Sheet1", "N"+column, v.Amount)
- }
+ f.SetCellValue("Sheet1", getColumnAlphabet(3+unitLen*2+unitIndexMap[v.Unit])+row, v.Amount)
}
- f.SetCellValue("Sheet1", "O"+column, v.EndAmount)
+ v.EndMoreUnitsArr = append(v.EndMoreUnitsArr, models.UnitItems{Amount: v.EndAmount, Unit: v.Unit})
for _, v := range v.EndMoreUnitsArr {
- switch v.Unit {
- case "浠�":
- f.SetCellValue("Sheet1", "P"+column, v.Amount)
- case "鍖�":
- f.SetCellValue("Sheet1", "Q"+column, v.Amount)
- case "绫�":
- f.SetCellValue("Sheet1", "R"+column, v.Amount)
- }
+ f.SetCellValue("Sheet1", getColumnAlphabet(3+unitLen*3+unitIndexMap[v.Unit])+row, v.Amount)
}
}
@@ -197,7 +139,12 @@
}
productMap := models.MaterialMap(products)
- beginTime, endTime := utils.GetLastMonthPeriod()
+ //鎸夐厤缃彇寮�濮嬫椂闂村拰缁撴潫鏃堕棿
+ beginTime, endTime, err := NewSystemConfigService().GetInventoryCutOffTime()
+ if err != nil {
+ logx.Errorf("MonthStats GetCurrentStats get GetInventoryCutOffTime err:%v", err)
+ return
+ }
inputMap, err := GetStatsByOperationType(beginTime, endTime, constvar.BaseOperationTypeIncoming)
if err != nil {
logx.Errorf("MonthStats GetStatsByOperationType input err:%v", err)
--
Gitblit v1.8.0