From c88f0b8221d61e61424cd6abc8cf03d4127a0359 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 04 七月 2024 23:19:18 +0800
Subject: [PATCH] fix

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

diff --git a/controllers/operation.go b/controllers/operation.go
index d4c32c5..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 {
@@ -259,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 == "" {
@@ -853,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
@@ -891,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