From a5f2694d9ca3876208041582f2856be83a06e764 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 23 四月 2024 10:57:28 +0800
Subject: [PATCH] 库存调整修改4
---
controllers/operation.go | 94 +++++++++++++++++++++++++++-------------------
1 files changed, 55 insertions(+), 39 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index af53200..4ebdf5c 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -871,14 +871,19 @@
}
var fileUrl string
+ companyName := conf.WebConf.CompanyName
+ if companyName == "" {
+ util.ResponseFormat(c, code.RequestParamError, "缂哄皯宸ュ巶鍚嶇О閰嶇疆")
+ return
+ }
if operation.BaseOperationType == constvar.BaseOperationTypeIncoming {
- if conf.WebConf.CompanyName == "jialian" {
- fileUrl, err = JialianInputOperation(operation)
+ if companyName == "jialian" {
+ fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
- } else {
+ } else if companyName == "geruimi" {
fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
@@ -886,21 +891,32 @@
}
}
} else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
- fileUrl, err = ExportOutputOperation(constvar.FileTemplateCategory_Output, operation)
- if err != nil {
- util.ResponseFormat(c, code.RequestParamError, err.Error())
- return
+ if companyName == "jialian" {
+ fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
+ } else if companyName == "geruimi" {
+ fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Output, operation)
+ if err != nil {
+ util.ResponseFormat(c, code.RequestParamError, err.Error())
+ return
+ }
}
} else {
util.ResponseFormat(c, code.RequestParamError, "璇ヨ褰曚笉鏀寔鎵撳嵃")
return
}
- util.ResponseFormat(c, code.Success, fileUrl)
+ m := make(map[string]string)
+ m["url"] = fileUrl
+ m["name"] = companyName
+ util.ResponseFormat(c, code.Success, m)
}
-func JialianInputOperation(operation *models.Operation) (string, error) {
- template, err := models.NewFileTemplateAttachmentSearch().SetCategory(14).First()
+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())
}
@@ -921,7 +937,7 @@
rowIndex := 5
totalAmount := decimal.NewFromInt(0)
- //totalPrice := decimal.NewFromInt(0)
+ totalPrice := decimal.NewFromInt(0)
for i, v := range operation.Details {
//璁剧疆琛ㄥ崟鏈�澶�9鏉℃暟鎹�
if i > 8 {
@@ -931,18 +947,16 @@
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.PurchasePrice.String())
- if !v.Product.PurchasePrice.IsZero() {
- //totalPrice = totalPrice.Add(v.Product.PurchasePrice)
- price := v.Amount.Mul(v.Product.PurchasePrice).String()
+ f.SetCellValue("Sheet1", "E"+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("Sheet1", string('M'+n)+strconv.Itoa(rowIndex), string(a))
}
- } else {
- f.SetCellValue("Sheet1", "M"+strconv.Itoa(rowIndex), "0")
- f.SetCellValue("Sheet1", "N"+strconv.Itoa(rowIndex), "0")
}
s := split[0]
n := 0
@@ -960,27 +974,29 @@
totalAmount = totalAmount.Add(v.Amount)
}
//鍚堣
- //if !totalPrice.IsZero() {
- // price := totalAmount.Mul(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))
- // }
- // }
- // 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])
- // break
- // }
- // f.SetCellValue("Sheet1", string('L'-n)+"14", string(s[j]))
- // n++
- // }
- //}
- //f.SetCellValue("Sheet1", "D14", totalAmount)
- //f.SetCellValue("Sheet1", "E14", totalPrice)
+ 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))
+ }
+ } else {
+ f.SetCellValue("Sheet1", "M14", "0")
+ f.SetCellValue("Sheet1", "N14", "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])
+ break
+ }
+ f.SetCellValue("Sheet1", string('L'-n)+"14", string(s[j]))
+ n++
+ }
+ }
+ f.SetCellValue("Sheet1", "D14", totalAmount)
f.SetCellValue("Sheet1", "B15", operation.Manager)
f.SetCellValue("Sheet1", "D15", operation.Accountant)
--
Gitblit v1.8.0