#

yxFwq

2024-10-29 ea1882c9a1314a25ba160bc865c323151cf7f08b

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

@@ -93,10 +93,10 @@
            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);
                BasDevp basDevp = basDevpService.selectById(160);
                if (basDevp.getLoading().equals("Y")
                        || !basDevp.getAutoing().equals("Y")
                        || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()==0) ){
                        || (!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"));
@@ -110,18 +110,30 @@
    }

    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute3(){//自动调空板出库 煜星二楼小料箱  172
    private void execute3(){//自动调空板出库 煜星二楼小料箱  272
        if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
            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);
                BasDevp basDevp = basDevpService.selectById(265);
                if (basDevp.getLoading().equals("Y")
                        || !basDevp.getAutoing().equals("Y")
                        || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()==0) ){
                        || (!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"));
                BasDevp basDevp264 = basDevpService.selectById(264);
                if (basDevp264.getLoading().equals("Y")
                        || !basDevp264.getAutoing().equals("Y")
                        || (!Cools.isEmpty(basDevp264.getWrkNo()) && basDevp264.getWrkNo()!=0) ){
                    return;
                }
                BasDevp basDevp266 = basDevpService.selectById(266);
                if (basDevp266.getLoading().equals("Y")
                        || !basDevp266.getAutoing().equals("Y")
                        || (!Cools.isEmpty(basDevp266.getWrkNo()) && basDevp266.getWrkNo()!=0) ){
                    return;
                }
                int loadIngCount = basDevpService.selectCount(new EntityWrapper<BasDevp>().ge("dev_no", 265).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));
                if (loadIngCount+wrkCount<count){
@@ -137,10 +149,10 @@
            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);
                BasDevp basDevp = basDevpService.selectById(422);
                if (basDevp.getLoading().equals("Y")
                        || !basDevp.getAutoing().equals("Y")
                        || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()==0) ){
                        || (!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"));