From 710deccd42576ad2dcbdc22e75f18b455d5ce2ff Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 14 四月 2025 18:04:00 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 26 +--
src/main/java/com/zy/asrs/service/impl/TransportLiftInServiceImpl.java | 6
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 76 ++++++++-
src/main/java/com/zy/asrs/service/impl/NoLiftOutServiceImpl.java | 54 ++++--
src/main/resources/mapper/WrkMastMapper.xml | 240 +++++++++++++++++------------
src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java | 16 +
src/main/java/com/zy/asrs/service/impl/TransportLiftOutServiceImpl.java | 6
/dev/null | 0
src/main/java/com/zy/asrs/service/WrkMastService.java | 4
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 10 +
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 11 +
src/main/java/com/zy/core/MainProcess.java | 6
src/main/resources/application.yml | 10
13 files changed, 298 insertions(+), 167 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 9dd9c7e..8fb73e0 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -2,7 +2,8 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
-import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -14,13 +15,15 @@
// wcs ---------------------------------------------
// 鍏ュ簱绗竴姝ワ紝鎵爜浠幏鍙栨潯鐮佷俊鎭椂鏌ヨ
// @Select("select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC")
- WrkMast selectPakInStep1(@Param("sourceStaNo")Integer sourceStaNo, @Param("barcode")String barcode);
+ WrkMast selectPakInStep1(@Param("sourceStaNo") Integer sourceStaNo, @Param("barcode") String barcode);
- WrkMast selectPakInStep11(@Param("sourceStaNo")Integer sourceStaNo);
+ WrkMast selectPakInStep11(@Param("sourceStaNo") Integer sourceStaNo);
List<WrkMast> selectInStep4();
WrkMast selectByWorkNo(Integer workNo);
+
+ WrkMast selectByMainWrkNo(Integer workNo);
List<WrkMast> selectLiftStep223103();
@@ -37,6 +40,8 @@
WrkMast selectLiftWrkMast(Integer liftNo);
+ WrkMast selectLiftWrkMastAndWrkNo(@Param("liftNo") Integer liftNo, @Param("wrkNo") Integer wrkNo, @Param("wrkNo2") Integer wrkNo2);
+
List<WrkMast> selectLocToLocWrkMast();//鏌ヨ搴撲綅绉昏浆宸ヤ綔妗�
WrkMast selectPickStepByBarcode(String barcode);
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index f9f57f2..6ca8104 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -9,6 +9,8 @@
WrkMast selectByWorkNo(Integer workNo);
+ WrkMast selectByMainWrkNo(Integer workNo);
+
Boolean judgeInbound(WrkMast wrkMast);
//鏌ヨ鎸囧畾妤煎眰寰呭垎閰嶈溅杈嗙殑浠诲姟
@@ -34,4 +36,6 @@
WrkMast selectLiftWrkMast(Integer liftNo);
+ WrkMast selectLiftWrkMastAndWrkNo(Integer liftNo, Integer wrkNo, Integer wrkNo2);
+
}
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 f79d382..42529a0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
@@ -97,6 +96,8 @@
private NoLiftOutServiceImpl noLiftOutService;
@Autowired
private LiftAction liftAction;
+ @Autowired
+ private BasWrkStatusService wrkStatusService;
public static List<Integer> staNosIn = new ArrayList<Integer>() {{
@@ -185,9 +186,6 @@
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading() && isInEnable(devpThread, inSta.getStaNo()) && !staProtocol.isEmptyMk() && (workNo == 0 || (workNo >= 9990 && workNo <= 9999)) && staProtocol.isPakMk()) {
String barcode = staProtocol.getBarcode();
- if (!Cools.isEmpty(barcode)) {
- News.info("鏉＄爜鎵弿鍣ㄦ娴嬫潯鐮佷俊鎭細{}", barcode);
- }
// 鍒ゆ柇閲嶅宸ヤ綔妗�
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_sta_no", inSta.getStaNo()).eq("wrk_sts", WrkStsType.NEW_INBOUND.sts).eq("barcode", barcode));
if (wrkMast != null) {
@@ -285,15 +283,28 @@
} else {
staProtocol = staProtocol.clone();
}
+ if ((Utils.getLev(wrkMast.getLocNo()) != 1 && wrkMast.getSourceStaNo() == 1014) || (Utils.getLev(wrkMast.getLocNo()) != 5 && wrkMast.getSourceStaNo() == 1025)) {
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟
+ WrkMast liftWrkMast = wrkMastService.selectLiftWrkMast(1);
+ if (liftWrkMast != null) {
+ if (!liftWrkMast.getWrkNo().equals(wrkMast.getWrkNo())) {//鎻愬崌鏈轰换鍔″拰褰撳墠浠诲姟涓嶇浉鍚�
+ News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), 1);
+ return;
+ }
+ }
+ wrkMast.setLiftNo(1);
+ }
Short finishWorkNo = staProtocol.getFinishWorkNo();
if (finishWorkNo == null) {
continue;
}
+
+
String locNo = "1200301";
if (wrkMast.getStaNo() == 1025) {
locNo = "1200305";
}
- boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleIn(wrkMast.getWrkNo(), locNo, wrkMast.getLocNo(), "TRANSPORT_DEVP", true);
+ boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleS(wrkMast.getWrkNo(), locNo, wrkMast.getLocNo(), "TRANSPORT_DEVP");
if (!dispatchShuttle) {
News.info("{}浠诲姟锛岃皟搴﹀皬杞﹀け璐�", wrkMast.getWrkNo());
return;
@@ -337,17 +348,29 @@
News.info("{}浠诲姟锛寋}绔欑偣锛屾病鏈夊彲鍑轰俊鍙�", wrkMast.getWrkNo(), staProtocol.getSiteId());
return;
}
+ if ((Utils.getLev(wrkMast.getSourceLocNo()) != 1 && wrkMast.getStaNo() == 1013) || (Utils.getLev(wrkMast.getSourceLocNo()) != 5 && wrkMast.getStaNo() == 1024)) {
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟
+ WrkMast liftWrkMast = wrkMastService.selectLiftWrkMast(1);
+ if (liftWrkMast != null) {
+ if (!liftWrkMast.getWrkNo().equals(wrkMast.getWrkNo())) {//鎻愬崌鏈轰换鍔″拰褰撳墠浠诲姟涓嶇浉鍚�
+ News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), 1);
+ return;
+ }
+ }
+ wrkMast.setLiftNo(1);
+ }
String locNo = "1200301";
if (wrkMast.getStaNo() == 1024) {
locNo = "1200305";
}
- boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleIn(wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), locNo, "TRANSPORT_DEVP", false);
+ boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleS(wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), locNo, "TRANSPORT_DEVP");
if (!dispatchShuttle) {
News.info("{}浠诲姟锛岃皟搴﹀皬杞﹀け璐�", wrkMast.getWrkNo());
return;
}
wrkMast.setWrkSts(WrkStsType.OUTBOUND_SHUTTLE_RUN.sts);
+
wrkMast.setSystemMsg("");//娓呯┖娑堟伅
wrkMast.setModiTime(now);
if (wrkMastService.updateById(wrkMast)) {
@@ -398,8 +421,22 @@
* 鍒濆鍖栧疄鏃跺湴鍥�
*/
public synchronized void initRealtimeBasMap() {
+ //鍒濆鍖栭厤缃�
+// WrkStsType[] values = WrkStsType.values();
+// for (int i = 0; i < values.length; i++) {
+// BasWrkStatus basWrkStatus = wrkStatusService.selectById(values[i].sts);
+// if (basWrkStatus == null) {
+// basWrkStatus = new BasWrkStatus();
+// basWrkStatus.setWrkDesc(values[i].desc);
+// basWrkStatus.setWrkSts(values[i].sts);
+// basWrkStatus.setModiTime(new Date());
+// basWrkStatus.setAppeTime(new Date());
+// basWrkStatus.setAppeUser(9527L);
+// basWrkStatus.setModiUser(9527L);
+// wrkStatusService.insert(basWrkStatus);
+// }
+// }
try {
-
List<BasMap> basMaps = basMapService.selectList(new EntityWrapper<BasMap>().orderBy("lev", true));
for (BasMap basMap : basMaps) {
Integer lev = basMap.getLev();
@@ -761,6 +798,14 @@
News.info("{}浠诲姟锛寋}绔欑偣锛屾墭鐩樼爜涓嶅尮閰嶏紝绔欑偣鎵樼洏鐮侊細{}锛屼换鍔℃墭鐩樼爜锛歿}", wrkMast.getWrkNo(), staProtocol.getSiteId(), staProtocol.getBarcode(), wrkMast.getBarcode());
return false;
}
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟
+ WrkMast liftWrkMast = wrkMastService.selectLiftWrkMast(1);
+ if (liftWrkMast != null) {
+ if (!liftWrkMast.getWrkNo().equals(wrkMast.getWrkNo())) {//鎻愬崌鏈轰换鍔″拰褰撳墠浠诲姟涓嶇浉鍚�
+ News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), 1);
+ return false;
+ }
+ }
short staNo = 1012;
if (wrkMast.getSourceStaNo() == 1022) {
@@ -773,6 +818,7 @@
boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
wrkMast.setWrkSts(WrkStsType.INBOUND_DEVICE_RUN.sts);
+ wrkMast.setLiftNo(1);
wrkMast.setSystemMsg("");//娓呯┖娑堟伅
wrkMast.setModiTime(now);
if (wrkMastService.updateById(wrkMast)) {
@@ -919,8 +965,11 @@
News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満鍐呮棤鎵樼洏锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
return false;
}
-
- boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttle(wrkMast.getWrkNo(), "0200301", wrkMast.getLocNo(), "TRANSPORT_LIFT");
+ String locNo = "0200305";
+ if (wrkMast.getStaNo() == 1011) {
+ locNo = "0200301";
+ }
+ boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleS(wrkMast.getWrkNo(), locNo, wrkMast.getLocNo(), "TRANSPORT_LIFT");
if (!dispatchShuttle) {
News.info("{}浠诲姟锛岃皟搴﹀皬杞﹀け璐�", wrkMast.getWrkNo());
return false;
@@ -982,8 +1031,11 @@
return false;
}
-
- boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttle(wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), "0200301", "TRANSPORT_LIFT");
+ String locNo = "0200305";
+ if (wrkMast.getStaNo() == 1011) {
+ locNo = "0200301";
+ }
+ boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleS(wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), locNo, "TRANSPORT_LIFT");
if (!dispatchShuttle) {
News.info("{}浠诲姟锛岃皟搴﹀皬杞﹀け璐�", wrkMast.getWrkNo());
return false;
@@ -1183,6 +1235,7 @@
notifyUtils.notify(String.valueOf(SlaveType.Shuttle), shuttleProtocol.getShuttleNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.SHUTTLE_POWER_COMPLETE);//瑙﹀彂閫氱煡
} else if (wrkMast.getWrkSts() == WrkStsType.MOVE_IN_NO_LIFT_11.sts) {
wrkMast.setWrkSts(WrkStsType.MOVE_IN_NO_LIFT_12.sts);
+ wrkMast.setLiftNo(null);
shuttleThread.setSyncTaskNo(0);
notifyUtils.notify(String.valueOf(SlaveType.Shuttle), shuttleProtocol.getShuttleNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.SHUTTLE_POWER_COMPLETE);//瑙﹀彂閫氱煡
} else if (wrkMast.getWrkSts() == WrkStsType.MOVE_IN_NO_LIFT_13.sts) {
@@ -1195,6 +1248,7 @@
notifyUtils.notify(String.valueOf(SlaveType.Shuttle), shuttleProtocol.getShuttleNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.SHUTTLE_POWER_COMPLETE);//瑙﹀彂閫氱煡
} else if (wrkMast.getWrkSts() == WrkStsType.MOVE_OUT_NO_LIFT_10.sts) {
wrkMast.setWrkSts(WrkStsType.MOVE_OUT_NO_LIFT_11.sts);
+ wrkMast.setLiftNo(null);
shuttleThread.setSyncTaskNo(0);
notifyUtils.notify(String.valueOf(SlaveType.Shuttle), shuttleProtocol.getShuttleNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.SHUTTLE_POWER_COMPLETE);//瑙﹀彂閫氱煡
} else if (wrkMast.getWrkSts() == WrkStsType.MOVE_OUT_NO_LIFT_8.sts) {
diff --git a/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java
index 71b876b..98503f7 100644
--- a/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NoLiftInServiceImpl.java
@@ -307,8 +307,10 @@
//鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟(璇ヤ换鍔￠渶瑕佹崲灞傚繀椤绘彁鍓嶇嫭鍗犳彁鍗囨満)
WrkMast liftWrkMast = wrkMastService.selectLiftWrkMast(liftProtocol.getLiftNo());
if (liftWrkMast != null) {
- News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
- return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
+ if (liftWrkMast != null && !wrkMast.getMainWrkNo().equals(liftWrkMast.getWrkNo())) {
+ News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
+ return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
+ }
}
wrkMast.setModiTime(now);
@@ -470,6 +472,15 @@
return false;//绛夊緟鎻愬崌鏈哄埌灏忚溅妤煎眰
}
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟
+ WrkMast w = wrkMastService.selectLiftWrkMast(1);
+ if (w != null) {
+ if (!w.getWrkNo().equals(wrkMast.getWrkNo())) {//鎻愬崌鏈轰换鍔″拰褰撳墠浠诲姟涓嶇浉鍚�
+ News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鍒殑缁戝畾浠诲姟ru锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), 1);
+ return false;
+ }
+ }
+
ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo()); // 鍥涘悜绌挎杞︾紪鍙�
assignCommand.setTaskMode(ShuttleTaskModeType.MOVE_LOC_NO.id);//灏忚溅绉诲簱浠诲姟
@@ -487,6 +498,7 @@
wrkMast.setWrkSts(WrkStsType.MOVE_IN_NO_LIFT_7.sts);//灏忚溅绉诲姩鍒版彁鍗囨満涓� 鎻愬崌鏈鸿嚦灏忚溅灞傚畬鎴� ==> 灏忚溅杩佸叆鎻愬崌鏈轰腑
wrkMast.setModiTime(now);
+ wrkMast.setLiftNo(1);
if (wrkMastService.updateById(wrkMast)) {
//涓嬪彂浠诲姟
shuttleAction.assignWork(shuttleProtocol.getShuttleNo(), assignCommand);
diff --git a/src/main/java/com/zy/asrs/service/impl/NoLiftOutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/NoLiftOutServiceImpl.java
index b3a9855..f23511c 100644
--- a/src/main/java/com/zy/asrs/service/impl/NoLiftOutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NoLiftOutServiceImpl.java
@@ -310,8 +310,10 @@
//鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟(璇ヤ换鍔￠渶瑕佹崲灞傚繀椤绘彁鍓嶇嫭鍗犳彁鍗囨満)
WrkMast liftWrkMast = wrkMastService.selectLiftWrkMast(liftProtocol.getLiftNo());
if (liftWrkMast != null) {
- News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
- return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
+ if (liftWrkMast != null && !wrkMast.getMainWrkNo().equals(liftWrkMast.getWrkNo())) {
+ News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
+ return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
+ }
}
wrkMast.setModiTime(now);
@@ -334,12 +336,10 @@
}
//鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟
- WrkMast liftWrkMast = wrkMastService.selectLiftWrkMast(wrkMast.getLiftNo());
+ WrkMast liftWrkMast = wrkMastService.selectLiftWrkMastAndWrkNo(wrkMast.getLiftNo(), wrkMast.getWrkNo(), wrkMast.getMainWrkNo());
if (liftWrkMast != null) {
- if (!liftWrkMast.getWrkNo().equals(wrkMast.getWrkNo())) {//鎻愬崌鏈轰换鍔″拰褰撳墠浠诲姟涓嶇浉鍚�
- News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), wrkMast.getLiftNo());
- return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
- }
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), wrkMast.getLiftNo());
+ return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
}
if (!liftThread.isIdle()) {
@@ -442,12 +442,10 @@
}
//鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟
- WrkMast liftWrkMast = wrkMastService.selectLiftWrkMast(wrkMast.getLiftNo());
+ WrkMast liftWrkMast = wrkMastService.selectLiftWrkMastAndWrkNo(wrkMast.getLiftNo(), wrkMast.getWrkNo(), wrkMast.getMainWrkNo());
if (liftWrkMast != null) {
- if (!liftWrkMast.getWrkNo().equals(wrkMast.getWrkNo())) {//鎻愬崌鏈轰换鍔″拰褰撳墠浠诲姟涓嶇浉鍚�
- News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), wrkMast.getLiftNo());
- return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
- }
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), wrkMast.getLiftNo());
+ return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
}
if (!liftThread.isIdle()) {
@@ -480,6 +478,13 @@
return false;//绛夊緟鎻愬崌鏈哄埌灏忚溅妤煎眰
}
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟
+ WrkMast w = wrkMastService.selectLiftWrkMastAndWrkNo(1, wrkMast.getWrkNo(), wrkMast.getMainWrkNo());
+ if (w != null) {
+ News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鍒殑缁戝畾浠诲姟out锛岀姝㈡淳鍙�", wrkMast.getWrkNo(), 1);
+ return false;
+ }
+
ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo()); // 鍥涘悜绌挎杞︾紪鍙�
assignCommand.setTaskMode(ShuttleTaskModeType.MOVE_LOC_NO.id);//灏忚溅绉诲簱浠诲姟
@@ -497,6 +502,7 @@
wrkMast.setWrkSts(WrkStsType.MOVE_OUT_NO_LIFT_6.sts);//灏忚溅绉诲姩鍒版彁鍗囨満涓� 鎻愬崌鏈鸿嚦灏忚溅灞傚畬鎴� ==> 灏忚溅杩佸叆鎻愬崌鏈轰腑
wrkMast.setModiTime(now);
+ wrkMast.setLiftNo(1);
if (wrkMastService.updateById(wrkMast)) {
//涓嬪彂浠诲姟
shuttleAction.assignWork(shuttleProtocol.getShuttleNo(), assignCommand);
@@ -537,12 +543,10 @@
}
//鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟
- WrkMast liftWrkMast = wrkMastService.selectLiftWrkMast(wrkMast.getLiftNo());
+ WrkMast liftWrkMast = wrkMastService.selectLiftWrkMastAndWrkNo(wrkMast.getLiftNo(), wrkMast.getWrkNo(), wrkMast.getMainWrkNo());
if (liftWrkMast != null) {
- if (!liftWrkMast.getWrkNo().equals(wrkMast.getWrkNo())) {//鎻愬崌鏈轰换鍔″拰褰撳墠浠诲姟涓嶇浉鍚�
- News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), wrkMast.getLiftNo());
- return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
- }
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), wrkMast.getLiftNo());
+ return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
}
if (!liftThread.isIdle()) {
@@ -628,12 +632,10 @@
}
//鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟
- WrkMast liftWrkMast = wrkMastService.selectLiftWrkMast(wrkMast.getLiftNo());
+ WrkMast liftWrkMast = wrkMastService.selectLiftWrkMastAndWrkNo(wrkMast.getLiftNo(), wrkMast.getWrkNo(), wrkMast.getMainWrkNo());
if (liftWrkMast != null) {
- if (!liftWrkMast.getWrkNo().equals(wrkMast.getWrkNo())) {//鎻愬崌鏈轰换鍔″拰褰撳墠浠诲姟涓嶇浉鍚�
- News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), wrkMast.getLiftNo());
- return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
- }
+ News.info("{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), wrkMast.getLiftNo());
+ return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
}
LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, wrkMast.getLiftNo());
@@ -804,6 +806,14 @@
//涓嬪彂浠诲姟
shuttleAction.assignWork(shuttleProtocol.getShuttleNo(), assignCommand);
}
+ WrkMast wrkMast1 = wrkMastService.selectByMainWrkNo(wrkMast.getWrkNo());
+ if (wrkMast1 != null) {
+ wrkMast.setLiftNo(null);//閲婃斁鎻愬崌鏈�
+ wrkMast.setModiTime(now);
+ if (!wrkMastService.updateById(wrkMast1)) {
+ News.taskInfo(wrkMast.getWrkNo(), "{}瑙ｉ攣鎻愬崌鏈�", wrkMast1.getWrkNo());
+ }
+ }
}
return true;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TransportLiftInServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TransportLiftInServiceImpl.java
index e2dd25a..10f25a7 100644
--- a/src/main/java/com/zy/asrs/service/impl/TransportLiftInServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TransportLiftInServiceImpl.java
@@ -206,8 +206,10 @@
//鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟(璇ヤ换鍔￠渶瑕佹崲灞傚繀椤绘彁鍓嶇嫭鍗犳彁鍗囨満)
WrkMast liftWrkMast = wrkMastService.selectLiftWrkMast(liftProtocol.getLiftNo());
if (liftWrkMast != null) {
- News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
- return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
+ if (liftWrkMast != null && !wrkMast.getMainWrkNo().equals(liftWrkMast.getWrkNo())) {
+ News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
+ return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
+ }
}
wrkMast.setModiTime(now);
diff --git a/src/main/java/com/zy/asrs/service/impl/TransportLiftOutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TransportLiftOutServiceImpl.java
index 30d926f..2a510d5 100644
--- a/src/main/java/com/zy/asrs/service/impl/TransportLiftOutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TransportLiftOutServiceImpl.java
@@ -252,8 +252,10 @@
//鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟(璇ヤ换鍔￠渶瑕佹崲灞傚繀椤绘彁鍓嶇嫭鍗犳彁鍗囨満)
WrkMast liftWrkMast = wrkMastService.selectLiftWrkMast(liftProtocol.getLiftNo());
if (liftWrkMast != null) {
- News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
- return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
+ if (liftWrkMast != null && !wrkMast.getMainWrkNo().equals(liftWrkMast.getWrkNo())) {
+ News.taskInfo(wrkMast.getWrkNo(), "{}浠诲姟锛寋}鍙锋彁鍗囨満锛屾彁鍗囨満瀛樺湪鏈畬鎴愪换鍔★紝绂佹娲惧彂", wrkMast.getWrkNo(), liftProtocol.getLiftNo());
+ return false;//褰撳墠鎻愬崌鏈哄瓨鍦ㄦ湭瀹屾垚浠诲姟锛岀瓑寰呬笅涓�娆¤疆璇�
+ }
}
wrkMast.setModiTime(now);
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index bed7f63..598fe90 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -20,6 +20,11 @@
}
@Override
+ public WrkMast selectByMainWrkNo(Integer workNo) {
+ return this.baseMapper.selectByMainWrkNo(workNo);
+ }
+
+ @Override
public Boolean judgeInbound(WrkMast wrkMast) {
switch (WrkStsType.query(wrkMast.getWrkSts())) {
case NEW_INBOUND:
@@ -125,4 +130,9 @@
public WrkMast selectLiftWrkMast(Integer liftNo) {
return this.baseMapper.selectLiftWrkMast(liftNo);
}
+
+ @Override
+ public WrkMast selectLiftWrkMastAndWrkNo(Integer liftNo, Integer wrkNo, Integer manWrkNo) {
+ return this.baseMapper.selectLiftWrkMastAndWrkNo(liftNo, wrkNo, manWrkNo);
+ }
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index aa3e713..84c16c0 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -40,6 +40,9 @@
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
+ //鍒濆鍖栧疄鏃跺湴鍥�
+ mainService.initRealtimeBasMap();
+
//zhangc
//杈撻�佺嚎
// 鍏ュ簱
@@ -51,8 +54,7 @@
//杈撻�佺嚎瀹屾垚鍒ゆ柇
mainService.devpFinished();
- //鍒濆鍖栧疄鏃跺湴鍥�
- mainService.initRealtimeBasMap();
+
// // 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
// mainService.shuttleInExecute();
// // 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
diff --git a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
index a52bde3..9b14b9f 100644
--- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
@@ -210,7 +210,7 @@
/**
* 璋冨害杞﹁締
*/
- public boolean searchDispatchShuttleIn(Integer wrkNo, String sourceLocNo, String locNo, String flag, boolean in) {
+ public boolean searchDispatchShuttleS(Integer wrkNo, String sourceLocNo, String locNo, String flag) {
ArrayList<ShuttleThread> sameLev = new ArrayList<>();//鐩稿悓妤煎眰鐨勭┛姊溅
ArrayList<ShuttleThread> diffLev = new ArrayList<>();//涓嶅悓妤煎眰鐨勭┛姊溅
@@ -251,23 +251,13 @@
}
break;
}
-// if (in) {
- if (currentLev == Utils.getLev(sourceLocNo)) {
- //宸ヤ綔妗ｆゼ灞傜浉鍚岀殑绌挎杞�
- sameLev.add(shuttleThread);
- } else {
- //宸ヤ綔妗ｄ笉鍚屾ゼ灞傜殑绌挎杞�
- diffLev.add(shuttleThread);
- }
-// } else {
-// if (currentLev == Utils.getLev(locNo)) {
-// //宸ヤ綔妗ｆゼ灞傜浉鍚岀殑绌挎杞�
-// sameLev.add(shuttleThread);
-// } else {
-// //宸ヤ綔妗ｄ笉鍚屾ゼ灞傜殑绌挎杞�
-// diffLev.add(shuttleThread);
-// }
-// }
+ if (currentLev == Utils.getLev(sourceLocNo)) {
+ //宸ヤ綔妗ｆゼ灞傜浉鍚岀殑绌挎杞�
+ sameLev.add(shuttleThread);
+ } else {
+ //宸ヤ綔妗ｄ笉鍚屾ゼ灞傜殑绌挎杞�
+ diffLev.add(shuttleThread);
+ }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 975905c..fe46e6f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,7 @@
validation-timeout: 3000
connection-test-query: select 1
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/fyxc_shuttle?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.10.201:3306/fyxc_shuttle?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: root
mvc:
@@ -103,13 +103,13 @@
led: ${wcs-slave.led[3].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 1012
+ staNo: 1011
outSta[1]:
- staNo: 1014
+ staNo: 1013
outSta[2]:
- staNo: 1022
+ staNo: 1021
outSta[3]:
- staNo: 1025
+ staNo: 1024
# LED1
led[0]:
id: 1
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 6e38f40..2184615 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -4,177 +4,217 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMast">
- <id column="wrk_no" property="wrkNo" />
- <result column="mk" property="mk" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="io_type" property="ioType" />
- <result column="io_pri" property="ioPri" />
- <result column="loc_no" property="locNo" />
- <result column="sta_no" property="staNo" />
- <result column="source_sta_no" property="sourceStaNo" />
- <result column="source_loc_no" property="sourceLocNo" />
- <result column="io_time" property="ioTime" />
- <result column="modi_user" property="modiUser" />
- <result column="modi_time" property="modiTime" />
- <result column="appe_user" property="appeUser" />
- <result column="appe_time" property="appeTime" />
- <result column="error_time" property="errorTime" />
- <result column="error_memo" property="errorMemo" />
- <result column="memo" property="memo" />
- <result column="barcode" property="barcode" />
- <result column="shuttle_no" property="shuttleNo" />
- <result column="lift_no" property="liftNo" />
- <result column="wms_wrk_no" property="wmsWrkNo" />
- <result column="system_msg" property="systemMsg" />
- <result column="main_wrk_no" property="mainWrkNo" />
+ <id column="wrk_no" property="wrkNo"/>
+ <result column="mk" property="mk"/>
+ <result column="wrk_sts" property="wrkSts"/>
+ <result column="io_type" property="ioType"/>
+ <result column="io_pri" property="ioPri"/>
+ <result column="loc_no" property="locNo"/>
+ <result column="sta_no" property="staNo"/>
+ <result column="source_sta_no" property="sourceStaNo"/>
+ <result column="source_loc_no" property="sourceLocNo"/>
+ <result column="io_time" property="ioTime"/>
+ <result column="modi_user" property="modiUser"/>
+ <result column="modi_time" property="modiTime"/>
+ <result column="appe_user" property="appeUser"/>
+ <result column="appe_time" property="appeTime"/>
+ <result column="error_time" property="errorTime"/>
+ <result column="error_memo" property="errorMemo"/>
+ <result column="memo" property="memo"/>
+ <result column="barcode" property="barcode"/>
+ <result column="shuttle_no" property="shuttleNo"/>
+ <result column="lift_no" property="liftNo"/>
+ <result column="wms_wrk_no" property="wmsWrkNo"/>
+ <result column="system_msg" property="systemMsg"/>
+ <result column="main_wrk_no" property="mainWrkNo"/>
</resultMap>
<select id="selectPakInStep1" resultMap="BaseResultMap">
- select * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC limit 0,1
+ select *
+ from asr_wrk_mast
+ where source_sta_no = #{sourceStaNo}
+ and wrk_sts = 2
+ and barcode = #{barcode}
+ and (io_type = 1 or io_type = 10)
+ order by io_pri desc, io_time, wrk_no ASC limit 0,1
</select>
<select id="selectPakInStep11" resultMap="BaseResultMap">
- select * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC limit 0,1
+ select *
+ from asr_wrk_mast
+ where source_sta_no = #{sourceStaNo}
+ and wrk_sts = 1
+ and (io_type = 1 or io_type = 10)
+ order by io_pri desc, io_time, wrk_no ASC limit 0,1
</select>
<select id="selectInStep4" resultMap="BaseResultMap">
select *
from asr_wrk_mast
- where 1=1
- and wrk_sts = 4
- and io_type in (1,10,53,57)
- order by io_pri desc,wrk_sts desc
+ where 1 = 1
+ and wrk_sts = 4
+ and io_type in (1, 10, 53, 57)
+ order by io_pri desc, wrk_sts desc
</select>
<select id="selectByWorkNo" resultMap="BaseResultMap">
- select * from asr_wrk_mast
- where wrk_no=#{workNo}
- limit 0,1
+ select *
+ from asr_wrk_mast
+ where wrk_no = #{workNo} limit 0,1
+ </select>
+
+ <select id="selectByMainWrkNo" resultMap="BaseResultMap">
+ select *
+ from asr_wrk_mast
+ where main_wrk_no = #{mainWrkNo} limit 0,1
</select>
<select id="selectLiftStep223103" resultMap="BaseResultMap">
- select * from asr_wrk_mast
- where 1=1
- and wrk_sts in (2,103,303)
- order by io_pri desc,wrk_sts desc
+ select *
+ from asr_wrk_mast
+ where 1 = 1
+ and wrk_sts in (2, 103, 303)
+ order by io_pri desc, wrk_sts desc
</select>
<select id="selectByWorkNo324104" resultMap="BaseResultMap">
- select * from asr_wrk_mast
- where wrk_no=#{workNo}
- and wrk_sts in (3,104,303,306)
- limit 0,1
+ select *
+ from asr_wrk_mast
+ where wrk_no = #{workNo}
+ and wrk_sts in (3, 104, 303, 306) limit 0,1
</select>
<select id="selectBy2125" resultMap="BaseResultMap">
- select * from asr_wrk_mast
- where wrk_sts in (101,105)
- and io_type in (101,103,107,110)
- order by io_pri desc,wrk_sts desc
+ select *
+ from asr_wrk_mast
+ where wrk_sts in (101, 105)
+ and io_type in (101, 103, 107, 110)
+ order by io_pri desc, wrk_sts desc
</select>
<select id="selectNoShuttleWrkByLev" resultMap="BaseResultMap">
- select * from asr_wrk_mast
+ select *
+ from asr_wrk_mast
where shuttle_no is null
- and ((wrk_sts = 2 and loc_no like #{lev}) or (wrk_sts = 101 and source_loc_no like #{lev}))
- order by io_pri desc,wrk_sts desc
+ and ((wrk_sts = 2 and loc_no like #{lev}) or (wrk_sts = 101 and source_loc_no like #{lev}))
+ order by io_pri desc, wrk_sts desc
</select>
<select id="selectShuttleWrkByLev" resultMap="BaseResultMap">
- select * from asr_wrk_mast
+ select *
+ from asr_wrk_mast
where shuttle_no is not null
- and ((wrk_sts not in (9,10) and loc_no like #{lev}) or (wrk_sts not in (29,30) and source_loc_no like #{lev}))
- order by io_pri desc,wrk_sts desc
+ and ((wrk_sts not in (9, 10) and loc_no like #{lev}) or
+ (wrk_sts not in (29, 30) and source_loc_no like #{lev}))
+ order by io_pri desc, wrk_sts desc
</select>
<select id="selectShuttleOutWrkByLev" resultMap="BaseResultMap">
- select * from asr_wrk_mast
+ select *
+ from asr_wrk_mast
where shuttle_no is not null
- and (wrk_sts not in (109,110) and source_loc_no like #{lev})
- order by io_pri desc,wrk_sts desc
+ and (wrk_sts not in (109, 110) and source_loc_no like #{lev})
+ order by io_pri desc, wrk_sts desc
</select>
<select id="selectLiftWrkMast" resultMap="BaseResultMap">
- select * from asr_wrk_mast
+ select *
+ from asr_wrk_mast
+ where lift_no = #{liftNo} limit 0,1
+ </select>
+
+ <select id="selectLiftWrkMastAndWrkNo" resultMap="BaseResultMap">
+ select *
+ from asr_wrk_mast
where lift_no = #{liftNo}
- and wrk_sts in (3,4,104,105,301,302,303,304,305,306,307,308,309)
+ <if test="wrkNo !=null">
+ and wrk_no != #{wrkNo}
+ </if>
+ <if test="wrkNo2 !=null">
+ and wrk_no != #{wrkNo2}
+ </if>
limit 0,1
</select>
<select id="selectLocToLocWrkMast" resultMap="BaseResultMap">
- select * from asr_wrk_mast
+ select *
+ from asr_wrk_mast
where io_type in (11)
- and wrk_sts not in (9,10,109,110)
- order by io_pri desc,wrk_sts desc
+ and wrk_sts not in (9, 10, 109, 110)
+ order by io_pri desc, wrk_sts desc
</select>
<select id="selectPickStepByBarcode" resultMap="BaseResultMap">
- select * from asr_wrk_mast
- where io_type in (53,103,107)
- and wrk_sts in (2,3,104,109)
- and barcode = #{barcode}
- order by io_pri desc,wrk_sts desc
- limit 0,1
+ select *
+ from asr_wrk_mast
+ where io_type in (53, 103, 107)
+ and wrk_sts in (2, 3, 104, 109)
+ and barcode = #{barcode}
+ order by io_pri desc, wrk_sts desc limit 0,1
</select>
<select id="selectShuttleHasMoveWorking" resultMap="BaseResultMap">
- select * from asr_wrk_mast
- where 1=1
- and shuttle_no = #{shuttleNo}
- and wrk_sts not in (311)
- and io_type = 200
- order by io_pri desc,io_time,wrk_no asc
- limit 0,1
+ select *
+ from asr_wrk_mast
+ where 1 = 1
+ and shuttle_no = #{shuttleNo}
+ and wrk_sts not in (311)
+ and io_type = 200
+ order by io_pri desc, io_time, wrk_no asc limit 0,1
</select>
<select id="selectShuttleMoveWrk" resultMap="BaseResultMap">
- select * from asr_wrk_mast
- where 1=1
+ select *
+ from asr_wrk_mast
+ where 1 = 1
-- and wrk_sts in (301,302,303,304,305,306,307,308,309,310,311)
- and io_type = 200
- order by io_pri desc,io_time,wrk_no asc
+ and io_type = 200
+ order by io_pri desc, io_time, wrk_no asc
</select>
<select id="selectShuttleWorking" resultMap="BaseResultMap">
- select * from asr_wrk_mast
- where 1=1
- and shuttle_no = #{shuttleNo}
- and wrk_sts not in (9,10,109,110,210)
- and io_type not in (200,300)
- order by io_pri desc,io_time,wrk_no asc
- limit 0,1
+ select *
+ from asr_wrk_mast
+ where 1 = 1
+ and shuttle_no = #{shuttleNo}
+ and wrk_sts not in (9, 10, 109, 110, 210)
+ and io_type not in (200, 300)
+ order by io_pri desc, io_time, wrk_no asc limit 0,1
</select>
<select id="selectByBarcode" resultMap="BaseResultMap">
- select * from asr_wrk_mast
- where 1=1
- and barcode = #{barcode}
- order by io_pri desc,io_time,wrk_no asc
- limit 0,1
+ select *
+ from asr_wrk_mast
+ where 1 = 1
+ and barcode = #{barcode}
+ order by io_pri desc, io_time, wrk_no asc limit 0,1
</select>
<select id="selectInWrkMastByLiftNo" resultMap="BaseResultMap">
- select * from asr_wrk_mast
- where 1=1
- and lift_no = #{liftNo}
- and io_type <= 100
- and wrk_sts in (1,2,3,4,5)
- order by io_pri desc,io_time,wrk_no asc
+ select *
+ from asr_wrk_mast
+ where 1 = 1
+ and lift_no = #{liftNo}
+ and io_type <= 100
+ and wrk_sts in (1, 2, 3, 4, 5)
+ order by io_pri desc, io_time, wrk_no asc
</select>
<select id="selectChargeWorking" resultMap="BaseResultMap">
- select * from asr_wrk_mast
+ select *
+ from asr_wrk_mast
where io_type in (300)
- and shuttle_no = #{shuttleNo}
- order by io_pri desc,io_time,wrk_no asc
+ and shuttle_no = #{shuttleNo}
+ order by io_pri desc, io_time, wrk_no asc
</select>
<select id="selectChargeWorkingByChargeSta" resultMap="BaseResultMap">
- select * from asr_wrk_mast
- where wrk_sts in (201,202,203,204,205,210)
- and mk = #{chargeSta}
- order by io_pri desc,io_time,wrk_no asc
+ select *
+ from asr_wrk_mast
+ where wrk_sts in (201, 202, 203, 204, 205, 210)
+ and mk = #{chargeSta}
+ order by io_pri desc, io_time, wrk_no asc
</select>
</mapper>
diff --git a/src/main/resources/sql/20250410182847.nb3 b/src/main/resources/sql/20250410182847.nb3
deleted file mode 100644
index 9dcf423..0000000
--- a/src/main/resources/sql/20250410182847.nb3
+++ /dev/null
Binary files differ
--
Gitblit v1.9.1