#

yxFwq

3 天以前 d60e84cbedb554555578f071de95c4a8049183db

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

@@ -111,6 +111,20 @@
//            } catch (Exception e){
//
//            }

            BasDevp basDevp = basDevpService.selectById(staNo);
            if (basDevp.getLoading().equals("Y")
                    || !basDevp.getAutoing().equals("Y")
                    || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){
                continue;
            }

            BasDevp basDevp1 = basDevpService.selectById(staNo==100? 101:149);
            if (basDevp1.getLoading().equals("Y")
                    || !basDevp1.getAutoing().equals("Y")
                    || (!Cools.isEmpty(basDevp1.getWrkNo()) && basDevp1.getWrkNo()!=0) ){
                continue;
            }
            List<WrkMastCrn> wrkMastCrnList = wrkMastCrnService.selectList(new EntityWrapper<WrkMastCrn>().eq("source_sta_no",staNo));
            if (Cools.isEmpty(wrkMastCrnList)){
                List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
@@ -148,12 +162,6 @@
//                            continue;
//                        }
//                        sign = false;
//                        BasDevp basDevp = basDevpService.selectById(wrkMast.getStaNoBying());
//                        if (basDevp.getLoading().equals("Y")
//                                || !basDevp.getAutoing().equals("Y")
//                                || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){
//                            continue;
//                        }
//                        int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 103).le("dev_no", 121).eq("loading", "Y"));
//                        if (loadIngCount>8){
//                            continue;