From 8cb1da78fd4d237b278ed4d512c6c4f04b663cfc Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期一, 22 四月 2024 11:34:47 +0800
Subject: [PATCH] 库存调整修改
---
controllers/operation.go | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index 229b1eb..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" {
+ if companyName == "jialian" {
fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianInput, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
- } else if conf.WebConf.CompanyName == "geruimi" {
+ } else if companyName == "geruimi" {
fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
@@ -886,14 +891,14 @@
}
}
} else if operation.BaseOperationType == constvar.BaseOperationTypeOutgoing {
- if conf.WebConf.CompanyName == "jialian" {
+ if companyName == "jialian" {
fileUrl, err = JialianOperation(constvar.FileTemplateCategory_JialianOutput, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
- } else if conf.WebConf.CompanyName == "geruimi" {
- fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Selfmade, operation)
+ } else if companyName == "geruimi" {
+ fileUrl, err = ExportInputSelfmade(constvar.FileTemplateCategory_Output, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
@@ -904,7 +909,10 @@
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 JialianOperation(category constvar.FileTemplateCategory, operation *models.Operation) (string, error) {
@@ -939,9 +947,9 @@
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() {
- ap := v.Amount.Mul(v.Product.PurchasePrice)
+ 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, ".")
--
Gitblit v1.8.0