From 6f01b51fc0770fda7787076caf0314be7a7f6656 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 27 六月 2025 10:58:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java | 72 ++++--------------------------------
1 files changed, 8 insertions(+), 64 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..7ec140f 100644
--- a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
@@ -1,10 +1,8 @@
package com.zy.asrs.task;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
-import com.zy.asrs.task.handler.AutoLocMoveHandler;
import com.zy.common.properties.SlaveWmsParameterProperties;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
@@ -17,87 +15,33 @@
@Component
public class AutoLocMoveScheduler {
-
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private WorkService workService;
- @Autowired
- private AutoLocMoveHandler autoLocMoveHandler;
- @Autowired
- private BasCrnpService basCrnpService;
@Autowired
private ConfigService configService;
@Autowired
private SlaveWmsParameterProperties slaveWmsParameterProperties;
@Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
- private AutoMoveService autoMoveService;
+ private OrderPakoutService orderPakoutService;
//瀹氭椂鍑哄簱 缁忓吀鍙屼几
@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);
}
}
}
- //瀹氭椂鍑哄簱
- @Scheduled(cron = "0/3 * * * * ? ")
- public void locToLoc11(){
- if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){
- Config config = configService.selectById("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.selectById("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