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 | 272 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 237 insertions(+), 35 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 8db06b8..d948560 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -9,6 +9,7 @@
"github.com/shopspring/decimal"
"github.com/xuri/excelize/v2"
"gorm.io/gorm"
+ "io/ioutil"
"sort"
"strconv"
"strings"
@@ -62,26 +63,42 @@
return
}
- if err := slf.FormatLocation(¶ms); 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(¶ms); 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 {
@@ -92,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(¶ms); err != nil {
return err
}
@@ -136,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 {
@@ -190,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("璇锋坊鍔犳槑缁嗕俊鎭�")
@@ -250,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
@@ -281,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
@@ -302,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
}
@@ -338,9 +364,12 @@
util.ResponseFormat(c, code.RequestParamError, "鏄庣粏涓笉鑳藉瓨鍦ㄩ噸澶嶇殑浜у搧")
return
}
- if err := slf.FormatLocation(¶ms); err != nil {
- util.ResponseFormat(c, code.RequestParamError, err.Error())
- return
+
+ if params.BaseOperationType != constvar.BaseOperationTypeAdjust {
+ if err := slf.FormatLocation(¶ms); 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 {
@@ -486,19 +515,19 @@
}
if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing || operation.BaseOperationType == constvar.BaseOperationTypeDisuse {
- if err := service.FinishOperationOutput(tx, listDetails, mapLocAmount); err != nil {
+ if err := service.FinishOperationOutput(tx, listDetails, mapLocAmount, operation); err != nil {
return err
}
}
if operation.BaseOperationType == constvar.BaseOperationTypeInternal {
- if err := service.FinishOperationInternal(tx, listDetails); err != nil {
+ if err := service.FinishOperationInternal(tx, listDetails, operation); err != nil {
return err
}
}
if operation.BaseOperationType == constvar.BaseOperationTypeAdjust {
- if err := service.FinishOperationAdjust(tx, listDetails, mapLocAmount); err != nil {
+ if err := service.FinishOperationAdjust(tx, listDetails, mapLocAmount, operation); err != nil {
return err
}
}
@@ -697,7 +726,7 @@
util.ResponseFormat(c, code.Success, "鎿嶄綔鎴愬姛")
}
-// outputOperation
+// OutputOperation
//
// @Tags 鍏ュ簱/鍑哄簱
// @Summary 鎵撳嵃
@@ -737,11 +766,37 @@
if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
if companyName == "jialian" {
// 鍏ュ簱
- fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput, operation)
+ oT, err := models.NewOperationTypeSearch().SetID(uint(operation.OperationTypeId)).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
+ warehouse, err := models.NewWarehouseSearch().SetID(oT.WarehouseId).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ if warehouse.FileTemplateCategoryIn == constvar.FileTemplateCategory_JialianInput1 {
+ fileUrl, err = JialianOperation2(warehouse.FileTemplateCategoryIn, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ } else if warehouse.FileTemplateCategoryIn == constvar.FileWarehouseCategory_JialianInput2 {
+ fileUrl, err = JialianOperation1(warehouse.FileTemplateCategoryIn, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ }
+
} else if companyName == "geruimi" {
fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
if err != nil {
@@ -751,11 +806,35 @@
}
} else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing { // 浜よ揣
if companyName == "jialian" {
- // 鍑哄簱
- fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput, operation)
+ oT, err := models.NewOperationTypeSearch().SetID(uint(operation.OperationTypeId)).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
+ }
+ warehouse, err := models.NewWarehouseSearch().SetID(oT.WarehouseId).First()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ if warehouse.FileTemplateCategoryOut == constvar.FileTemplateCategory_JialianOutput1 {
+ fileUrl, err = JialianOperation2(warehouse.FileTemplateCategoryOut, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
+ } else if warehouse.FileTemplateCategoryOut == constvar.FileWarehouseCategory_JialianOutput2 {
+ fileUrl, err = JialianOperation1(warehouse.FileTemplateCategoryOut, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+
}
} else if companyName == "geruimi" {
fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Output, operation)
@@ -775,13 +854,13 @@
util.ResponseFormat(c, code.Success, m)
}
-func JialianOperation(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
+func JialianOperation1(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
// 鑾峰彇妯℃澘璁板綍
template, err := models.NewFileTemplateAttachmentSearch().SetCategory(category).First()
if err != nil {
return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
}
-
+ fmt.Println(template)
// 鏍规嵁妯℃澘璺緞鑾峰彇妯℃澘娑堟伅
readerCloser, err := http.HttpGetWithReadCloser(template.FileUrl)
if err != nil {
@@ -800,9 +879,9 @@
defer f.Close()
sheet := "Sheet1"
- if category == constvar.FileTemplateCategory_JialianInput {
+ if category == constvar.FileWarehouseCategory_JialianInput2 {
sheet = "鍏ュ簱鍗�"
- } else if category == constvar.FileTemplateCategory_JialianOutput {
+ } else if category == constvar.FileWarehouseCategory_JialianOutput2 {
sheet = "鍑哄簱鍗�"
}
@@ -818,6 +897,10 @@
f.SetCellValue(sheet, "L3", date[5:7]) // 鏈�
f.SetCellValue(sheet, "N3", date[8:10]) // 鏃�
+ var entityIDs []string
+ for _, v := range operation.Details {
+ entityIDs = append(entityIDs, v.ProductId)
+ }
attributeMap := make(map[string]uint)
attributeValueMap := make(map[string]string)
attributes, err := models.NewAttributeSearch().SetEntityType(1).FindNotTotal()
@@ -827,7 +910,7 @@
for _, v := range attributes {
attributeMap[v.Name] = v.ID
}
- attributeValues, err := models.NewAttributeValueSearch().FindNotTotal()
+ attributeValues, err := models.NewAttributeValueSearch().SetEntityIDs(entityIDs).FindNotTotal()
if err != nil {
return "", errors.New("鑾峰彇鍔ㄦ�佸睘鎬у�煎け璐ワ細" + err.Error())
}
@@ -845,7 +928,7 @@
break
}
f.SetCellValue(sheet, "B"+strconv.Itoa(rowIndex), v.Product.Name) // 浜у搧鍚嶇О
- f.SetCellValue(sheet, "C"+strconv.Itoa(rowIndex), v.Product.Unit) //瑙勬牸
+ f.SetCellValue(sheet, "C"+strconv.Itoa(rowIndex), v.Product.Specs) //瑙勬牸
f.SetCellValue(sheet, "D"+strconv.Itoa(rowIndex), attributeValueMap[fmt.Sprintf("%d%s", attributeMap["棰滆壊"], v.ProductId)]) //棰滆壊
f.SetCellValue(sheet, "E"+strconv.Itoa(rowIndex), attributeValueMap[fmt.Sprintf("%d%s", attributeMap["闈㈡枡"], v.ProductId)]) //闈㈡枡
f.SetCellValue(sheet, "F"+strconv.Itoa(rowIndex), v.TotalGrossWeight.String()) //閲嶉噺
@@ -914,12 +997,131 @@
}
fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
+ ioutil.WriteFile("E:\\"+uuid.NewV4().String()+".xlsx", buf.Bytes(), 0644)
if err != nil {
//ioutil.WriteFile("E:\\"+uuid.NewV4().String()+".xlsx", buf.Bytes(), 0644)
logx.Errorf("file upload err: %v", err)
return "", err
}
+ return fileUrl, nil
+}
+func JialianOperation2(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
+ // 鑾峰彇妯℃澘璁板綍
+ template, err := models.NewFileTemplateAttachmentSearch().SetCategory(category).First()
+ if err != nil {
+ return "", errors.New("鑾峰彇妯＄増璁板綍澶辫触:" + err.Error())
+ }
+ fmt.Println(template)
+ // 鏍规嵁妯℃澘璺緞鑾峰彇妯℃澘娑堟伅
+ readerCloser, err := http.HttpGetWithReadCloser(template.FileUrl)
+ if err != nil {
+ return "", errors.New("鑾峰彇妯＄増澶辫触:" + err.Error())
+ }
+
+ // 璇诲彇妯℃澘鍐呭
+ f, err := excelize.OpenReader(readerCloser)
+ if err != nil {
+ return "", errors.New("璇诲彇excel妯＄増澶辫触锛�" + err.Error())
+ }
+ readerCloser.Close()
+
+ defer f.Close()
+
+ sheet := "Sheet1"
+ f.SetCellValue(sheet, "A2", "鍗曚綅(閮ㄩ棬):"+operation.CompanyName) // 鍗曚綅閮ㄩ棬
+ f.SetCellValue(sheet, "J2", operation.OperationDate) // 鏃堕棿
+ f.SetCellValue(sheet, "Q2", operation.Number) // 缂栧彿
+
+ totalAmount := decimal.NewFromInt(0) // 鎬婚噾棰�
+ totalPrice := decimal.NewFromInt(0) // 鎬讳环
+ rowIndex := 5
+ for i, v := range operation.Details {
+ //璁剧疆琛ㄥ崟鏈�澶�9鏉℃暟鎹�
+ if i > 9 {
+ break
+ }
+ f.SetCellValue(sheet, "A"+strconv.Itoa(rowIndex), v.Product.Name) // 鍝佸悕
+ f.SetCellValue(sheet, "B"+strconv.Itoa(rowIndex), v.Product.Type) // 鍨嬪彿
+ f.SetCellValue(sheet, "C"+strconv.Itoa(rowIndex), v.Product.Unit) // 鍗曚綅
+ f.SetCellValue(sheet, "D"+strconv.Itoa(rowIndex), v.Amount.String()) // 鏁伴噺
+ unit := service.CreateMoreUnit(v.Amount, v.Product.MoreUnitList)
+ for _, v1 := range unit {
+ if !v1.Amount.IsZero() {
+ f.SetCellValue(sheet, "E"+strconv.Itoa(rowIndex), v1.Amount) // 杈呮暟閲�
+ f.SetCellValue(sheet, "F"+strconv.Itoa(rowIndex), v1.Unit) // 杈呭崟浣�
+ break
+ }
+ }
+ f.SetCellValue(sheet, "G"+strconv.Itoa(rowIndex), v.Product.SalePrice.String()) // 鍗曚环
+ // 閲戦
+ if !v.Product.SalePrice.IsZero() {
+ ap := v.Amount.Mul(v.Product.SalePrice)
+ totalPrice = totalPrice.Add(ap)
+ price := ap.String()
+ split := strings.Split(price, ".")
+ if len(split) == 2 {
+ for n, a := range split[1] {
+ f.SetCellValue(sheet, string('O'+n)+strconv.Itoa(rowIndex), string(a))
+ }
+ }
+ s := split[0]
+ n := 0
+ for j := len(s) - 1; j >= 0; j-- {
+ if n == 6 {
+ f.SetCellValue(sheet, string('N'-n)+strconv.Itoa(rowIndex), s[:j])
+ break
+ }
+ f.SetCellValue(sheet, string('N'-n)+strconv.Itoa(rowIndex), string(s[j]))
+ n++
+ }
+ }
+ rowIndex++
+ totalAmount = totalAmount.Add(v.Amount)
+ }
+
+ //鍚堣
+ if !totalPrice.IsZero() {
+ price := totalPrice.String()
+ split := strings.Split(price, ".")
+ if len(split) == 2 {
+ for n, a := range split[1] {
+ f.SetCellValue(sheet, string('N'+n)+"14", string(a))
+ }
+ } else {
+ f.SetCellValue(sheet, "O14", "0")
+ f.SetCellValue(sheet, "P14", "0")
+ }
+ s := split[0]
+ n := 0
+ for j := len(s) - 1; j >= 0; j-- {
+ if n == 6 {
+ f.SetCellValue(sheet, string('N'-n)+"14", s[:j])
+ break
+ }
+ f.SetCellValue(sheet, string('N'-n)+"14", string(s[j]))
+ n++
+ }
+ }
+
+ f.SetCellValue(sheet, "Q5", operation.Remark) // 澶囨敞
+
+ // 绗�14琛�
+ f.SetCellValue(sheet, "B15", operation.Manager) // 涓荤
+ f.SetCellValue(sheet, "D15", operation.Accountant) // 浼氳
+ f.SetCellValue(sheet, "H15", operation.Custodian) //淇濈鍛�
+ f.SetCellValue(sheet, "Q15", operation.Custodian) //缁忔墜
+ buf, err := f.WriteToBuffer()
+ if err != nil {
+ return "", err
+ }
+
+ fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
+ ioutil.WriteFile("E:\\"+uuid.NewV4().String()+".xlsx", buf.Bytes(), 0644)
+ if err != nil {
+ logx.Errorf("file upload err: %v", err)
+ return "", err
+ }
return fileUrl, nil
}
--
Gitblit v1.8.0