From ccfbcdf2a2ee13a7575bb7bbd0cbf5311df2827b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 09 九月 2025 19:00:22 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java | 42 ++++++++++++++++++++++++++++++++++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java | 1 -
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java | 1 -
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 3 +--
4 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
index f0174de..5a2abdf 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
@@ -21,6 +21,7 @@
import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.asrs.service.impl.LocServiceImpl;
+import com.zy.asrs.wms.asrs.service.impl.OrderServiceImpl;
import com.zy.asrs.wms.utils.Utils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -68,6 +69,12 @@
private CacheSiteService cacheSiteService;
@Autowired
private OperationPortService operationPortService;
+ @Autowired
+ private WaveSeedService waveSeedService;
+ @Autowired
+ private MobileService mobileService;
+ @Autowired
+ private OrderService orderService;
/***
* 鍏ュ簱浠诲姟---閫氱煡ESS杈撻�佺嚎娴佸姩
@@ -320,6 +327,41 @@
}
+ /***
+ * @author Ryan
+ * @date 2025/9/9
+ * @description: 娣诲姞浜伅鍔ㄤ綔
+ * @version 1.0
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ @Transactional(rollbackFor = Exception.class)
+ public void holdLight() {
+ //鑾峰彇鎾涓殑鍑哄簱浠诲姟
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .ge(Task::getTaskType, TaskStsType.GENERATE_OUT.id)
+ .eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id));
+
+ for (Task task : tasks) {
+ //鑾峰彇缁戝畾鍦版爣鐨勬挱绉嶄俊鎭�
+ List<WaveSeed> seeds = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>()
+ .eq(WaveSeed::getTaskId, task.getId()));
+ if (seeds.isEmpty()) {
+ continue;
+ }
+ seeds.forEach(seed -> {
+ if (!Objects.isNull(seed.getSiteId())) {
+ Order order = orderService.getById(seed.getOrderId());
+ if (Objects.isNull(order)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ //缁戝畾鎴愬姛锛屾挱绉嶅浜伅
+ mobileService.sowLightMange(seed.getSiteNo(), order, "LIGHT");
+ }
+ });
+ }
+ }
+
+
/**
* 鍑哄簱浠诲姟--- 姣忛殧3绉掞紝鑾峰彇褰撳墠鍑哄簱浠诲姟鍒楄〃鐘舵�佷负GENERATE_OUT鐨勪换鍔★紝涓嬪彂浠诲姟鑷矱SS
* //TODO 鍑哄簱浠诲姟鍒嗕袱绉嶏細
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
index eb14276..e6a4fc8 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
@@ -235,7 +235,6 @@
if (!update) {
throw new CoolException("浠诲姟鏇存柊澶辫触锛侊紒");
}
-
}
});
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
index 17b0579..ddadca4 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
@@ -450,8 +450,7 @@
.set(WaveSeed::getSiteNo, siteNo.getSiteNo()))) {
throw new CoolException("鎾绔欑偣鏇存柊澶辫触锛侊紒");
}
- //缁戝畾鎴愬姛锛屾挱绉嶅浜伅
- sowLightMange(siteNo.getSiteNo(), order, "LIGHT");
+
} else {
if (StringUtil.isNullOrEmpty(siteNo.getOrderNo())) {
throw new CoolException("褰撳墠鎾绔欑偣鏈粦瀹氳鍗曪紒锛�");
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
index 53f4303..849c147 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
@@ -196,7 +196,6 @@
orderUtils.updateWorkQty(orderDetl.getId(), workQty, true);
-
WaveSeed waveSeed = new WaveSeed();
waveSeed.setOrderNo(orderDetl.getOrderNo());
waveSeed.setOrderId(orderDetl.getOrderId());
--
Gitblit v1.9.1