From 79faeb50583ce89fb741c76986e41a3666f91c11 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 02 八月 2023 13:02:22 +0800
Subject: [PATCH] 搜索是否有其他任务占用了提升机
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 116 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 58 insertions(+), 58 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 7ebe117..8d4bafe 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -635,11 +635,11 @@
}
Short shuttleNo = redisCommand.getShuttleNo();
- ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo.intValue());
+ NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo.intValue());
if (shuttleThread == null) {
continue;
}
- ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
if (shuttleProtocol == null) {
continue;
}
@@ -648,7 +648,7 @@
}
//鍥涘悜绌挎杞﹀浜庣┖闂茬姸鎬侊紝杩涜浠诲姟鐨勬仮澶�
- shuttleProtocol.setTaskNo(redisCommand.getWrkNo());//灏嗗洓鍚戠┛姊溅绾跨▼鍒嗛厤浠诲姟鍙�
+ shuttleProtocol.setTaskNo(redisCommand.getWrkNo().intValue());//灏嗗洓鍚戠┛姊溅绾跨▼鍒嗛厤浠诲姟鍙�
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.WORKING);//宸ヤ綔鐘舵��
}
}
@@ -1208,27 +1208,27 @@
private void recShuttleErr() {
Date now = new Date();
for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
- // 鑾峰彇鍫嗗灈鏈轰俊鎭�
- ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleSlave.getId());
+ // 鑾峰彇鍥涘悜绌挎杞︿俊鎭�
+ NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleSlave.getId());
if (shuttleThread == null) {
continue;
}
- ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
if (shuttleProtocol == null) {
continue;
}
if (shuttleProtocol.getTaskNo() != 0) {
//鏈変换鍔�
- BasShuttleErrLog latest = basShuttleErrLogService.findLatestByTaskNo(shuttleSlave.getId(), shuttleProtocol.getTaskNo().intValue());
+ BasShuttleErrLog latest = basShuttleErrLogService.findLatestByTaskNo(shuttleSlave.getId(), shuttleProtocol.getTaskNo());
// 鏈夊紓甯�
if (latest == null) {
- if (shuttleProtocol.getStatusErrorCode() != null && shuttleProtocol.getStatusErrorCode() > 0) {
+ if (shuttleProtocol.getErrState() != null && shuttleProtocol.getErrState() == 1) {
WrkMast wrkMast = wrkMastMapper.selectById(shuttleProtocol.getTaskNo());
if (wrkMast == null) {
continue;
}
- BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(shuttleProtocol.getStatusErrorCode().intValue());
+ BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(shuttleProtocol.getErrCode().get(0));
String errName = basShuttleErr==null? "鏈煡寮傚父":basShuttleErr.getErrName();
BasShuttleErrLog basShuttleErrLog = new BasShuttleErrLog(
null, // 缂栧彿
@@ -1244,7 +1244,7 @@
wrkMast.getSourceStaNo(), // 婧愮珯
wrkMast.getSourceLocNo(), // 婧愬簱浣�
wrkMast.getBarcode(), // 鏉＄爜
- (int) shuttleProtocol.getStatusErrorCode(), // 寮傚父鐮�
+ shuttleProtocol.getErrCode().get(0), // 寮傚父鐮�
errName, // 寮傚父
1, // 寮傚父鎯呭喌
now, // 娣诲姞鏃堕棿
@@ -1259,7 +1259,7 @@
}
} else {
// 寮傚父淇
- if (shuttleProtocol.getStatusErrorCode() == null || shuttleProtocol.getStatusErrorCode() == 0) {
+ if (shuttleProtocol.getErrState() == null || shuttleProtocol.getErrState() == 0) {
latest.setEndTime(now);
latest.setUpdateTime(now);
latest.setStatus(2);
@@ -1269,53 +1269,53 @@
}
}
}else {
- //鏃犱换鍔�
- BasShuttleErrLog latest = basShuttleErrLogService.findLatest(shuttleSlave.getId());
- // 鏈夊紓甯�
- if (shuttleProtocol.getStatusErrorCode() != null && shuttleProtocol.getStatusErrorCode() > 0) {
- // 璁板綍鏂板紓甯�
- if (latest == null || (latest.getErrCode() != shuttleProtocol.getStatusErrorCode().intValue())) {
- BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(shuttleProtocol.getStatusErrorCode().intValue());
- String errName = basShuttleErr==null? "鏈煡寮傚父":basShuttleErr.getErrName();
- BasShuttleErrLog basShuttleErrLog = new BasShuttleErrLog(
- null, // 缂栧彿
- null, // 宸ヤ綔鍙�
- now, // 鍙戠敓鏃堕棿
- null, // 缁撴潫鏃堕棿
- null, // 宸ヤ綔鐘舵��
- null, // 鍏ュ嚭搴撶被鍨�
- shuttleSlave.getId(), // 鍥涘悜绌挎杞�
- null, // plc
- null, // 鐩爣搴撲綅
- null, // 鐩爣绔�
- null, // 婧愮珯
- null, // 婧愬簱浣�
- null, // 鏉＄爜
- (int)shuttleProtocol.getStatusErrorCode(), // 寮傚父鐮�
- errName, // 寮傚父
- 1, // 寮傚父鎯呭喌
- now, // 娣诲姞鏃堕棿
- null, // 娣诲姞浜哄憳
- now, // 淇敼鏃堕棿
- null, // 淇敼浜哄憳
- "鏃犱换鍔″紓甯�" // 澶囨敞
- );
- if (!basShuttleErrLogService.insert(basShuttleErrLog)) {
- News.error("鍥涘悜绌挎杞lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", shuttleSlave.getId(), errName);
- }
- }
- // 鏃犲紓甯�
- } else {
- // 寮傚父淇
- if (latest != null && latest.getStatus() == 1) {
- latest.setEndTime(now);
- latest.setUpdateTime(now);
- latest.setStatus(2);
- if (!basShuttleErrLogService.updateById(latest)) {
- News.error("鍥涘悜绌挎杞lc寮傚父璁板綍淇澶辫触 ===>> [id:{}] [errLogId:{}]", shuttleSlave.getId(), latest.getId());
- }
- }
- }
+// //鏃犱换鍔�
+// BasShuttleErrLog latest = basShuttleErrLogService.findLatest(shuttleSlave.getId());
+// // 鏈夊紓甯�
+// if (shuttleProtocol.getStatusErrorCode() != null && shuttleProtocol.getStatusErrorCode() > 0) {
+// // 璁板綍鏂板紓甯�
+// if (latest == null || (latest.getErrCode() != shuttleProtocol.getStatusErrorCode().intValue())) {
+// BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(shuttleProtocol.getStatusErrorCode().intValue());
+// String errName = basShuttleErr==null? "鏈煡寮傚父":basShuttleErr.getErrName();
+// BasShuttleErrLog basShuttleErrLog = new BasShuttleErrLog(
+// null, // 缂栧彿
+// null, // 宸ヤ綔鍙�
+// now, // 鍙戠敓鏃堕棿
+// null, // 缁撴潫鏃堕棿
+// null, // 宸ヤ綔鐘舵��
+// null, // 鍏ュ嚭搴撶被鍨�
+// shuttleSlave.getId(), // 鍥涘悜绌挎杞�
+// null, // plc
+// null, // 鐩爣搴撲綅
+// null, // 鐩爣绔�
+// null, // 婧愮珯
+// null, // 婧愬簱浣�
+// null, // 鏉＄爜
+// (int)shuttleProtocol.getStatusErrorCode(), // 寮傚父鐮�
+// errName, // 寮傚父
+// 1, // 寮傚父鎯呭喌
+// now, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// now, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// "鏃犱换鍔″紓甯�" // 澶囨敞
+// );
+// if (!basShuttleErrLogService.insert(basShuttleErrLog)) {
+// News.error("鍥涘悜绌挎杞lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", shuttleSlave.getId(), errName);
+// }
+// }
+// // 鏃犲紓甯�
+// } else {
+// // 寮傚父淇
+// if (latest != null && latest.getStatus() == 1) {
+// latest.setEndTime(now);
+// latest.setUpdateTime(now);
+// latest.setStatus(2);
+// if (!basShuttleErrLogService.updateById(latest)) {
+// News.error("鍥涘悜绌挎杞lc寮傚父璁板綍淇澶辫触 ===>> [id:{}] [errLogId:{}]", shuttleSlave.getId(), latest.getId());
+// }
+// }
+// }
}
}
}
--
Gitblit v1.9.1