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

lsh

2023-01-31 986b82b0941b98c2d9896214823679e12abffcae

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

@@ -311,6 +311,10 @@
                            if (basDevps1.size()!=0){
                                continue;
                            }
                            List<WrkMast> wrkMasts1 = wrkMastMapper.selectWrkStsAndIoType(103);
                            if (wrkMasts1.size()!=0){
                                continue;
                            }
                            break;
                        case 204:
                        case 208:
@@ -319,6 +323,10 @@
                            if (basDevps2.size()!=0){
                                continue;
                            }
                            List<WrkMast> wrkMasts2 = wrkMastMapper.selectWrkStsAndIoType(203);
                            if (wrkMasts2.size()!=0){
                                continue;
                            }
                            break;
                        default:
                            News.error("{}任务再入库失败，系统数据异常！", wrkMast.getWrkNo());