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/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java | 5 +++++
src/main/resources/mapper/WrkMastMapper.xml | 6 +++---
3 files changed, 9 insertions(+), 4 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 ec25fe8..052cbf3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1213,7 +1213,7 @@
//鑾峰彇鎻愬崌鏈哄懡浠�
NyLiftCommand liftCommand = NyLiftUtils.getLiftCommand(liftProtocol.getLiftNo().intValue(), NyLiftTaskModelType.MOVE_TRAY.id, startSta, targetSta, wrkMast.getWrkNo());
- if (wrkMast.getIoType() == 53) {
+ if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
//鎷ｆ枡鍐嶅洖搴擄紝閲嶆柊鍒嗛厤璁惧宸ヤ綔鍙�
Random random = new Random();
int deviceWrk = Math.abs((liftCommand.getTaskNo().intValue() + random.nextInt(9999)));//鑾峰彇璁惧宸ヤ綔鍙�
diff --git a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
index 77e40a2..da8a2ab 100644
--- a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
@@ -96,6 +96,11 @@
continue;
}
+ if (shuttleProtocol.getSuspendState() == 1) {
+ //灏忚溅澶勪簬绠″埗涓�
+ continue;
+ }
+
int currentLev = shuttleProtocol.getPoint().getZ();//灏忚溅褰撳墠灞傞珮
String currentLocNo = shuttleProtocol.getCurrentLocNo();//灏忚溅褰撳墠搴撲綅鍙�
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index c2cf3a5..761b714 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -122,7 +122,7 @@
from dbo.asr_wrk_mast
where 1=1
and wrk_sts = 4
- and io_type in (1,10,53)
+ and io_type in (1,10,53,57)
order by io_pri desc,wrk_sts desc
</select>
@@ -147,7 +147,7 @@
<select id="selectBy2125" resultMap="BaseResultMap">
select * from dbo.asr_wrk_mast
where wrk_sts in (21,25)
- and io_type in (101,103,110)
+ and io_type in (101,103,107,110)
order by io_pri desc,wrk_sts desc
</select>
@@ -187,7 +187,7 @@
<select id="selectPickStepByBarcode" resultMap="BaseResultMap">
select top 1 * from asr_wrk_mast
- where io_type in (53,103)
+ where io_type in (53,103,107)
and wrk_sts in (2,3,34,29)
and barcode = #{barcode}
order by io_pri desc,wrk_sts desc
--
Gitblit v1.9.1