From 8d862cadd05ae0404ed995f3ad1fdbd98371105c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 18 四月 2025 22:23:35 +0800
Subject: [PATCH] 999
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 7dd60f7..f7260b8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -831,6 +831,8 @@
short staNo = 1012;
if (wrkMast.getSourceStaNo() == 1022) {
staNo = 1023;
+ } else if (wrkMast.getSourceStaNo() == 1031 || wrkMast.getSourceStaNo() == 1032) {
+ staNo = 1032;
}
staProtocol = staProtocol.clone();
@@ -936,6 +938,8 @@
String locNo = "0200305";
if (wrkMast.getSourceStaNo() == 1012) {
locNo = "0200301";
+ } else if (wrkMast.getSourceStaNo() == 1032 || wrkMast.getSourceStaNo() == 1031) {
+ locNo = "0200308";
}
boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleS(wrkMast.getWrkNo(), locNo, wrkMast.getLocNo(), "TRANSPORT_LIFT");
if (!dispatchShuttle) {
@@ -943,9 +947,13 @@
return false;
}
- int lev = 105;
- if (wrkMast.getSourceStaNo() == 1012) {
- lev = 101;
+ int lev = 101;
+ if (wrkMast.getSourceStaNo() == 1021) {
+ //TODO
+ // lev = 105;
+ lev = 1021;
+ } else if (wrkMast.getSourceStaNo() == 1032 || wrkMast.getSourceStaNo() == 1031) {
+ lev = 1031;
}
//鑾峰彇鎻愬崌鏈哄懡浠�
List<LiftCommand> liftCommands = liftThread.getPalletInCommand(wrkMast.getWrkNo(), sourceStaNo, lev);
@@ -1078,6 +1086,8 @@
String locNo = "0200305";
if (wrkMast.getStaNo() == 1011) {
locNo = "0200301";
+ } else if (wrkMast.getStaNo() == 1032) {
+ locNo = "0200308";
}
boolean dispatchShuttle = shuttleDispatchUtils.searchDispatchShuttleS(wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), locNo, "TRANSPORT_LIFT");
if (!dispatchShuttle) {
@@ -2112,15 +2122,13 @@
try {
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
FyDevpThread devpThread = (FyDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- WrkMast pakout = wrkMastMapper.selectWorkingPakout(1032);
+ WrkMast pakout = wrkMastService.selectWorkingPakout(1032);
if (pakout != null) {
if (devpThread.ioModeOf2_5 != IoModeType.PAKOUT_MODE) {
// 鍑哄簱鍒囨崲涓�
- devpThread.ioModeOf2_5 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(1032);
- if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getBackSta()).isLoading()
- && devpThread.getStation().get(inSta.getBackSta()).getWorkNo() == 0) {
+ WrkMast pakin = wrkMastService.selectWorkingPakin(1032);
+ if (pakin == null && !devpThread.getStation().get(1031).isLoading()
+ && !devpThread.getStation().get(1032).isLoading()) {
// 鍑哄簱妯″紡
devpThread.ioModeOf2_5 = IoModeType.PAKOUT_MODE;
}
--
Gitblit v1.9.1