From 12ead07c578158b98f7403aaaa2f96eb12b93f26 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 29 四月 2024 15:16:24 +0800
Subject: [PATCH] 纤度登记检查车间车号配置

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

diff --git a/controllers/fineness.go b/controllers/fineness.go
index 714ca28..7e1ed5b 100644
--- a/controllers/fineness.go
+++ b/controllers/fineness.go
@@ -39,9 +39,15 @@
 		return
 	}
 
-	_, err := service.GetSilkRankStandard()
+	silkStandard, err := service.GetSilkRankStandard()
 	if err != nil {
 		util.ResponseFormat(c, code.RequestParamError, err.Error())
+		return
+	}
+
+	endCarMap, err := service.GetWorkshopEndCarMap(params.WorkshopNumber, params.WorkshopGroup)
+	if len(endCarMap) == 0 {
+		util.ResponseFormat(c, code.RequestParamError, "璇峰厛閰嶇疆瀵瑰簲杞﹂棿鐨勮溅鍙�")
 		return
 	}
 
@@ -68,7 +74,7 @@
 		util.ResponseFormat(c, code.RequestParamError, "淇濆瓨澶辫触")
 	}
 
-	err = service.FinenessCheck(&params, isNew)
+	err = service.FinenessCheck(&params, silkStandard, endCarMap, isNew)
 	if err != nil {
 		logx.Errorf("service.FinenessCheck err:%v, finenessRegister:%+v", err, params)
 		util.ResponseFormat(c, code.RequestParamError, "鐢熸垚妫�楠岃〃澶辫触")

--
Gitblit v1.8.0