#logo

yxFwq

2024-09-14 0ee7bd812c0493ef82fa2cb8bdaf2da08aec88d0

#logo

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

@@ -115,13 +115,13 @@
            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(266);
                BasDevp basDevp = basDevpService.selectById(265);
                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 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){

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

@@ -44,7 +44,7 @@
            return;
        }
        for (WrkMast wrkMast : wrkMasts) {
            if (wrkMast.getIoType()==101 && (Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")) && wrkMast.getStaNo()!=148 && wrkMast.getStaNo()!=153){
            if (wrkMast.getIoType()==101 && (Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")) && wrkMast.getStaNo()!=145 && wrkMast.getStaNo()!=153){
                continue;
            }
            try{