From 1d9c00b1fb1a8e6473fc8625470c7616866bb803 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 23 十月 2025 10:52:45 +0800 Subject: [PATCH] 13 --- src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java | 51 +++++++++++++++------------------------------------ 1 files changed, 15 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java index 1f11b63..692032b 100644 --- a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java +++ b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java @@ -2,7 +2,9 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; -import com.zy.asrs.entity.*; +import com.zy.asrs.entity.BasCrnp; +import com.zy.asrs.entity.OrderPakin; +import com.zy.asrs.entity.WrkMast; import com.zy.asrs.service.*; import com.zy.asrs.task.handler.AutoLocMoveHandler; import com.zy.common.properties.SlaveWmsParameterProperties; @@ -31,48 +33,25 @@ @Autowired private SlaveWmsParameterProperties slaveWmsParameterProperties; @Autowired - private OrderService orderService; - @Autowired - private OrderDetlService orderDetlService; - @Autowired private AutoMoveService autoMoveService; //瀹氭椂鍑哄簱 缁忓吀鍙屼几 - @Scheduled(cron = "0/3 * * * * ? ") - public void locToLocAutoLocMove(){ - if (slaveWmsParameterProperties.isAutoLocMoveBoolean()){ - Config config = configService.selectById("AutoLocMove"); - if (Cools.isEmpty(config) || config.getValue().equals("false")) { - return; - } - Order order = orderService.selectOrderMoveStatus(); - if (!Cools.isEmpty(order)){ -// autoMoveService.selectList() - }else { - order = orderService.selectOrderMoveStatusInitial(); - if (Cools.isEmpty(order)){ - return; - } - order.setMoveStatus(2); - orderService.updateById(order); - } - } - } + //瀹氭椂鍑哄簱 @Scheduled(cron = "0/3 * * * * ? ") - public void locToLoc11(){ - if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){ - Config config = configService.selectById("AutoLocMoveUnilateral"); + public void locToLoc11() { + if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()) { + Config config = configService.selectConfigByCode("AutoLocMoveUnilateral"); if (Cools.isEmpty(config) || config.getValue().equals("false")) { return; } int crnCount = basCrnpService.selectCount(new EntityWrapper<>()); - for (int crnNo = 1;crnNo < crnCount;crnNo++){ + for (int crnNo = 1; crnNo < crnCount; crnNo++) { WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo)); WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo)); - if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)){ - autoLocMoveHandler.start(crnNo,11); + if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)) { + autoLocMoveHandler.start(crnNo, 11); } } } @@ -81,21 +60,21 @@ //瀹氭椂鍏ュ簱 @Scheduled(cron = "0/3 * * * * ? ") public void locToLoc111() { - if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){ - Config config = configService.selectById("AutoLocMoveUnilateral"); + if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()) { + Config config = configService.selectConfigByCode("AutoLocMoveUnilateral"); if (Cools.isEmpty(config) || config.getValue().equals("false")) { return; } int crnCount = basCrnpService.selectCount(new EntityWrapper<>()); - for (int crnNo = 1;crnNo < crnCount;crnNo++){ + for (int crnNo = 1; crnNo < crnCount; crnNo++) { BasCrnp basCrnp = basCrnpService.selectById(crnNo); if (basCrnp == null) { continue; } WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo)); WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo)); - if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)){ - autoLocMoveHandler.start(crnNo,111); + if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)) { + autoLocMoveHandler.start(crnNo, 111); } } } -- Gitblit v1.9.1