From 3db138e1e0114a01639d45a6b354bee7482a59ec Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 22 十一月 2022 07:56:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/command/SteCommand.java | 5 +++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 ++++++
2 files changed, 11 insertions(+), 0 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 77891d3..507683a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1078,10 +1078,12 @@
steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
steCommand.setBay(steProtocol.getBay());
steCommand.setLev(steProtocol.getLev());
+ steCommand.setMemo("11==>14灏忚溅鎼嚭搴撲换鍔★紝浠诲姟鍙�"+wrkMast.getWrkNo()+"");
if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
log.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
} else {
+ log.info("绌挎杞﹀懡浠や笅鍙戞垚鍔�(11==>14灏忚溅鎼嚭搴撲换鍔�)锛岀┛姊溅鍙�={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
// 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 14.灏忚溅鎼嚭搴�
Date now = new Date();
wrkMast.setWrkSts(14L);
@@ -1957,10 +1959,12 @@
steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
steCommand.setBay(steProtocol.getBay());
steCommand.setLev(steProtocol.getLev());
+ steCommand.setMemo("缁戝畾灏忚溅鍙凤紝璁╁皬杞︿粠 杩滅偣 ====>> 绉诲姩鍒拌繎鐐�");
if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
log.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
} else {
+ log.info("绌挎杞﹀懡浠や笅鍙戞垚鍔�(璁╁皬杞︿粠杩滅偣==>>绉诲姩鍒拌繎鐐�)锛岀┛姊溅鍙�={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
// 淇敼宸ヤ綔妗ｇ姸鎬� 缁戝畾绌挎杞�
wrkMast.setSteNo(steNo);
wrkMast.setModiTime(new Date());
@@ -2316,9 +2320,11 @@
steCommand.setSteNo(steNo); // 绌挎杞︾紪鍙�
steCommand.setTaskNo(wrkMast.getWrkNo()); // 宸ヤ綔鍙�
steCommand.setTaskMode(SteTaskModeType.findOutByLoc(wrkMast.getSourceLocNo())); // 浠诲姟妯″紡: 鎼嚭搴�
+ steCommand.setMemo("鍑哄簱 ===>> 杩佸叆灏忚溅 瀹屾垚");
if (!MessageQueue.offer(SlaveType.Ste, steNo, new Task(2, steCommand))) {
log.error("绌挎杞﹀懡浠や笅鍙戝け璐ワ紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
} else {
+ log.info("绌挎杞﹀懡浠や笅鍙戞垚鍔燂紝绌挎杞﹀彿={}锛屼换鍔℃暟鎹�={}", steNo, JSON.toJSON(steCommand));
// 13.杩佸叆灏忚溅 ==> 14.灏忚溅鎼嚭搴�
wrkMast.setWrkSts(14L);
Date now = new Date();
diff --git a/src/main/java/com/zy/core/model/command/SteCommand.java b/src/main/java/com/zy/core/model/command/SteCommand.java
index 1b91911..55c2f5c 100644
--- a/src/main/java/com/zy/core/model/command/SteCommand.java
+++ b/src/main/java/com/zy/core/model/command/SteCommand.java
@@ -82,6 +82,11 @@
*/
private Short run;
+ /**
+ * 鎶ユ枃澶囨敞
+ */
+ private String memo;
+
public void setTaskMode(Short taskMode){
this.taskMode = taskMode;
this.taskModeType = SteTaskModeType.get(taskModeType);
--
Gitblit v1.9.1