From e6336650959c54593dab68c2f6863d44992271b2 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期一, 09 十二月 2024 16:13:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 2 +-
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 8 ++++----
src/main/java/com/zy/common/service/CommonService.java | 7 +++++--
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 8ff7df8..bc6e67b 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -90,14 +90,14 @@
if (result.getCode()==200){
continue;
}else {
- System.out.println(staNo+"澶辫触锛�");
+ System.out.println(staNo+"澶辫触1锛�");
}
} else {
ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,23);//5锛氭弧鍙�
if (result.getCode()==200){
continue;
}else {
- System.out.println(staNo+"澶辫触锛�");
+ System.out.println(staNo+"澶辫触2锛�");
}
}
}
@@ -123,7 +123,7 @@
if (result.getCode()==200) {
continue;
} else {
- System.out.println(staNo+"澶辫触锛�");
+ System.out.println(staNo+"澶辫触3锛�");
}
}
}
@@ -193,7 +193,7 @@
if (result.getCode()==200){
continue;
}else {
- System.out.println(staNo+"澶辫触锛�");
+ System.out.println(staNo+"澶辫触4锛�");
}
}
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 7da282b..08446f5 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -575,7 +575,7 @@
}
if ((curRow - sRow) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
} else if ((curRow - sRow + 1) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index b6d03f5..1d2bc1f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -182,8 +182,10 @@
nearRow = locNecessaryParameters[3];
if (crnNo>5 || crnNo<3){
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
- int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100).ne("source_sta_no",100).ne("source_sta_no",148));
+ int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100).ne("source_sta_no",100).and().ne("source_sta_no",148));
if (locMasts.size()-crnCountO<=2){
+ log.error(crnNo+"鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ nearRow = 0;
times++;
continue;
}
@@ -194,7 +196,8 @@
}
}
if (nearRow == 0) {
- throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満,鏃犲彲鐢ㄧ┖搴撲綅");
}
boolean signRule1 = false;
--
Gitblit v1.9.1