From 75237ef2431663b32430604ab198efedf70f389f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 15 九月 2022 16:25:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 +++++++++++++-
src/main/java/com/zy/core/enums/SteTaskModeType.java | 16 ++++++++--------
2 files changed, 21 insertions(+), 9 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 2f813e9..d74a735 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1077,6 +1077,18 @@
if (!steThread.confirmPos()) {
log.error("{}鍙风┛姊溅閲嶆柊瀹氫綅澶辫触锛佷綔涓氬伐浣滄。浠诲姟鍙凤細{}", wrkMast.getSteNo(), wrkMast.getWrkNo());
}
+ // 绌挎杞﹀幓寰呮満浣�
+ BasSte basSte = basSteService.selectById(wrkMast.getSteNo());
+ SteCommand steCommand = new SteCommand();
+ steCommand.setSteNo(wrkMast.getSteNo()); // 绌挎杞︾紪鍙�
+ steCommand.setTaskNo(9999); // 宸ヤ綔鍙�
+ steCommand.setTaskMode(SteTaskModeType.findWaiting(basSte.getRow())); // 浠诲姟妯″紡: 鍘昏繎鐐� 绛夊緟鍫嗗灈鏈哄弶鍙�
+// steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
+// steCommand.setBay(steProtocol.getBay());
+// steCommand.setLev(steProtocol.getLev());
+ if (!MessageQueue.offer(SlaveType.Ste, wrkMast.getSteNo(), new Task(2, steCommand))) {
+ log.error("绌挎杞﹀緟鏈轰綅鍛戒护涓嬪彂澶辫触锛岀┛姊溅鍙�={}锛屼换鍔℃暟鎹�={}", wrkMast.getSteNo(), JSON.toJSON(steCommand));
+ }
} else {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 5.杩佸嚭灏忚溅 => 6.灏忚溅寰呭叆 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
}
@@ -1324,7 +1336,7 @@
}
// 绔欑偣鏉′欢鍒ゆ柇
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
- && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() == 9999 || staProtocol.getWorkNo() == 9990 || staProtocol.getWorkNo() == 9997) && staProtocol.isPakMk()) {
+ && staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || (staProtocol.getWorkNo() >= 9990 && staProtocol.getWorkNo() <= 9999) || staProtocol.getWorkNo() == 9997) && staProtocol.isPakMk()) {
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
diff --git a/src/main/java/com/zy/core/enums/SteTaskModeType.java b/src/main/java/com/zy/core/enums/SteTaskModeType.java
index 6de32d4..3facf5d 100644
--- a/src/main/java/com/zy/core/enums/SteTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/SteTaskModeType.java
@@ -60,11 +60,11 @@
case 3:
case 11:
case 18:
- return SteTaskModeType.IN_RIGHT; // 鍙�
+ return SteTaskModeType.IN_LEFT; // 鍙�
case 4:
case 12:
case 19:
- return SteTaskModeType.IN_LEFT; // 宸�
+ return SteTaskModeType.IN_RIGHT; // 宸�
default:
throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
}
@@ -75,11 +75,11 @@
case 3:
case 11:
case 18:
- return SteTaskModeType.OUT_RIGHT; // 鍙�
+ return SteTaskModeType.OUT_LEFT; // 鍙�
case 4:
case 12:
case 19:
- return SteTaskModeType.OUT_LEFT; // 宸�
+ return SteTaskModeType.OUT_RIGHT; // 宸�
default:
throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
}
@@ -131,7 +131,7 @@
case 16:
case 17:
case 18:
- return SteTaskModeType.IN_RIGHT;
+ return SteTaskModeType.IN_LEFT;
case 4:
case 5:
case 6:
@@ -142,7 +142,7 @@
case 19:
case 20:
case 21:
- return SteTaskModeType.IN_LEFT;
+ return SteTaskModeType.IN_RIGHT;
default:
throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
}
@@ -161,7 +161,7 @@
case 16:
case 17:
case 18:
- return SteTaskModeType.OUT_RIGHT;
+ return SteTaskModeType.OUT_LEFT;
case 4:
case 5:
case 6:
@@ -172,7 +172,7 @@
case 19:
case 20:
case 21:
- return SteTaskModeType.OUT_LEFT;
+ return SteTaskModeType.OUT_RIGHT;
default:
throw new CoolException("瑙ｆ瀽绌挎杞﹀師鐐瑰畾浣嶅け璐�");
}
--
Gitblit v1.9.1