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 |   22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/controllers/operation.go b/controllers/operation.go
index a841978..f0afda4 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -94,7 +94,7 @@
 		params.WarehouseId = operationType.WarehouseId
 	}
 
-	if params.InventoryDealerType == 0 {
+	if params.DealerType == "" {
 		CheckInventoryDealerType(&params)
 	}
 
@@ -169,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 {
@@ -849,7 +843,7 @@
 					return
 				}
 			} else {
-				fileUrl, err = JialianOperation2(warehouse.FileTemplateCategoryIn, operation)
+				fileUrl, err = JialianOperation2(constvar.FileTemplateCategory_JialianInput1, operation)
 				if err != nil {
 					util.ResponseFormat(c, code.RequestParamError, err.Error())
 					return
@@ -887,7 +881,7 @@
 				}
 
 			} else {
-				fileUrl, err = JialianOperation2(warehouse.FileTemplateCategoryOut, operation)
+				fileUrl, err = JialianOperation2(constvar.FileTemplateCategory_JialianOutput1, operation)
 				if err != nil {
 					util.ResponseFormat(c, code.RequestParamError, err.Error())
 					return

--
Gitblit v1.8.0