Merge remote-tracking branch 'origin/bfwcs' into bfwcs

lsh

2023-01-31 986b82b0941b98c2d9896214823679e12abffcae

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

@@ -311,12 +311,20 @@
                            if (basDevps1.size()!=0){
                                continue;
                            }
                            List<WrkMast> wrkMasts1 = wrkMastMapper.selectWrkStsAndIoType(103);
                            if (wrkMasts1.size()!=0){
                                continue;
                            }
                            break;
                        case 204:
                        case 208:
                            staNo = 203;
                            List<BasDevp> basDevps2 = basDevpMapper.getLoading(203);
                            if (basDevps2.size()!=0){
                                continue;
                            }
                            List<WrkMast> wrkMasts2 = wrkMastMapper.selectWrkStsAndIoType(203);
                            if (wrkMasts2.size()!=0){
                                continue;
                            }
                            break;
@@ -1001,7 +1009,7 @@
            if (wrkMast.getWrkSts() == 11 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
                Integer sour = wrkMast.getStaNo();
                List<WrkMast> wrkMasts = wrkMastMapper.selectWrkStsAndIoType(sour);
                if (wrkMasts.size()!=0){
                if (wrkMasts.size() > 0){
                    continue;
                }
            }