From d9280b0c2ceab9db2c60c0af1a74e83f91cc74fc Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 14 四月 2025 12:56:20 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 87ba996..d7e34f0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -306,7 +306,7 @@
}
public synchronized void noLiftIn() {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", WrkStsType.NEW_INBOUND.sts, WrkStsType.INBOUND_DEVICE_RUN.sts).in("source_sta_no", 1014, 1025));
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.INBOUND_DEVICE_RUN.sts).in("source_sta_no", 1014, 1025));
for (WrkMast wrkMast : wrkMasts) {
if (wrkMast.getWrkSts() == WrkStsType.INBOUND_DEVICE_RUN.sts) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
@@ -324,7 +324,7 @@
if (wrkMast.getStaNo() == 1025) {
locNo = "1200305";
}
- boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttle(wrkMast.getWrkNo(), locNo, wrkMast.getLocNo(), "TRANSPORT_DEVP");
+ boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleIn(wrkMast.getWrkNo(), locNo, wrkMast.getLocNo(), "TRANSPORT_DEVP",true);
if (!dispatchShuttle) {
News.info("{}浠诲姟锛岃皟搴﹀皬杞﹀け璐�", wrkMast.getWrkNo());
return;
@@ -348,7 +348,7 @@
// 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
Date now = new Date();
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devpSlave.getId());
- List<WrkMast> wrkSts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.NEW_OUTBOUND.sts).in("sta_no", 1014, 1025));
+ List<WrkMast> wrkSts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.NEW_OUTBOUND.sts).in("sta_no", 1013, 1024));
for (WrkMast wrkMast : wrkSts) {
if (devpThread == null) {
return;
@@ -369,10 +369,10 @@
return;
}
String locNo = "1200301";
- if (wrkMast.getStaNo() == 1025) {
+ if (wrkMast.getStaNo() == 1024) {
locNo = "1200305";
}
- boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttle(wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), locNo, "TRANSPORT_DEVP");
+ boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleIn(wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), locNo, "TRANSPORT_DEVP", false);
if (!dispatchShuttle) {
News.info("{}浠诲姟锛岃皟搴﹀皬杞﹀け璐�", wrkMast.getWrkNo());
return;
@@ -405,7 +405,7 @@
staProtocol = staProtocol.clone();
}
- if (staProtocol.isAutoing() && !staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) {
+ if (staProtocol.isAutoing() && staProtocol.isLoading()) {
// 鏌ヨ宸ヤ綔妗�
if (wrkMast == null) {
continue;
@@ -1500,10 +1500,10 @@
Map<Integer, StaProtocol> station = devpThread.getStation();
WrkMast wrkMast = null;
for (StaProtocol staProtocol : station.values()) {
- if (staProtocol.getSiteId() == 1014 || staProtocol.getSiteId() == 1015) {
+ if (staProtocol.getSiteId() == 1013 || staProtocol.getSiteId() == 1014) {
wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getFinishWorkNo()).eq("wrk_sts", WrkStsType.OUTBOUND_DEVP_RUN.sts));
if (wrkMast != null) {
- wrkMast.setWrkSts(WrkStsType.OUTBOUND_DEVP_RUN_COMPLETE.sts);
+ wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
wrkMast.setModiTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
News.info("杈撻�佺嚎宸茬‘璁や笖浠诲姟瀹屾垚鐘舵�併�傝緭閫佺嚎鍙�={},瀹岀粨宸ヤ綔鍙�={}", staProtocol.getSiteId(), staProtocol.getFinishWorkNo());
--
Gitblit v1.9.1