#

yxFwq

2024-11-28 4149d11f06c462eed17c0b26094f35547aad58cd

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -2273,7 +2273,7 @@
                    staProtocolOther1 = staProtocolOther1.clone();
                }

                if (staProtocolOther1.isAutoing() || staProtocolOther1.getWorkNo()!=0){
                if (staProtocolOther1.isLoading() || !staProtocolOther1.getWorkNo().equals(0)){
                    return;
                }

@@ -2284,7 +2284,7 @@
                } else {
                    staProtocolOther2 = staProtocolOther2.clone();
                }
                if (staProtocolOther2.isAutoing() || staProtocolOther2.getWorkNo()!=0){
                if (staProtocolOther2.isLoading() || !staProtocolOther2.getWorkNo().equals(0)){
                    return;
                }
            }
@@ -3103,7 +3103,8 @@
                if (Cools.isEmpty(rgvOneSign)){
                    continue;
                }
                if (rgvOneSign.getRgvOneSign()>=2){
                int wrkCount = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",12L));
                if (wrkCount+rgvOneSign.getRgvOneSign()>=3){
                    continue;
                }
//                int wrkCount = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).gt("sta_no", 309).lt("sta_no", 314).gt("wrk_sts",11L));
@@ -4022,7 +4023,7 @@
                } else {
                    staProtocol = staProtocol.clone();
                }
                if (emptyInSta.getStaNo()==607 && staProtocol.getStaNo()==0 && staProtocol.getWorkNo()==0
                if (emptyInSta.getStaNo()==607 && staProtocol.getStaNo()==0 && staProtocol.getWorkNo().equals(0)
                        && staProtocol.isLoading() && staProtocol.isAutoing() && staProtocol.isInEnable()){
                    String barcode = staProtocol.getBarcode();
                    if (!Cools.isEmpty(barcode)) {