From b50154e59c5db0e686da57275d1810338a32d769 Mon Sep 17 00:00:00 2001 From: yxFwq <1> Date: 星期一, 25 十一月 2024 22:26:35 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 66 +++++++++++++++++---------------- 1 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java index cd795e6..d901198 100644 --- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java +++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java @@ -93,18 +93,19 @@ 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(160); - if (basDevp.getLoading().equals("Y") - || !basDevp.getAutoing().equals("Y") - || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){ - return; - } +// BasDevp basDevp = basDevpService.selectById(160); +// 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)); - if (loadIngCount+wrkCount<count){ + int count = 12; + int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devNo).eq("wrk_sts",11L)); + int wrkCount12 = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devNo).eq("wrk_sts",12L)); + if (loadIngCount+wrkCount+wrkCount12<count){ RgvOneSign smallEmpty = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","smallEmpty")); - if (smallEmpty.getRgvOneSign()+wrkCount<13){ + if (smallEmpty.getRgvOneSign()+wrkCount+wrkCount12<13){ bareBoardHandler.startYx(devNo,count); } } @@ -118,30 +119,31 @@ 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(265); - if (basDevp.getLoading().equals("Y") - || !basDevp.getAutoing().equals("Y") - || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){ - return; - } - 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; - } +// BasDevp basDevp = basDevpService.selectById(265); +// if (basDevp.getLoading().equals("Y") +// || !basDevp.getAutoing().equals("Y") +// || (!Cools.isEmpty(basDevp.getWrkNo()) && basDevp.getWrkNo()!=0) ){ +// return; +// } +// 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){ + int count = 7; + int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devNo).eq("wrk_sts",11L)); + int wrkCount12 = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", devNo).eq("wrk_sts",12L)); + if (loadIngCount+wrkCount+wrkCount12<count){ RgvOneSign bigEmpty = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","bigEmpty")); - if (bigEmpty.getRgvOneSign()+wrkCount<12){ + if (bigEmpty.getRgvOneSign()+wrkCount+wrkCount12<count+5){ bareBoardHandler.startYx(devNo,count+5); } } -- Gitblit v1.9.1