From a36d1d0f890e342743d79d0274c143502dbc7dc6 Mon Sep 17 00:00:00 2001 From: yxFwq <1> Date: 星期五, 09 八月 2024 16:18:19 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java index 03b9a2a..5f9243c 100644 --- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java +++ b/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,15 +110,15 @@ } @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(266); 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")); @@ -137,10 +137,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")); -- Gitblit v1.9.1