From 8d90833250abee5951572659e9a192f2487cd704 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 03 十一月 2025 09:30:52 +0800
Subject: [PATCH] 标准wms2.0
---
src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 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..f761770 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.OrderPakout;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.asrs.task.handler.AutoLocMoveHandler;
import com.zy.common.properties.SlaveWmsParameterProperties;
@@ -33,46 +35,47 @@
@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");
+ 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)){
+ OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatus();
+ if (!Cools.isEmpty(orderPakout)) {
// autoMoveService.selectList()
- }else {
- order = orderService.selectOrderMoveStatusInitial();
- if (Cools.isEmpty(order)){
+ } else {
+ 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");
+ 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 +84,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