From d6e975fc8d240c6300a2303d42dc5496dd85b61a Mon Sep 17 00:00:00 2001
From: dsmzx <dsmzx@123.com>
Date: 星期二, 02 七月 2024 15:44:15 +0800
Subject: [PATCH] 出库/入库打印 修改bug

---
 controllers/operation.go |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/controllers/operation.go b/controllers/operation.go
index 4828007..83a9b32 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"
@@ -791,16 +790,13 @@
 					util.ResponseFormat(c, code.RequestParamError, err.Error())
 					return
 				}
-
-			} else if warehouse.FileTemplateCategoryIn == constvar.FileTemplateCategory_JialianInput1 {
+			} 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 {
@@ -832,7 +828,7 @@
 					return
 				}
 
-			} else if warehouse.FileTemplateCategoryOut == constvar.FileTemplateCategory_JialianOutput1 {
+			} else {
 				fileUrl, err = JialianOperation2(warehouse.FileTemplateCategoryOut, operation)
 				if err != nil {
 					util.ResponseFormat(c, code.RequestParamError, err.Error())
@@ -873,8 +869,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())
 	}
@@ -1002,7 +996,6 @@
 
 	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
 	}
@@ -1121,7 +1114,6 @@
 
 	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
 	}

--
Gitblit v1.8.0