From 2db72a861b2319cdf6d9557aa52b66bb1fc254bf Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 20 五月 2024 11:18:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 24 ++++++++++++++++--------
1 files changed, 16 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 2008ae6..8d43987 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2152,17 +2152,19 @@
// && staProtocol.isEmptyMk()
&& staProtocol.getWorkNo() == 0
) {
- WrkMast pakoutEmpty = wrkMastMapper.selectPakoutEmpty(sta.getStaNo());
+ Integer staNo = sta.getStaNo();
+ switch (staProtocol.getSiteId()){
+ case 4007:
+ staNo = 4002;break;
+ case 4016:
+ staNo = 4011;break;
+ }
+ WrkMast pakoutEmpty = wrkMastMapper.selectPakoutEmpty(staNo);
if (null != pakoutEmpty) {
return;
}
- switch (staProtocol.getSiteId()){
- case 4007:
- sta.setStaNo(4002);break;
- case 4016:
- sta.setStaNo(4011);break;
- }
- List<StaDesc> staDescs = staDescService.selectList(new EntityWrapper<StaDesc>().eq("stn_no", sta.getStaNo()));
+
+ List<StaDesc> staDescs = staDescService.selectList(new EntityWrapper<StaDesc>().eq("stn_no", staNo));
for (StaDesc staDesc: staDescs){
BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", staDesc.getCrnNo()));
if (!basCrnp.getCrnSts().equals(3) || basCrnp.getCrnErr() != 0){
@@ -2567,6 +2569,9 @@
} else if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk() && (staProtocol.getWorkNo()>=9900 || staProtocol.getWorkNo()==0)) {
+ if (rgvSlave.getId() != 2 ){
+ continue;
+ }
workNo1 = workNo++;
souSta1 = Utils.getRgvStaNo(rgvSlave.getId(),inStn.getSourceStaNo());
if (inStn.getSourceStaNo() == 4007 && staProtocol.getTongType() == 1){
@@ -2627,6 +2632,9 @@
devpThread.setPakMk(inStn.getSourceStaNo(),false);
break;
} else if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk() && (staProtocol.getWorkNo()>=9900 || staProtocol.getWorkNo()==0)) {
+ if (rgvSlave.getId() != 2 ){
+ continue;
+ }
workNo2 = workNo++;
souSta2 = Utils.getRgvStaNo(rgvSlave.getId(),inStn.getSourceStaNo());
if (inStn.getSourceStaNo() == 4007 && staProtocol.getTongType() == 1){
--
Gitblit v1.9.1