#

yxFwq

2024-09-14 7c7a75e9506f6b2bb3cb6718abf909e8acb6da3c

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

@@ -4015,7 +4015,7 @@
                } else {
                    staProtocol = staProtocol.clone();
                }
                if (emptyInSta.getStaNo()==607 && staProtocol.getStaNo()==607 && staProtocol.getWorkNo()==0
                if (emptyInSta.getStaNo()==607 && staProtocol.getStaNo()==0 && staProtocol.getWorkNo()==0
                        && staProtocol.isLoading() && staProtocol.isAutoing() && staProtocol.isInEnable()){
                    String barcode = staProtocol.getBarcode();
                    if (!Cools.isEmpty(barcode)) {
@@ -4027,7 +4027,7 @@
                        continue;
                    }
                    try {
                        BasDevp basDevp = basDevpService.selectById(staProtocol.getStaNo());
                        BasDevp basDevp = basDevpService.selectById(emptyInSta.getStaNo());
                        if (basDevp.getReportSign()==0){
                            WrkMast wrkMast = wrkMastMapper.selectByBarcodeTwo(barcode);
                            if (!Cools.isEmpty(wrkMast)){
@@ -8567,7 +8567,7 @@
                return;
            }
            if (staProtocol607.getWorkNo()==0 && staProtocol607.isLoading() && staProtocol607.isAutoing()
                    && staProtocol607.getStaNo() == 607 && staProtocol607.isInEnable()){
                    && staProtocol607.getStaNo() == 0 && staProtocol607.isInEnable()){
                WrkMast wrkMast = wrkMastMapper.selectByBarcodeTwo(barcode);
                if (!Cools.isEmpty(wrkMast)){
                    staProtocol607.setWorkNo(wrkMast.getWrkNo());