From 2bd0f5e053cfe4dd90d6a5123474c9b41bcee94e Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 11 十一月 2023 17:10:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
src/main/java/com/zy/asrs/controller/RobotController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RobotController.java b/src/main/java/com/zy/asrs/controller/RobotController.java
index bcb5fee..4977a54 100644
--- a/src/main/java/com/zy/asrs/controller/RobotController.java
+++ b/src/main/java/com/zy/asrs/controller/RobotController.java
@@ -48,6 +48,13 @@
staProtocol = staProtocol.clone();
staProtocol.setStaNo((short) 344);//绌烘墭鐩樺嚭搴撶珯
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+
+ //鏇存柊宸ヤ綔妗� => 29.鍑哄簱瀹屾垚
+ WrkMast wrkMast = wrkMastMapper.selectByWorkNo(Integer.valueOf(taskId));
+ if (wrkMast != null && wrkMast.getWrkSts() == 25) {
+ wrkMast.setWrkSts(29L);
+ wrkMastMapper.updateById(wrkMast);
+ }
}
System.out.println(param);
--
Gitblit v1.9.1