From 2ae707e80fb908e6e6af373e4724645f747a2e23 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 30 九月 2023 09:48:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/RobotController.java | 7 +++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 +++++++-
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
3 files changed, 15 insertions(+), 2 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);
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 ec963e5..a4829e8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1202,7 +1202,7 @@
}
//璋冨害灏忚溅閬胯
- boolean result = Utils.searchEmptyGroupToMoveShuttle(Utils.getLev(wrkMast.getLocNo()), wrkMast.getShuttleNo(), shuttleThread);
+ boolean result = Utils.searchEmptyGroupToMoveShuttle(Utils.getLev(wrkMast.getSourceLocNo()), wrkMast.getShuttleNo(), shuttleThread);
if (!result) {
return false;
}
@@ -1318,6 +1318,12 @@
//閲婃斁鎻愬崌鏈轰护鐗�
liftProtocol.setToken(0);
}
+
+ if (wrkMast.getMk() == null || !wrkMast.getMk().equals("Y")) {
+ //涓嶉渶瑕佺敤鍒版満姊拌噦锛岀洿鎺ヨ浆29.鍑哄簱瀹屾垚
+ wrkMast.setWrkSts(29L);
+ }
+
break;
case 106://106.鎻愬崌鏈烘惉杩愪腑 ==> 107.鎻愬崌鏈烘惉杩愬畬鎴�
wrkMast.setWrkSts(107L);
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 5783a20..96e18ac 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -213,7 +213,7 @@
select top 1 * from dbo.asr_wrk_mast
where 1=1
and shuttle_no = #{shuttleNo}
- and wrk_sts not in (9,10,29,30)
+ and wrk_sts not in (9,10,23,29,30)
and io_type not in (200)
order by io_pri desc,io_time,wrk_no asc
</select>
--
Gitblit v1.9.1