From f0786e779666d67a50cd57d82cfe1e278b47d397 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 04 七月 2024 11:54:11 +0800
Subject: [PATCH] fix
---
controllers/operation.go | 40 +++++++++++++---------------------------
1 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/controllers/operation.go b/controllers/operation.go
index fb1285d..a841978 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -9,7 +9,6 @@
"github.com/shopspring/decimal"
"github.com/xuri/excelize/v2"
"gorm.io/gorm"
- "io/ioutil"
"sort"
"strconv"
"strings"
@@ -260,12 +259,8 @@
if params.OperationTypeId == 0 && int(params.BaseOperationType) == 0 {
return errors.New("鏈瘑鍒璁板綍绫诲瀷1")
- }
-
- if params.BaseOperationType != 0 {
- if params.WarehouseId == 0 {
- return errors.New("鏈瘑鍒璁板綍绫诲瀷2")
- }
+ } else if params.OperationTypeId == 0 && params.BaseOperationType != 0 && params.WarehouseId == 0 {
+ return errors.New("鏈瘑鍒璁板綍绫诲瀷2")
}
if params.OperationDate == "" {
@@ -847,22 +842,19 @@
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 {
+ if warehouse.FileTemplateCategoryIn == constvar.FileWarehouseCategory_JialianInput2 {
fileUrl, err = JialianOperation1(warehouse.FileTemplateCategoryIn, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
}
-
+ } else {
+ fileUrl, err = JialianOperation2(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 {
@@ -887,15 +879,15 @@
return
}
- if warehouse.FileTemplateCategoryOut == constvar.FileTemplateCategory_JialianOutput1 {
- fileUrl, err = JialianOperation2(warehouse.FileTemplateCategoryOut, operation)
+ 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 warehouse.FileTemplateCategoryOut == constvar.FileWarehouseCategory_JialianOutput2 {
- fileUrl, err = JialianOperation1(warehouse.FileTemplateCategoryOut, operation)
+ } else {
+ fileUrl, err = JialianOperation2(warehouse.FileTemplateCategoryOut, operation)
if err != nil {
util.ResponseFormat(c, code.RequestParamError, err.Error())
return
@@ -935,8 +927,6 @@
// 璇诲彇妯℃澘鍐呭
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())
}
@@ -1063,9 +1053,7 @@
}
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
}
@@ -1183,7 +1171,6 @@
}
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
@@ -1267,7 +1254,6 @@
logx.Errorf("file upload err: %v", err)
return "", err
}
-
return fileUrl, nil
}
--
Gitblit v1.8.0