#

yxFwq

2024-07-29 33cb8b070c31a96bc514d07e3d1d9f6514a057d9

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

@@ -93,6 +93,12 @@
            Integer devNo = 173;
            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard172"));
            if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
                BasDevp basDevp = basDevpService.selectById(devNo);
                if (basDevp.getLoading().equals("Y")
                        || !basDevp.getAutoing().equals("Y")
                        || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()==0) ){
                    return;
                }
                int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 160).le("dev_no", devNo).eq("loading", "Y"));
                int count = 10;
                int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", devNo).eq("wrk_sts",11L));
@@ -109,6 +115,12 @@
            Integer devNo = 272;
            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard272"));
            if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
                BasDevp basDevp = basDevpService.selectById(devNo);
                if (basDevp.getLoading().equals("Y")
                        || !basDevp.getAutoing().equals("Y")
                        || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()==0) ){
                    return;
                }
                int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 266).le("dev_no", devNo).eq("loading", "Y"));
                int count = 5;
                int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", devNo).eq("wrk_sts",11L));
@@ -125,8 +137,14 @@
            Integer devNo = 445;
            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard445"));
            if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
                BasDevp basDevp = basDevpService.selectById(devNo);
                if (basDevp.getLoading().equals("Y")
                        || !basDevp.getAutoing().equals("Y")
                        || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()==0) ){
                    return;
                }
                int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 422).le("dev_no", devNo).eq("loading", "Y"));
                int count = 20;
                int count = 15;
                int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", devNo).eq("wrk_sts",11L));
                if (loadIngCount+wrkCount<count){
                    bareBoardHandler.startYx(devNo,count);