From 70af762aa04fccfd68f211a9991c9a36f0228dfd Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 11 十二月 2025 17:53:43 +0800
Subject: [PATCH] #AI

---
 src/main/java/com/zy/common/service/CommonService.java |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index f9c3670..2e530de 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -38,8 +38,6 @@
     @Autowired
     private NavigateUtils navigateUtils;
     @Autowired
-    private CommonService commonService;
-    @Autowired
     private RedisUtil redisUtil;
 
     /**
@@ -118,20 +116,20 @@
         Date now = new Date();
         LocMast sourceLocMast = locMastService.queryByLoc(param.getSourceLocNo());
         if (null == sourceLocMast) {
-            throw new CoolException("婧愬簱浣嶄笉瀛樺湪");
+            throw new CoolException(param.getSourceLocNo() + "婧愬簱浣嶄笉瀛樺湪");
         }
 
         if (!sourceLocMast.getLocSts().equals("F")) {
-            throw new CoolException("婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��");
+            throw new CoolException(sourceLocMast.getLocNo() + "婧愬簱浣嶄笉澶勪簬鍦ㄥ簱鐘舵��");
         }
 
         LocMast locMast = locMastService.queryByLoc(param.getLocNo());
         if (null == locMast) {
-            throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦�");
+            throw new CoolException(param.getLocNo() + "鐩爣搴撲綅涓嶅瓨鍦�");
         }
 
         if (!locMast.getLocSts().equals("O")) {
-            throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
+            throw new CoolException(locMast.getLocNo() + "鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
         }
 
         double ioPri = 800D;
@@ -139,12 +137,12 @@
             ioPri = param.getTaskPri().doubleValue();
         }
 
-        Integer sourceCrnNo = commonService.findCrnNoByLocNo(sourceLocMast.getLocNo());
+        Integer sourceCrnNo = this.findCrnNoByLocNo(sourceLocMast.getLocNo());
         if (sourceCrnNo == null) {
             throw new CoolException("鏈壘鍒板搴斿爢鍨涙満");
         }
 
-        Integer crnNo = commonService.findCrnNoByLocNo(locMast.getLocNo());
+        Integer crnNo = this.findCrnNoByLocNo(locMast.getLocNo());
         if (crnNo == null) {
             throw new CoolException("鏈壘鍒板搴斿爢鍨涙満");
         }
@@ -190,11 +188,11 @@
         Date now = new Date();
         LocMast locMast = locMastService.queryByLoc(param.getLocNo());
         if (null == locMast) {
-            throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦�");
+            throw new CoolException(param.getLocNo() + "鐩爣搴撲綅涓嶅瓨鍦�");
         }
 
         if (!locMast.getLocSts().equals("O")) {
-            throw new CoolException("鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
+            throw new CoolException(locMast.getLocNo() + "鐩爣搴撲綅涓嶅浜庣┖搴撶姸鎬�");
         }
 
         double ioPri = 100D;
@@ -202,7 +200,7 @@
             ioPri = param.getTaskPri().doubleValue();
         }
 
-        Integer crnNo = commonService.findCrnNoByLocNo(locMast.getLocNo());
+        Integer crnNo = this.findCrnNoByLocNo(locMast.getLocNo());
         if (crnNo == null) {
             throw new CoolException("鏈壘鍒板搴斿爢鍨涙満");
         }
@@ -256,12 +254,12 @@
             ioPri = param.getTaskPri().doubleValue();
         }
 
-        Integer crnNo = commonService.findCrnNoByLocNo(locMast.getLocNo());
+        Integer crnNo = this.findCrnNoByLocNo(locMast.getLocNo());
         if (crnNo == null) {
             throw new CoolException("鏈壘鍒板搴斿爢鍨涙満");
         }
 
-        Integer sourceStationId = commonService.findOutStationId(crnNo, param.getStaNo());
+        Integer sourceStationId = this.findOutStationId(crnNo, param.getStaNo());
         if (sourceStationId == null) {
             throw new CoolException("鏈壘鍒拌緭閫佺洰鏍囩珯鐐瑰彲璧拌璺緞");
         }

--
Gitblit v1.9.1