From c6b26991704713d4a4d88e520759f02cd337219f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 04 七月 2024 22:59:53 +0800
Subject: [PATCH] fix

---
 controllers/operation.go |   58 +++++++++++++++++++---------------------------------------
 1 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/controllers/operation.go b/controllers/operation.go
index fb1285d..f0afda4 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"
@@ -95,7 +94,7 @@
 		params.WarehouseId = operationType.WarehouseId
 	}
 
-	if params.InventoryDealerType == 0 {
+	if params.DealerType == "" {
 		CheckInventoryDealerType(&params)
 	}
 
@@ -170,21 +169,15 @@
 	default:
 		return
 	}
-	miniDict, _ := models.NewMiniDictSearch().SetType(dictType).SetName(dictName).First()
-	if miniDict != nil {
-		params.InventoryDealerType = int(miniDict.ID)
-	} else {
-		dict := &models.MiniDict{
+	miniDict, err := models.NewMiniDictSearch().SetType(dictType).SetName(dictName).First()
+	if err == gorm.ErrRecordNotFound {
+		miniDict = &models.MiniDict{
 			Type: dictType,
 			Name: dictName,
 		}
-		models.NewMiniDictSearch().Create(dict)
-		miniDict, err := models.NewMiniDictSearch().SetType(dictType).SetName(dictName).First()
-		if err != nil {
-			return
-		}
-		params.InventoryDealerType = int(miniDict.ID)
+		models.NewMiniDictSearch().Create(miniDict)
 	}
+	params.DealerType = miniDict.Name
 }
 
 func CheckDetailsRepeat(details []*models.OperationDetails) bool {
@@ -260,12 +253,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 +836,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(constvar.FileTemplateCategory_JialianInput1, 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 +873,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(constvar.FileTemplateCategory_JialianOutput1, operation)
 				if err != nil {
 					util.ResponseFormat(c, code.RequestParamError, err.Error())
 					return
@@ -935,8 +921,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 +1047,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 +1165,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 +1248,6 @@
 		logx.Errorf("file upload err: %v", err)
 		return "", err
 	}
-
 	return fileUrl, nil
 }
 

--
Gitblit v1.8.0