From f028efb16717ceb7623b48847480eead72aeb084 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期五, 17 三月 2023 08:57:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 25f25d3..5f2d121 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -493,7 +493,7 @@
Integer code = jsonObject.getInteger("code");
if (code.equals(200)) {
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
-
+ News.info("鍐嶅叆搴撹幏鍙栨柊搴撲綅鎴愬姛锛岃繑鍥炴暟鎹�===>>", JSON.toJSON(dto));
// // 鑾峰彇鐩爣绔�
// Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
// .eq("type_no", wrkMast.getIoType() - 50)
@@ -565,6 +565,9 @@
ledThread.errorReset();
+ if(wrkMast.getIoType()>100){
+ throw new CoolException("鍐嶅叆搴撴洿鏂板伐浣滄。澶辫触锛屼笉鑳界粰PLC涓嬪彂浠诲姟===>>" + wrkMast.getWrkNo());
+ }
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
@@ -1156,6 +1159,8 @@
.last(" and wrk_sts in (12,13,14,15,16)"));
if(one2==null) {
moveLocForDeepLoc(slave, shallowLoc);
+ } else {
+ News.error("娴呭簱浣嶉樆濉炴椂锛屼笖娴呭簱浣嶅瓨鍦ㄤ綔涓氫腑鍑哄簱浠诲姟锛佸伐浣滃彿={}", one2.getWrkNo());
}
flag = true;
break;
@@ -1173,6 +1178,12 @@
break;
}
+ //20230307 ADD锛屽啀鍔犱竴娆″垽鏂紝褰撴祬搴撲綅鐘舵�佷笉涓篛鏃讹紝涓嶆墽琛屽綋鍓嶅嚭搴撲换鍔�
+ if(shallowLoc!=null && !shallowLoc.getLocSts().equals("O")){
+ News.error("鍋氫簡娴呭簱浣嶉樆濉炲鐞嗗悗鍙嶅鍒ゆ柇锛屾祬搴撲綅鐘舵�佷笉涓篛 ===>> 娴呭簱浣嶅簱浣嶇姸鎬佷负鍏ュ簱棰勭害锛佸嚭搴撳簱浣�={},娴呭簱浣嶅彿={}", wrkMast.getSourceLocNo(), shallowLoc.getLocNo());
+ flag = true;
+ break;
+ }
}
}
}
@@ -2694,7 +2705,7 @@
SteCommand steCommand = new SteCommand();
steCommand.setSteNo(wrkMast.getSteNo()); // 绌挎杞︾紪鍙�
steCommand.setTaskNo(9999); // 宸ヤ綔鍙�
- steCommand.setTaskMode(SteTaskModeType.findWaiting(basSte.getRow())); // 浠诲姟妯″紡: 鍘昏繎鐐� 绛夊緟鍫嗗灈鏈哄弶鍙�
+ steCommand.setTaskMode(SteTaskModeType.findWaiting(basSte.getRow())); // 浠诲姟妯″紡: 鍘诲緟鏈轰綅閬胯
// steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
// steCommand.setBay(steProtocol.getBay());
// steCommand.setLev(steProtocol.getLev());
--
Gitblit v1.9.1