#

lsh

2024-05-02 85113dabc3d7243dc98d0e25bee88f5f106f9e28

#

 src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java

@@ -253,6 +253,7 @@
                        }
                        String origin = null;
                        boolean sign = false;
                        boolean sign101 = false;
                        if (wrkMast.getIoType()!=101){
                            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                            if (!Cools.isEmpty(wrkDetls) && !wrkDetls.isEmpty()){
@@ -270,6 +271,8 @@
                                log.error("未查询到工作明细");
                                continue;
                            }
                        }else {
                            sign101 = true;
                        }
                        int count = wrkMastStaService.selectCount(new EntityWrapper<WrkMastSta>().eq("sta_start", wrkMastStaNo).or().eq("sta_end", wrkMastStaNo));
                        if (count!=0){
@@ -297,7 +300,7 @@
                            for (Integer staNoOther : STA_WORK_CU_CAR_NOW) {
                                if (staNoOther.equals(wrkMastStaNo)) continue;

                                if (sign){
                                if (sign && !sign101){
                                    if (Cools.isEmpty(origin)){
                                        continue;
                                    }