#

yxFwq

2024-12-06 a1b6230dd71854a8cc9fcca8be72bebdc76fcfe7

#

 src/main/java/com/zy/common/service/CommonService.java

@@ -182,7 +182,7 @@
                nearRow = locNecessaryParameters[3];
                if (crnNo>5 || crnNo<3){
                    List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
                    int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100).ne("io_type",10));
                    int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100).ne("source_sta_no",100).ne("source_sta_no",148));
                    if (locMasts.size()-crnCountO<=2){
                        times++;
                        continue;