From 58eaf5e73359f7164525d9c50f6e5bf82b247e32 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 24 四月 2025 09:10:58 +0800
Subject: [PATCH] 初步调试
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 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 3ff9dc5..42bebb2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -877,7 +877,7 @@
short staNo = 1012;
if (wrkMast.getSourceStaNo() == 1022) {
staNo = 1023;
- } else if (wrkMast.getSourceStaNo() == 1032) {
+ } else if (wrkMast.getSourceStaNo() == 1031) {
staNo = 1032;
}
@@ -945,6 +945,8 @@
Integer sourceStaNo = wrkMast.getSourceStaNo();
if (wrkMast.getSourceStaNo() == 1022) {
sourceStaNo = 1023;
+ } else if (wrkMast.getSourceStaNo() == 1031) {
+ sourceStaNo = 1032;
}
StaProtocol staProtocol = station.get(sourceStaNo);
@@ -972,7 +974,7 @@
return false;
}
} else if (sourceStaNo == 1032) {
- if (staProtocol.getWorkNo().intValue() != wrkMast.getWrkNo()) {
+ if (staProtocol.getFinishWorkNo().intValue() != wrkMast.getWrkNo()) {
News.info("{}浠诲姟锛寋}绔欑偣锛屼换鍔″彿涓嶄竴鑷�", wrkMast.getWrkNo(), staProtocol.getSiteId());
return false;
}
@@ -992,11 +994,9 @@
int lev = 101;
if (wrkMast.getSourceStaNo() == 1021) {
- //TODO
- // lev = 105;
- lev = 1021;
+ lev = 100 + Utils.getLev(wrkMast.getLocNo());
} else if (wrkMast.getSourceStaNo() == 1031) {
- lev = 1031;
+ lev = 100 + Utils.getLev(wrkMast.getLocNo());
}
//鑾峰彇鎻愬崌鏈哄懡浠�
List<LiftCommand> liftCommands = liftThread.getPalletInCommand(wrkMast.getWrkNo(), sourceStaNo, lev);
@@ -1215,9 +1215,12 @@
//鑾峰彇鎻愬崌鏈哄懡浠�
List<LiftCommand> liftCommands = liftThread.getPalletOutCommand(wrkMast.getWrkNo(), sourceLev, wrkMast.getStaNo());
LiftCommand liftCommand = liftCommands.get(0);
-
- int deviceWrk = commonService.getWorkNo(8);//鐢熸垚鎻愬崌鏈鸿澶囧伐浣滃彿
- liftCommand.setTaskNo(deviceWrk);//鏇存崲闅忔満浠诲姟鍙�
+ if ( wrkMast.getStaNo()==1031){
+ liftCommand.setTaskNo(wrkMast.getWrkNo());
+ }else {
+ int deviceWrk = commonService.getWorkNo(8);//鐢熸垚鎻愬崌鏈鸿澶囧伐浣滃彿
+ liftCommand.setTaskNo(deviceWrk);//鏇存崲闅忔満浠诲姟鍙�
+ }
ArrayList<LiftCommand> commands = new ArrayList<>();
commands.add(liftCommand);
@@ -1233,6 +1236,7 @@
wrkMast.setLiftNo(liftProtocol.getLiftNo());//鎻愬墠閿佸畾鎻愬崌鏈�
wrkMast.setSystemMsg("");//娓呯┖娑堟伅
wrkMast.setModiTime(now);
+
if (wrkMastService.updateById(wrkMast)) {
//涓嬪彂浠诲姟
liftAction.assignWork(wrkMast.getLiftNo(), assignCommand);
@@ -1574,7 +1578,11 @@
wrkMast.setWrkSts(WrkStsType.INBOUND_LIFT_RUN_COMPLETE.sts);
} else if (wrkMast.getWrkSts() == WrkStsType.OUTBOUND_LIFT_RUN.sts) {
//104.鎻愬崌鏈烘惉杩愪腑 ==> 109.鍑哄簱瀹屾垚
- wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
+ if (wrkMast.getStaNo() == 1031) {
+ wrkMast.setWrkSts(WrkStsType.OUTBOUND_DEVP_RUN_2.sts);
+ } else {
+ wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
+ }
wrkMast.setLiftNo(null);//閲婃斁鎻愬崌鏈�
} else if (wrkMast.getWrkSts() == WrkStsType.MOVE_LIFT_RUN.sts) {
//306.鎻愬崌鏈烘惉杩愪腑 ==> 307.鎻愬崌鏈烘惉杩愬畬鎴�
@@ -1601,7 +1609,6 @@
//鎻愬崌鏈鸿嚦灏忚溅灞� ==> 鎻愬崌鏈鸿嚦灏忚溅灞傚畬鎴�
wrkMast.setWrkSts(WrkStsType.MOVE_OUT_NO_LIFT_5.sts);
}
-
wrkMast.setModiTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
liftThread.setSyncTaskNo(0);
@@ -2153,9 +2160,15 @@
}
private void shuttleMoveExecuteTransportLift(WrkMast wrkMast) {
- LiftThread liftThread = LiftUtils.getRecentLift(wrkMast.getLocNo());
- if (liftThread == null) {
- return;
+ WrkMast wrkMast1 = wrkMastService.selectByWorkNo(wrkMast.getMainWrkNo());
+ LiftThread liftThread;
+ if (wrkMast1 != null && wrkMast1.getLiftNo() != null) {
+ liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, 1);
+ } else {
+ liftThread = LiftUtils.getRecentLift(wrkMast.getLocNo());
+ if (liftThread == null) {
+ return;
+ }
}
//liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, wrkMast1.getLiftNo());
String liftLocNo = liftThread.getLiftLocNo(Utils.getLev(wrkMast.getLocNo()));
--
Gitblit v1.9.1