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 | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 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 e0bb399..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杈撻�佺嚎娴佸姩
@@ -76,7 +83,8 @@
@Transactional(rollbackFor = Exception.class)
public void conveyorStart() {
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
- .eq(Task::getTaskSts, TaskStsType.WCS_CONTAINER_RECEIVE.id).eq(Task::getStatus, 1));
+ .eq(Task::getTaskSts, TaskStsType.WCS_CONTAINER_RECEIVE.id)
+ .eq(Task::getStatus, 1));
tasks.forEach(task -> {
try {
ConveyorStarParam conveyorStarParam = new ConveyorStarParam();
@@ -87,6 +95,7 @@
log.info("閫氱煡ESS杈撻�佺嚎娴佸姩璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", "http://192.168.2.200:9046/conveyor/moveContainer", JSONObject.toJSONString(conveyorStarParam));
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
HttpEntity httpEntity = new HttpEntity<>(conveyorStarParam, headers);
// 璋冪敤涓夋柟鎺ュ彛锛屽皢浠诲姟鎺ㄩ�佽嚦ESS骞冲彴
ResponseEntity<String> exchange = restTemplate.exchange("http://192.168.2.200:9046/conveyor/moveContainer", HttpMethod.POST, httpEntity, String.class);
@@ -108,9 +117,6 @@
}
} catch (Exception ex) {
log.error(ex.getMessage());
- } finally {
- //濡傛灉寮傚父淇敼绂佺敤鐘舵��
- // taskService.update(new LambdaUpdateWrapper<Task>().set(Task::getStatus, 0).eq(Task::getId, task.getId()));
}
});
@@ -119,8 +125,8 @@
/**
* 鐢熸垚鑷姩鐩樼偣浠诲姟
*/
- @Scheduled(cron = "0/50 * * * * ?")
- @Transactional(rollbackFor = Exception.class)
+// @Scheduled(cron = "0/50 * * * * ?")
+// @Transactional(rollbackFor = Exception.class)
public void genCheckTask() {
Loc locs = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocStsId, LocStsType.F.val()).orderByAsc(Loc::getLocNo).last("limit 1"));
if (Objects.isNull(locs)) {
@@ -188,7 +194,6 @@
}
}
-
/***
* 鍏ュ簱浠诲姟---涓嬪彂鍏ュ簱浠诲姟
* 姣忛殧3绉掞紝鍒锋柊褰撳墠閫氱煡妗ｅ垪琛紝涓嬪彂寰呭叆搴撹鍗曡嚦ESS
@@ -237,6 +242,7 @@
log.info("涓嬪彂鍏ュ簱浠诲姟璇锋眰鍦板潃锛歿}锛岃姹傚弬鏁帮細{}", "http://192.168.2.200:9046/task/create", JSONObject.toJSONString(tasksParam));
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
+ headers.add("api-version", "v2.0");
HttpEntity httpEntity = new HttpEntity<>(tasksParam, headers);
// 璇锋眰
ResponseEntity<String> exchange = restTemplate.exchange("http://192.168.2.200:9046/task/create", HttpMethod.POST, httpEntity, String.class);
@@ -321,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 鍑哄簱浠诲姟鍒嗕袱绉嶏細
--
Gitblit v1.9.1