From d8e58cc61c3a1cb1d6a083cd46803130d0243ef1 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 10 十一月 2025 16:40:15 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index fd7c8aa..5cad068 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -855,7 +855,7 @@
if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getModeType() == CrnModeType.AUTO && crnProtocol.getForkPos() == 0 && crnProtocol.getTaskNo() == 0 && crnProtocol.getTaskNoTwo() == 0) {
News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛屽爢鍨涙満鍏ュ嚭搴撲綔涓氫笅鍙�");
if (crnProtocol.getLoaded() == 0 && crnProtocol.getLoadedTwo() == 0) {
- News.error("宸ヤ綅1鏃犵墿锛屽伐浣�2鏃犵墿");
+ //News.error("宸ヤ綅1鏃犵墿锛屽伐浣�2鏃犵墿");
//鍫嗗灈鏈烘病鏈夌墿鏂�
// 濡傛灉鏈�杩戜竴娆℃槸鍏ュ簱妯″紡
if (crnProtocol.getLastIo().equals("I")) {
@@ -881,7 +881,7 @@
}
} else if (crnProtocol.getLoaded() == 1 && crnProtocol.getLoadedTwo() == 1) {
- News.error("宸ヤ綅1鏈夌墿锛屽伐浣�2鏈夌墿");
+ //News.error("宸ヤ綅1鏈夌墿锛屽伐浣�2鏈夌墿");
// 鍫嗗灈鏈烘湁鐗╂枡
WrkMast wrkMast = wrkMastMapper.selectByPltType(crn.getId(), 1);
if (wrkMast != null) {
@@ -894,7 +894,7 @@
log.error("" + mark + " - 1" + " - 鏈夌墿鏂欐棤宸ヤ綔妗� ===銆嬪紓甯�");
}
} else if (crnProtocol.getLoaded() == 1 && crnProtocol.getLoadedTwo() == 0) {
- News.error("宸ヤ綅1鏈夌墿锛屽伐浣�2鏃犵墿");
+ //News.error("宸ヤ綅1鏈夌墿锛屽伐浣�2鏃犵墿");
// 鍫嗗灈鏈哄伐浣�1鏈夌墿鏂�
WrkMast wrkMast = wrkMastMapper.selectByPltType(crn.getId(), 1);
if (wrkMast != null) {
@@ -923,7 +923,7 @@
log.error("" + mark + " - 1" + " - 鏈夌墿鏂欐棤宸ヤ綔妗� ===銆嬪紓甯�");
}
} else if (crnProtocol.getLoaded() == 0 && crnProtocol.getLoadedTwo() == 1) {
- News.error("宸ヤ綅1鏃犵墿锛屽伐浣�2鏈夌墿");
+ //News.error("宸ヤ綅1鏃犵墿锛屽伐浣�2鏈夌墿");
// 鍫嗗灈鏈哄伐浣�2鏈夌墿鏂�
WrkMast wrkMast = wrkMastMapper.selectByPltType(crn.getId(), 2);
if (wrkMast != null) {
@@ -3861,7 +3861,10 @@
// 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep107(slave.getId(), crnStn.getStaNo());
for (WrkMast wrkMast : wrkMasts) {
- if (wrkMast == null || wrkMast.getPltType() == 2) {
+// if (wrkMast == null || wrkMast.getPltType() == 2) {
+// continue;
+// }
+ if (wrkMast == null){
continue;
}
// 宸ヤ綔妗ｇ姸鎬佸垽鏂�
--
Gitblit v1.9.1