From 3c3ec87a6ac907d375f2fb78f0882ab9f30a1533 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 21 四月 2025 14:26:00 +0800
Subject: [PATCH] 999
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 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 0283968..fcb7843 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -813,7 +813,7 @@
// }
public synchronized void liftInExecute() {
try {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", WrkStsType.NEW_INBOUND.sts, WrkStsType.INBOUND_DEVICE_RUN.sts, WrkStsType.INBOUND_LIFT_RUN_COMPLETE.sts).in("source_sta_no", 1012, 1022));
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", WrkStsType.NEW_INBOUND.sts, WrkStsType.INBOUND_DEVICE_RUN.sts, WrkStsType.INBOUND_LIFT_RUN_COMPLETE.sts).in("source_sta_no", 1012, 1022, 1031));
for (WrkMast wrkMast : wrkMasts) {
boolean step0 = this.liftInExecuteStep0(wrkMast);//璁惧涓婅蛋
if (!step0) {
@@ -858,11 +858,13 @@
News.info("{}浠诲姟锛寋}绔欑偣锛屾棤鎵樼洏", wrkMast.getWrkNo(), staProtocol.getSiteId());
return false;
}
-
- if (!staProtocol.getBarcode().equals(wrkMast.getBarcode())) {
- News.info("{}浠诲姟锛寋}绔欑偣锛屾墭鐩樼爜涓嶅尮閰嶏紝绔欑偣鎵樼洏鐮侊細{}锛屼换鍔℃墭鐩樼爜锛歿}", wrkMast.getWrkNo(), staProtocol.getSiteId(), staProtocol.getBarcode(), wrkMast.getBarcode());
- return false;
+ if (wrkMast.getSourceStaNo() != 1031) {
+ if (!staProtocol.getBarcode().equals(wrkMast.getBarcode())) {
+ News.info("{}浠诲姟锛寋}绔欑偣锛屾墭鐩樼爜涓嶅尮閰嶏紝绔欑偣鎵樼洏鐮侊細{}锛屼换鍔℃墭鐩樼爜锛歿}", wrkMast.getWrkNo(), staProtocol.getSiteId(), staProtocol.getBarcode(), wrkMast.getBarcode());
+ return false;
+ }
}
+
//鍒ゆ柇鎻愬崌鏈烘槸鍚︽湁鍏朵粬浠诲姟
WrkMast liftWrkMast = wrkMastService.selectLiftWrkMastAndWrkNo(1, wrkMast.getWrkNo(), wrkMast.getMainWrkNo());
if (liftWrkMast != null) {
@@ -875,7 +877,7 @@
short staNo = 1012;
if (wrkMast.getSourceStaNo() == 1022) {
staNo = 1023;
- } else if ( wrkMast.getSourceStaNo() == 1032) {
+ } else if (wrkMast.getSourceStaNo() == 1032) {
staNo = 1032;
}
@@ -969,7 +971,7 @@
News.info("{}浠诲姟锛寋}绔欑偣锛屼换鍔″彿涓嶄竴鑷�", wrkMast.getWrkNo(), staProtocol.getSiteId());
return false;
}
- } else if (sourceStaNo == 1032 ) {
+ } else if (sourceStaNo == 1032) {
if (staProtocol.getWorkNo().intValue() != wrkMast.getWrkNo()) {
News.info("{}浠诲姟锛寋}绔欑偣锛屼换鍔″彿涓嶄竴鑷�", wrkMast.getWrkNo(), staProtocol.getSiteId());
return false;
@@ -979,7 +981,7 @@
String locNo = "0200305";
if (wrkMast.getSourceStaNo() == 1012) {
locNo = "0200301";
- } else if (wrkMast.getSourceStaNo() == 1032 ) {
+ } else if (wrkMast.getSourceStaNo() == 1032) {
locNo = "0200308";
}
boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleS(wrkMast.getWrkNo(), locNo, wrkMast.getLocNo(), "TRANSPORT_LIFT");
@@ -993,7 +995,7 @@
//TODO
// lev = 105;
lev = 1021;
- } else if ( wrkMast.getSourceStaNo() == 1031) {
+ } else if (wrkMast.getSourceStaNo() == 1031) {
lev = 1031;
}
//鑾峰彇鎻愬崌鏈哄懡浠�
@@ -1118,10 +1120,17 @@
News.info("{}浠诲姟锛寋}绔欑偣锛屼笉鍦ㄨ嚜鍔ㄧ姸鎬�", wrkMast.getWrkNo(), staProtocol.getSiteId());
return false;
}
-
- if (!isOutEnable(devpThread, wrkMast.getStaNo())) {
- News.info("{}浠诲姟锛寋}绔欑偣锛屾病鏈夊彲鍑轰俊鍙�", wrkMast.getWrkNo(), staProtocol.getSiteId());
- return false;
+ if (wrkMast.getStaNo() == 1031) {
+ //TODO
+ if (staProtocol.getOutInModel() != 1) {
+ News.info("{}浠诲姟锛寋}绔欑偣锛屾病鏈夊彲鍑轰俊鍙�", wrkMast.getWrkNo(), staProtocol.getSiteId());
+ return false;
+ }
+ } else {
+ if (!isOutEnable(devpThread, wrkMast.getStaNo())) {
+ News.info("{}浠诲姟锛寋}绔欑偣锛屾病鏈夊彲鍑轰俊鍙�", wrkMast.getWrkNo(), staProtocol.getSiteId());
+ return false;
+ }
}
String locNo = "0200305";
@@ -1621,6 +1630,17 @@
for (StaProtocol staProtocol : station.values()) {
if (staProtocol.getSiteId() == 1013 || staProtocol.getSiteId() == 1024) {
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.COMPLETE_OUTBOUND.sts);
+ wrkMast.setModiTime(new Date());
+ if (wrkMastService.updateById(wrkMast)) {
+ News.info("杈撻�佺嚎宸茬‘璁や笖浠诲姟瀹屾垚鐘舵�併�傝緭閫佺嚎鍙�={},瀹岀粨宸ヤ綔鍙�={}", staProtocol.getSiteId(), staProtocol.getFinishWorkNo());
+ } else {
+ News.error("杈撻�佺嚎宸茬‘璁や笖浠诲姟瀹屾垚鐘舵��,澶嶄綅澶辫触锛屼絾鏈壘鍒板伐浣滄。銆傝緭閫佺嚎鍙�={}锛屽畬缁撳伐浣滃彿={}", staProtocol.getSiteId(), staProtocol.getFinishWorkNo());
+ }
+ }
+ } else if (staProtocol.getSiteId() == 1031) {
+ wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getFinishWorkNo()).eq("wrk_sts", WrkStsType.OUTBOUND_DEVP_RUN_2.sts));
if (wrkMast != null) {
wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
wrkMast.setModiTime(new Date());
@@ -2134,7 +2154,7 @@
if (liftThread == null) {
return;
}
-
+ //liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, wrkMast1.getLiftNo());
String liftLocNo = liftThread.getLiftLocNo(Utils.getLev(wrkMast.getLocNo()));
if (Utils.getRow(liftLocNo) == Utils.getRow(wrkMast.getSourceLocNo()) && Utils.getBay(liftLocNo) == Utils.getBay(wrkMast.getSourceLocNo())) {
//鍙栬揣浣嶇疆鏄彁鍗囨満
@@ -2164,7 +2184,7 @@
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
FyDevpThread devpThread = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- WrkMast pakout = wrkMastService.selectWorkingPakout(1032);
+ WrkMast pakout = wrkMastService.selectWorkingPakout(1031);
if (pakout != null) {
if (devpThread.ioModeOf2_5 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
--
Gitblit v1.9.1