From e451d53cd4a377a0107080a2b41b20f73c61fbc0 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 7 Mar 2024 18:18:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AA=91=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 9 +++------ .../task_manage/task/tasks/gtx/mapper/HCSSXMapper.xml | 4 ++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index aaa66a7..ca89726 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -777,10 +777,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { processTracking.setProcess_location(baseRequest.getDevice_code()); processTracking.setRecord_time(DateUtil.now()); processTrackingService.create(processTracking); - // update: 点位解锁 - SchBasePoint paramobj = new SchBasePoint(); - paramobj.setIng_task_code(""); - pointService.update(paramobj, new LambdaQueryWrapper().eq(SchBasePoint::getPoint_code, basePoint.getPoint_code())); + // delete: 点位解锁 return ApplyTaskResponse.responseOk(baseRequest.getRequestNo(), "扫码成功申请"); } @@ -983,7 +980,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { PointUtils.setUpdateByAcs(schBasePoint); pointService.updateById(schBasePoint); // hint: 特殊处理 -// specialOperation(schBasePoint); + specialOperation(schBasePoint); log.info("点位" + schBasePoint.getPoint_code() + "更新之后：{}", schBasePoint); } } finally { @@ -1008,7 +1005,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { PointUtils.setUpdateByAcs(endPointObj); pointService.update(endPointObj, new LambdaQueryWrapper() .eq(SchBasePoint::getPoint_code, "RYK01")); - log.info("入窑口02引发入窑口01点位更新解锁！"); + log.info("入窑口02引发入窑口01点位更新解锁！时间：{}", DateUtil.now()); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/gtx/mapper/HCSSXMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/gtx/mapper/HCSSXMapper.xml index bdfd3dc..d30c51d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/gtx/mapper/HCSSXMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/gtx/mapper/HCSSXMapper.xml @@ -7,8 +7,12 @@ p.* FROM `sch_base_point` p + LEFT JOIN sch_base_point p2 ON p2.point_code = p.parent_point_code WHERE p.point_type = '1' + AND p.point_status = '1' AND p.is_used = true + AND p2.point_status = '1' + AND p2.is_used = true AND (p.ing_task_code = '' OR p.ing_task_code IS NULL) AND 0 = (SELECT COUNT(*) FROM sch_base_task WHERE point_code2 = p.point_code AND task_status '5') AND p.region_code IN