From d2b19008230941c105b57b8f7b49b291560f2cfb Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 19 八月 2024 11:09:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 1504420..8837902 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1065,7 +1065,7 @@
// 鍒ゆ柇鍫嗗灈鏈虹姸鎬佺瓑寰呯‘璁�
if (crnProtocol.modeType == CrnModeType.AUTO
&& crnProtocol.statusType == CrnStatusType.IDLE
- && crnProtocol.forkPosType == CrnForkPosType.HOME) {
+ && crnProtocol.forkPosType == CrnForkPosType.HOME && crnStn.getBay()!=(short)4) {
News.info("鍫嗗灈鏈烘帴椹充换鍔℃墽琛岋紝宸ヤ綔鍙凤細"+staProtocol.getWorkNo()+"锛涙墽琛屽爢鍨涙満鍙凤細"+slave.getId()+"锛涙帴椹冲彇璐т綅锛�"+crnStn.getStaNo()+"锛涙帴椹虫斁璐т綅锛�"+staProtocol.getSiteId());
// 鍫嗗灈鏈烘帴椹充换鍔″懡浠や笅鍙戝尯 --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
@@ -1097,7 +1097,7 @@
// 鍒ゆ柇鍫嗗灈鏈虹姸鎬佺瓑寰呯‘璁�
if (crnProtocol.modeType == CrnModeType.AUTO
&& crnProtocol.statusType == CrnStatusType.IDLE
- && crnProtocol.forkPosType == CrnForkPosType.HOME) {
+ && crnProtocol.forkPosType == CrnForkPosType.HOME && crnStn.getBay()==(short)4) {
News.info("鍫嗗灈鏈烘帴椹充换鍔℃墽琛岋紝宸ヤ綔鍙凤細"+staProtocol.getWorkNo()+"锛涙墽琛屽爢鍨涙満鍙凤細"+slave.getId()+"锛涙帴椹冲彇璐т綅锛�"+crnStn.getStaNo()+"锛涙帴椹虫斁璐т綅锛�"+staProtocol.getSiteId());
// 鍫嗗灈鏈烘帴椹充换鍔″懡浠や笅鍙戝尯 --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
@@ -3578,6 +3578,7 @@
SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
SteProtocol steProtocol = steThread.getSteProtocol();
if (steProtocol == null) { continue; }
+ if (Cools.isEmpty(steProtocol.loca)) continue;
if (steProtocol.loca==0) continue;
if (steProtocol.getWaiting() && steProtocol.getTaskNo() == 0){
News.info("ste[id={}] 鏀跺埌绛夊緟WCS纭淇″彿锛屼絾鏄换鍔″彿(鍦板潃V824)涓�0", steProtocol.getSteNo());
@@ -4873,8 +4874,8 @@
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
for (DevpSlave.Sta inSta : devp.getInSta()) {
- Integer sourceStaNo = inSta.getStaNo()==103 ? 104 : inSta.getStaNo()==113 ? 104 : 204;
- WrkMast pakout = wrkMastMapper.selectWorkingPakout(sourceStaNo);
+ Integer staNoEnd = inSta.getStaNo()==113 ? 114 : 214;
+ WrkMast pakout = wrkMastMapper.selectWorkingPakoutTwoF(staNoEnd);
boolean sign = true;
int[] staNos = new int[3];
@@ -4883,7 +4884,8 @@
staNos = new int[]{112,113,114};
for (int staNo : staNos){
StaProtocol staProtocol = devpThread.getStation().get(staNo);
- if (!staProtocol.isAutoing() || staProtocol.isLoading()){
+ if (Cools.isEmpty(staProtocol)) continue;
+ if (!staProtocol.isAutoing() || staProtocol.isLoading() || staProtocol.getWorkNo()>0){
sign = false;
}
}
@@ -4912,6 +4914,7 @@
staNos = new int[]{212,213,214};
for (int staNo : staNos){
StaProtocol staProtocol = devpThread.getStation().get(staNo);
+ if (Cools.isEmpty(staProtocol)) continue;
if (!staProtocol.isAutoing() || staProtocol.isLoading()){
sign = false;
}
--
Gitblit v1.9.1