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 | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 44 insertions(+), 5 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 850bcbe..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(); @@ -109,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())); } }); @@ -188,7 +193,6 @@ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�"); } } - /*** * 鍏ュ簱浠诲姟---涓嬪彂鍏ュ簱浠诲姟 @@ -323,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