From a9262d9b1c5b570d077c2dc7d3fdda9058f88ec7 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 25 六月 2024 11:15:07 +0800
Subject: [PATCH] 调拨和库存调整产生的出入库补充对应仓库的业务类型
---
controllers/operation.go | 189 ++++++++++++++++++++++++++++++++++------------
1 files changed, 139 insertions(+), 50 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index d59b86b..2b5fdc5 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -3,6 +3,7 @@
import (
"context"
"errors"
+ "fmt"
"github.com/gin-gonic/gin"
uuid "github.com/satori/go.uuid"
"github.com/shopspring/decimal"
@@ -47,6 +48,7 @@
func (slf OperationController) Add(c *gin.Context) {
var reqParams request.AddOperation
var params models.Operation
+
if err := c.BindJSON(&reqParams); err != nil {
util.ResponseFormat(c, code.RequestParamError, "鍙傛暟瑙ｆ瀽澶辫触锛屾暟鎹被鍨嬮敊璇�")
return
@@ -90,25 +92,26 @@
util.ResponseFormat(c, code.RequestParamError, "鍗曞彿宸插瓨鍦�")
return
}
-
- var productIds []string
- for _, v := range params.Details {
- productIds = append(productIds, v.ProductId)
- }
- products, err := models.NewMaterialSearch().SetIDs(productIds).FindNotTotal()
- if err != nil {
- logx.Errorf("MonthStats get products err:%v", err)
- return
- }
- productMap := models.MaterialMap(products)
- for i, v := range params.Details {
- material := productMap[v.ProductId]
- if material != nil {
- params.Details[i].Note = material.Note
+ err = models.WithTransaction(func(db *gorm.DB) error {
+ if err := models.NewOperationSearch().Create(¶ms); err != nil {
+ return err
}
- }
+ /*od := params.Details
+ for _, v := range od {
+ //material, err := models.NewMaterialSearch().SetID(v.ProductId).First()
+ //if err != nil {return err}
+ material := new(models.Material)
+ material.ID = v.ProductId
+ material.Cost = v.Cost
+ material.SalePrice = v.SalePrice
+ if err := models.NewMaterialSearch().SetOrm(db).Update(material); err != nil {
+ return err
+ }
+ }*/
+ return nil
+ })
- if err := models.NewOperationSearch().Create(¶ms); err != nil {
+ if err != nil {
logx.Errorf("Operation create err: %v", err)
util.ResponseFormat(c, code.SaveFail, "娣诲姞澶辫触锛�"+err.Error())
return
@@ -178,9 +181,9 @@
}
func (slf OperationController) CheckParams(params models.Operation) error {
- if params.SourceNumber == "" {
+ /*if params.SourceNumber == "" {
return errors.New("璇峰～鍏ユ簮鍗曞彿")
- }
+ }*/
if params.Number == "" {
return errors.New("璇峰～鍏ュ崟鍙�")
@@ -267,10 +270,29 @@
if int(params.Status) != 0 {
search.SetStatus(params.Status)
}
+ materials, err := models.NewMaterialSearch().FindNotTotal()
+ if err != nil {
+ util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
+ return
+ }
+ costMap := make(map[string]decimal.Decimal)
+ salePriceMap := make(map[string]decimal.Decimal)
+ for _, material := range materials {
+ costMap[material.ID] = material.Cost
+ salePriceMap[material.ID] = material.SalePrice
+ }
list, total, err := search.SetOperationTypeId(params.OperationTypeId).SetPreload(true).SetOrder("created_at desc").Find()
if err != nil {
util.ResponseFormat(c, code.RequestError, "鏌ユ壘澶辫触:"+err.Error())
return
+ }
+ for _, v := range list {
+ for _, v1 := range v.Details {
+ //v1.SalePrice = decimal.NewFromFloat(1.2345)
+ //v1.Cost = decimal.NewFromFloat(9.678)
+ v1.SalePrice = v1.Cost
+ v1.Cost = v1.SalePrice
+ }
}
util.ResponseFormatListWithPage(c, code.Success, list, int(total), params.Page, params.PageSize)
@@ -331,6 +353,18 @@
if err := models.NewOperationSearch().SetOrm(tx).SetID(params.Id).Save(¶ms); err != nil {
return err
}
+ /*od := params.Details
+ for _, v := range od {
+ //material, err := models.NewMaterialSearch().SetID(v.ProductId).First()
+ //if err != nil {return err}
+ material := new(models.Material)
+ material.ID = v.ProductId
+ material.Cost = v.Cost
+ material.SalePrice = v.SalePrice
+ if err := models.NewMaterialSearch().SetOrm(tx).Update(material); err != nil {
+ return err
+ }
+ }*/
return nil
}); err != nil {
util.ResponseFormat(c, code.RequestParamError, "淇敼澶辫触锛�"+err.Error())
@@ -452,19 +486,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, mapLocAmount); 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
}
}
@@ -681,6 +715,7 @@
util.ResponseFormat(c, code.RequestParamError, "id涓�0")
return
}
+ // 鑾峰彇鎿嶄綔娑堟伅
operation, err := models.NewOperationSearch().SetPreload(true).SetID(id).First()
if err != nil {
util.ResponseFormat(c, code.RequestParamError, "鏈壘鍒扮浉鍏冲嚭鍏ュ簱淇℃伅:"+err.Error())
@@ -692,13 +727,16 @@
}
var fileUrl string
+ // 鑾峰彇鍏徃鍚嶇О
companyName := conf.WebConf.CompanyName
if companyName == "" {
util.ResponseFormat(c, code.RequestParamError, "缂哄皯宸ュ巶鍚嶇О閰嶇疆")
return
}
+ // BaseOperationTypeIncoming 鏀惰揣
if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
if companyName == "jialian" {
+ // 鍏ュ簱
fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
@@ -711,8 +749,9 @@
return
}
}
- } else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
+ } else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing { // 浜よ揣
if companyName == "jialian" {
+ // 鍑哄簱
fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
@@ -737,38 +776,87 @@
}
func JialianOperation(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)
+ //fl, err := os.Open("E:\\瀹剁汉鍑哄叆搴撳崟.xlsx")
+ //f, err := excelize.OpenReader(fl)
if err != nil {
return "", errors.New("璇诲彇excel妯＄増澶辫触锛�" + err.Error())
}
readerCloser.Close()
+
defer f.Close()
- f.SetCellValue("Sheet1", "H2", operation.OperationDate)
- f.SetCellValue("Sheet1", "O2", operation.Number)
+ sheet := "Sheet1"
+ if category == constvar.FileTemplateCategory_JialianInput {
+ sheet = "鍏ュ簱鍗�"
+ } else if category == constvar.FileTemplateCategory_JialianOutput {
+ sheet = "鍑哄簱鍗�"
+ }
- rowIndex := 5
- totalAmount := decimal.NewFromInt(0)
- totalPrice := decimal.NewFromInt(0)
+ // 绗簩琛�
+ f.SetCellValue(sheet, "K2", operation.Number) // 鍗曞彿
+ // 绗笁琛�
+ f.SetCellValue(sheet, "D3", operation.CompanyName) // 鍏徃
+ f.SetCellValue(sheet, "G3", "") // 閮ㄩ棬
+
+ // 鏃堕棿
+ date := operation.OperationDate
+ f.SetCellValue(sheet, "I3", date[0:4]) // 骞�
+ 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()
+ if err != nil {
+ return "", errors.New("鑾峰彇鍔ㄦ�佸睘鎬уけ璐ワ細" + err.Error())
+ }
+ for _, v := range attributes {
+ attributeMap[v.Name] = v.ID
+ }
+ attributeValues, err := models.NewAttributeValueSearch().SetEntityIDs(entityIDs).FindNotTotal()
+ if err != nil {
+ return "", errors.New("鑾峰彇鍔ㄦ�佸睘鎬у�煎け璐ワ細" + err.Error())
+ }
+ for _, v := range attributeValues {
+ attributeValueMap[fmt.Sprintf("%d%s", v.AttributeID, v.EntityID)] = v.Value
+ }
+
+ // 绗叚琛� 寰幆濉��
+ totalAmount := decimal.NewFromInt(0) // 鎬婚噾棰�
+ totalPrice := decimal.NewFromInt(0) // 鎬讳环
+ rowIndex := 6
for i, v := range operation.Details {
- //璁剧疆琛ㄥ崟鏈�澶�9鏉℃暟鎹�
- if i > 8 {
+ //璁剧疆琛ㄥ崟鏈�澶�6鏉℃暟鎹�
+ if i > 6 {
break
}
- f.SetCellValue("Sheet1", "A"+strconv.Itoa(rowIndex), v.Product.Name)
- f.SetCellValue("Sheet1", "B"+strconv.Itoa(rowIndex), v.Product.Type)
- f.SetCellValue("Sheet1", "C"+strconv.Itoa(rowIndex), v.Product.Unit)
- f.SetCellValue("Sheet1", "D"+strconv.Itoa(rowIndex), v.Amount.String())
- f.SetCellValue("Sheet1", "E"+strconv.Itoa(rowIndex), v.Product.SalePrice.String())
+ f.SetCellValue(sheet, "B"+strconv.Itoa(rowIndex), v.Product.Name) // 浜у搧鍚嶇О
+ f.SetCellValue(sheet, "C"+strconv.Itoa(rowIndex), v.Product.Unit) //瑙勬牸
+ 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()) //閲嶉噺
+ f.SetCellValue(sheet, "G"+strconv.Itoa(rowIndex), v.Amount.String()) //鏁伴噺
+ f.SetCellValue(sheet, "H"+strconv.Itoa(rowIndex), v.Product.SalePrice.String()) // 鍗曚环
+
+ // 閲戦
if !v.Product.SalePrice.IsZero() {
ap := v.Amount.Mul(v.Product.SalePrice)
totalPrice = totalPrice.Add(ap)
@@ -776,53 +864,54 @@
split := strings.Split(price, ".")
if len(split) == 2 {
for n, a := range split[1] {
- f.SetCellValue("Sheet1", string('M'+n)+strconv.Itoa(rowIndex), string(a))
+ f.SetCellValue(sheet, string('N'+n)+strconv.Itoa(rowIndex), string(a))
}
}
s := split[0]
n := 0
for j := len(s) - 1; j >= 0; j-- {
if n == 6 {
- f.SetCellValue("Sheet1", string('L'-n)+strconv.Itoa(rowIndex), s[:j])
+ f.SetCellValue(sheet, string('M'-n)+strconv.Itoa(rowIndex), s[:j])
break
}
- f.SetCellValue("Sheet1", string('L'-n)+strconv.Itoa(rowIndex), string(s[j]))
+ f.SetCellValue(sheet, string('M'-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("Sheet1", string('M'+n)+"14", string(a))
+ f.SetCellValue(sheet, string('M'+n)+"12", string(a))
}
} else {
- f.SetCellValue("Sheet1", "M14", "0")
- f.SetCellValue("Sheet1", "N14", "0")
+ f.SetCellValue(sheet, "N12", "0")
+ f.SetCellValue(sheet, "O12", "0")
}
s := split[0]
n := 0
for j := len(s) - 1; j >= 0; j-- {
if n == 6 {
- f.SetCellValue("Sheet1", string('L'-n)+"14", s[:j])
+ f.SetCellValue(sheet, string('M'-n)+"12", s[:j])
break
}
- f.SetCellValue("Sheet1", string('L'-n)+"14", string(s[j]))
+ f.SetCellValue(sheet, string('M'-n)+"12", string(s[j]))
n++
}
}
- f.SetCellValue("Sheet1", "D14", totalAmount)
- f.SetCellValue("Sheet1", "B15", operation.Manager)
- f.SetCellValue("Sheet1", "D15", operation.Accountant)
- f.SetCellValue("Sheet1", "F15", operation.Custodian)
-
+ // 澶囨敞 绗�13琛�
+ f.SetCellValue(sheet, "B13", "澶囨敞锛�"+operation.Remark)
+ // 绗�14琛�
+ f.SetCellValue(sheet, "C14", operation.Manager) // 瀹℃牳
+ f.SetCellValue(sheet, "F14", operation.Accountant) // 淇濈
+ f.SetCellValue(sheet, "I14", operation.Custodian) //缁忓姙浜�
buf, err := f.WriteToBuffer()
if err != nil {
return "", err
@@ -830,10 +919,10 @@
fileUrl, err := upload.UploadFileToSeaWeed(string(constvar.FileType_File), uuid.NewV4().String()+".xlsx", buf.Bytes())
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
}
--
Gitblit v1.8.0