From d0b13ade2616926520cd2889c604139e1a8808d5 Mon Sep 17 00:00:00 2001 From: yxFwq <1> Date: 星期二, 19 十一月 2024 15:40:46 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java index 6b2c4fe..cd795e6 100644 --- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java +++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java @@ -103,14 +103,17 @@ 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){ - bareBoardHandler.startYx(devNo,count); + RgvOneSign smallEmpty = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","smallEmpty")); + if (smallEmpty.getRgvOneSign()+wrkCount<13){ + bareBoardHandler.startYx(devNo,count); + } } } } } @Scheduled(cron = "0/3 * * * * ? ") - private void execute3(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦浜屾ゼ灏忔枡绠� 272 + private void execute3(){//鑷姩璋冪┖鏉垮嚭搴� 鐓滄槦浜屾ゼ澶ф枡绠� 272 if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){ Integer devNo = 272; Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard272")); @@ -137,7 +140,10 @@ 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){ - bareBoardHandler.startYx(devNo,count+5); + RgvOneSign bigEmpty = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","bigEmpty")); + if (bigEmpty.getRgvOneSign()+wrkCount<12){ + bareBoardHandler.startYx(devNo,count+5); + } } } } @@ -159,6 +165,7 @@ 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){ +// RgvOneSign sign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","鏃�")); bareBoardHandler.startYx(devNo,count); } } -- Gitblit v1.9.1