From af7b9db27bf72c92108329815ec771fb46e5b877 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 31 十月 2025 16:09:20 +0800
Subject: [PATCH] Merge branch 'jsxswms' into integrationWms
---
src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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..d45fce2 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,28 +34,29 @@
@Autowired
private OrderService orderService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderPakoutService orderPakoutService;
@Autowired
- private AutoMoveService autoMoveService;
+ private OrderDetlService orderDetlService;
+
//瀹氭椂鍑哄簱 缁忓吀鍙屼几
@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 +65,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 +84,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