From 11b28c7a6c5f0882b8385a370b20919c6246fc1d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 10 五月 2023 08:05:24 +0800
Subject: [PATCH] 工作完成时状态码变更
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 54 ++++++++++++++++-----------
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 4 +-
src/main/resources/mapper/WrkMastMapper.xml | 8 ++--
3 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 25aea9b..5acd59d 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -100,9 +100,9 @@
WrkMast selectByWorkNo(Integer workNo);
- WrkMast selectLiftStep623();
+ WrkMast selectLiftStep62327();
- WrkMast selectByWorkNo724(Integer workNo);
+ WrkMast selectByWorkNo72428(Integer workNo);
List<WrkMast> selectBy2125();
}
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 3441959..e271946 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1097,16 +1097,16 @@
WrkMast wrkMast = wrkMastMapper.selectByWorkNo(shuttleProtocol.getTaskNo().intValue());
if (wrkMast != null) {
switch (wrkMast.getWrkSts().intValue()) {
- case 9:
+ case 9://9.灏忚溅鍏ュ簱鎼繍涓� ==> 14.鍏ュ簱瀹屾垚
wrkMast.setWrkSts(14L);
break;
- case 5:
+ case 5://5.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙� ==> 6.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴�
wrkMast.setWrkSts(6L);
break;
- case 22:
+ case 22://22.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙� ==> 23.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴�
wrkMast.setWrkSts(23L);
break;
- case 26:
+ case 26://26.灏忚溅鍑哄簱鎼繍涓� ==> 27.灏忚溅鍑哄簱鎼繍瀹屾垚
wrkMast.setWrkSts(27L);
break;
default:
@@ -1197,7 +1197,7 @@
}
//鎼滅储鏄惁鏈夊緟澶勭悊鐨勪换鍔�
- WrkMast wrkMast = wrkMastMapper.selectLiftStep623();
+ WrkMast wrkMast = wrkMastMapper.selectLiftStep62327();
if (wrkMast == null) {
continue;
}
@@ -1254,15 +1254,17 @@
commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
- //鎻愬崌鏈哄墠寰�鐩爣妤煎眰
- LiftCommand command3 = new LiftCommand();
- command3.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command3.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command3.setRun((short) 1);//鍗囬檷
- command3.setDistPosition((short) wrkMastLocNoLey);//宸ヤ綔妗ｇ洰鏍囨ゼ灞�
- command3.setLiftLock(true);//閿佸畾鎻愬崌鏈�
+ if (liftLev != currentLocNoLey) {
+ //鎻愬崌鏈哄墠寰�鐩爣妤煎眰
+ LiftCommand command3 = new LiftCommand();
+ command3.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
+ command3.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
+ command3.setRun((short) 1);//鍗囬檷
+ command3.setDistPosition((short) wrkMastLocNoLey);//宸ヤ綔妗ｇ洰鏍囨ゼ灞�
+ command3.setLiftLock(true);//閿佸畾鎻愬崌鏈�
- commands.add(command3);//灏嗗懡浠ゆ坊鍔犺繘list
+ commands.add(command3);//灏嗗懡浠ゆ坊鍔犺繘list
+ }
//鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲嚭鍘�
//杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩鍑哄幓
@@ -1274,13 +1276,18 @@
commands.add(command4);//灏嗗懡浠ゆ坊鍔犺繘list
- if (wrkMast.getIoType() == 101) {
- //鍑哄簱浠诲姟
- wrkMast.setWrkSts(24L);//绉诲姩浠诲姟
- }else {
- //鍏ュ簱浠诲姟
- wrkMast.setWrkSts(7L);//绉诲姩浠诲姟
+ switch (wrkMast.getWrkSts().intValue()) {
+ case 6://6.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴�
+ wrkMast.setWrkSts(7L);//7.鎻愬崌鏈鸿縼绉诲皬杞︿腑
+ break;
+ case 23://23.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴�
+ wrkMast.setWrkSts(24L);//24.鎻愬崌鏈鸿縼绉诲皬杞︿腑
+ break;
+ case 27://27.灏忚溅鍑哄簱鎼繍瀹屾垚
+ wrkMast.setWrkSts(28L);//28.鎻愬崌鏈烘惉杩愪腑
+ break;
}
+
//鎵�闇�鍛戒护缁勫悎瀹屾瘯锛屾洿鏂版暟鎹簱锛屾彁浜ゅ埌绾跨▼鍘诲伐浣�
LiftAssignCommand assignCommand = new LiftAssignCommand();
assignCommand.setCommands(commands);
@@ -1308,15 +1315,18 @@
//鎻愬崌鏈轰负绛夊緟纭
if (liftProtocol.getProtocolStatus() == LiftProtocolStatusType.WAITING.id && liftProtocol.getTaskNo() != 0) {
//灏嗕换鍔℃。鏍囪涓哄畬鎴�
- WrkMast wrkMast = wrkMastMapper.selectByWorkNo724(liftProtocol.getTaskNo().intValue());
+ WrkMast wrkMast = wrkMastMapper.selectByWorkNo72428(liftProtocol.getTaskNo().intValue());
if (wrkMast != null) {
switch (wrkMast.getWrkSts().intValue()) {
- case 7:
+ case 7://7.鎻愬崌鏈鸿縼绉诲皬杞︿腑 ==> 8.鎻愬崌鏈鸿縼绉诲皬杞﹀畬鎴�
wrkMast.setWrkSts(8L);
break;
- case 24:
+ case 24://24.鎻愬崌鏈鸿縼绉诲皬杞︿腑 ==> 25.鎻愬崌鏈鸿縼绉诲皬杞﹀畬鎴�
wrkMast.setWrkSts(25L);
break;
+ case 28://28.鎻愬崌鏈烘惉杩愪腑 ==> 29.鎻愬崌鏈烘惉杩愬畬鎴�
+ wrkMast.setWrkSts(29L);
+ break;
default:
}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 203f9a9..42734d6 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -251,17 +251,17 @@
where wrk_no=#{workNo}
</select>
- <select id="selectLiftStep623" resultMap="BaseResultMap">
+ <select id="selectLiftStep62327" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast
- where wrk_sts in (6,23)
+ where wrk_sts in (6,23,27)
and shuttle_no is not null
order by io_pri desc,wrk_sts desc
</select>
- <select id="selectByWorkNo724" resultMap="BaseResultMap">
+ <select id="selectByWorkNo72428" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast
where wrk_no=#{workNo}
- and wrk_sts in (7,24)
+ and wrk_sts in (7,24,28)
</select>
<select id="selectBy2125" resultMap="BaseResultMap">
--
Gitblit v1.9.1