From a49cdaa669f18d92e8fef5d84da536c0465670db Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 17 十二月 2025 21:21:07 +0800
Subject: [PATCH] 1.新增组托入库生成AGV搬运任务，执行AGV搬运任务时判断堆垛机接驳站点是否有空料架，有的话需要进行搬离（没有出库任务的情况下） 2.完善配盘出库单agv目标地点，可能是区域也可能是站点 Q为区域；Z为站点 3.完善立库入库找规则方法
---
src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java | 129 ++++++++++++++++++++++---------------------
1 files changed, 66 insertions(+), 63 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
index d90a3a3..bacfd9b 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,71 +34,73 @@
@Autowired
private OrderService orderService;
@Autowired
+ private OrderPakoutService orderPakoutService;
+ @Autowired
private OrderDetlService orderDetlService;
@Autowired
private AutoMoveService autoMoveService;
- //瀹氭椂鍑哄簱 缁忓吀鍙屼几
- @Scheduled(cron = "0/3 * * * * ? ")
- public void locToLocAutoLocMove(){
- if (slaveWmsParameterProperties.isAutoLocMoveBoolean()){
- Config config = configService.selectConfigByCode("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.selectConfigByCode("AutoLocMoveUnilateral");
- if (Cools.isEmpty(config) || config.getValue().equals("false")) {
- return;
- }
- int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
- 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);
- }
- }
- }
- }
-
- //瀹氭椂鍏ュ簱
- @Scheduled(cron = "0/3 * * * * ? ")
- public void locToLoc111() {
- 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++){
- 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);
- }
- }
- }
- }
+// //瀹氭椂鍑哄簱 缁忓吀鍙屼几
+// @Scheduled(cron = "0/3 * * * * ? ")
+// public void locToLocAutoLocMove(){
+// if (slaveWmsParameterProperties.isAutoLocMoveBoolean()){
+// Config config = configService.selectConfigByCode("AutoLocMove");
+// if (Cools.isEmpty(config) || config.getValue().equals("false")) {
+// return;
+// }
+// OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatus();
+// if (!Cools.isEmpty(orderPakout)){
+//// autoMoveService.selectList()
+// }else {
+// orderPakout = orderPakoutService.selectOrderMoveStatusInitial();
+// if (Cools.isEmpty(orderPakout)){
+// return;
+// }
+// orderPakout.setMoveStatus(2);
+// orderPakoutService.updateById(orderPakout);
+// }
+// }
+// }
+//
+// //瀹氭椂鍑哄簱
+// @Scheduled(cron = "0/3 * * * * ? ")
+// 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++){
+// 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);
+// }
+// }
+// }
+// }
+//
+// //瀹氭椂鍏ュ簱
+// @Scheduled(cron = "0/3 * * * * ? ")
+// public void locToLoc111() {
+// 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++){
+// 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);
+// }
+// }
+// }
+// }
}
--
Gitblit v1.9.1