From f25bd904560faada2a00e93fbd8abab6be238f9c Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期二, 15 四月 2025 15:44:31 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 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..698e864 100644 --- a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java +++ b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java @@ -5,6 +5,7 @@ import com.zy.asrs.entity.*; import com.zy.asrs.service.*; import com.zy.asrs.task.handler.AutoLocMoveHandler; +import com.zy.asrs.utils.OrderInAndOutUtil; import com.zy.common.properties.SlaveWmsParameterProperties; import com.zy.system.entity.Config; import com.zy.system.service.ConfigService; @@ -33,6 +34,8 @@ @Autowired private OrderService orderService; @Autowired + private OrderPakoutService orderPakoutService; + @Autowired private OrderDetlService orderDetlService; @Autowired private AutoMoveService autoMoveService; @@ -41,20 +44,20 @@ @Scheduled(cron = "0/3 * * * * ? ") public void locToLocAutoLocMove(){ if (slaveWmsParameterProperties.isAutoLocMoveBoolean()){ - Config config = configService.selectById("AutoLocMove"); + Config config = configService.selectConfigByCode("AutoLocMove"); if (Cools.isEmpty(config) || config.getValue().equals("false")) { return; } - Order order = orderService.selectOrderMoveStatus(); - if (!Cools.isEmpty(order)){ + OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatus(); + if (!Cools.isEmpty(orderPakout)){ // autoMoveService.selectList() }else { - order = orderService.selectOrderMoveStatusInitial(); - if (Cools.isEmpty(order)){ + orderPakout = orderPakoutService.selectOrderMoveStatusInitial(); + if (Cools.isEmpty(orderPakout)){ return; } - order.setMoveStatus(2); - orderService.updateById(order); + orderPakout.setMoveStatus(2); + orderPakoutService.updateById(orderPakout); } } } @@ -63,7 +66,7 @@ @Scheduled(cron = "0/3 * * * * ? ") public void locToLoc11(){ if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){ - Config config = configService.selectById("AutoLocMoveUnilateral"); + Config config = configService.selectConfigByCode("AutoLocMoveUnilateral"); if (Cools.isEmpty(config) || config.getValue().equals("false")) { return; } @@ -82,7 +85,7 @@ @Scheduled(cron = "0/3 * * * * ? ") public void locToLoc111() { if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){ - Config config = configService.selectById("AutoLocMoveUnilateral"); + Config config = configService.selectConfigByCode("AutoLocMoveUnilateral"); if (Cools.isEmpty(config) || config.getValue().equals("false")) { return; } -- Gitblit v1.9.1