From ebe2da6e4eefd59b366ebab3a651b32763b580ed Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期日, 22 六月 2025 14:23:56 +0800 Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java | 8 ++------ 1 files changed, 2 insertions(+), 6 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 160cd0b..3b63449 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 @@ -109,9 +109,6 @@ } } catch (Exception ex) { log.error(ex.getMessage()); - } finally { - //濡傛灉寮傚父淇敼绂佺敤鐘舵�� - taskService.update(new LambdaUpdateWrapper<Task>().set(Task::getStatus, 0).eq(Task::getId, task.getId())); } }); @@ -120,8 +117,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 +185,6 @@ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�"); } } - /*** * 鍏ュ簱浠诲姟---涓嬪彂鍏ュ簱浠诲姟 -- Gitblit v1.9.1