From 8d7be82cab4b9b818d27e92de3e896f1cca10c47 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 29 Oct 2024 14:37:35 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E5=88=86=E5=88=87=E5=AD=90=E5=8D=B7?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mps/service/impl/SlitterPdaServiceImpl.java | 4 +++- .../wms/pda/st/service/impl/NbjPdaServiceImpl.java | 14 +++++++------- .../task_manage/tasks/nbj/SubRollDownAGVTask.java | 4 ++-- .../tasks/slitter/SlitterDownAGVTask.java | 6 +++--- .../src/main/java/org/nl/wms/util/TaskUtils.java | 10 ++++++++++ 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java index ee692b7bd..f712e8fc8 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java @@ -206,6 +206,7 @@ public class SlitterPdaServiceImpl implements SlitterPdaService { .map(PdmBiSlittingproductionplan::getContainer_name) .collect(Collectors.toList()); param.put("container", collect); + param.put("qzzs", qzzNo); param.put("config_code", "SlitterDownAGVTask"); param.put("device_code", device.getPoint_code()); param.put("create_mode", GeneralDefinition.PDA_CREATION); @@ -397,12 +398,13 @@ public class SlitterPdaServiceImpl implements SlitterPdaService { String pointCode = row.get(0).getPoint_code(); StIvtCutpointivt cutDevice = cutpointivtService.getPintByUpOrDownCode(pointCode, false); List plans = new ArrayList<>(); + int count = 1; for (CallShaftVo callShaftVo : row) { // 保存工单 PdmBiSlittingproductionplan plan = new PdmBiSlittingproductionplan(); plan.setWorkorder_id(IdUtil.getSnowflake(1,1).nextIdStr()); plan.setOrder_type("1"); - plan.setContainer_name("-"); + plan.setContainer_name(TaskUtils.createVirtualSubContainer("yyMMddHHmmss", cutDevice.getExt_code(), count++)); plan.setProduct_name("-"); plan.setDescription("-"); plan.setWare_house("-"); diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java index 049819e2d..294c593c7 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/st/service/impl/NbjPdaServiceImpl.java @@ -119,7 +119,7 @@ public class NbjPdaServiceImpl implements NbjPdaService { log.info("手持子卷下线，送到一楼 - {}", param); // point_code, vehicle_code, container_name String pointCode = param.getString("point_code"); - String containerName = param.getString("container_name"); +// String containerName = param.getString("container_name"); String vehicleCode = param.getString("vehicle_code"); // 校验任务 List schBaseTasks = taskService.checkHaveTask(pointCode); @@ -127,14 +127,14 @@ public class NbjPdaServiceImpl implements NbjPdaService { throw new BadRequestException("该点位已经创建过任务！"); } // 判断子卷是否存在 - PdmBiSlittingproductionplan plan = slittingproductionplanService.getByContainerName(containerName); - if (ObjectUtil.isEmpty(plan)) { - throw new BadRequestException("子卷[" + containerName + "]的分切计划不存在！"); - } +// PdmBiSlittingproductionplan plan = slittingproductionplanService.getByContainerName(containerName); +// if (ObjectUtil.isEmpty(plan)) { +// throw new BadRequestException("子卷[" + containerName + "]的分切计划不存在！"); +// } SchBasePoint startPoint = pointService.getById(pointCode); startPoint.setPoint_status("3"); // 子卷号 - startPoint.setMaterial_code(containerName); +// startPoint.setMaterial_code(containerName); startPoint.setVehicle_code(vehicleCode); setUpdateByPC(startPoint); pointService.updateById(startPoint); @@ -142,7 +142,7 @@ public class NbjPdaServiceImpl implements NbjPdaService { taskParam.put("device_code", pointCode); // 纸管编码 taskParam.put("vehicle_code", vehicleCode); - taskParam.put("container_name", containerName); +// taskParam.put("container_name", containerName); taskParam.put("config_code", "SubRollDownAGVTask"); taskParam.put("create_mode", GeneralDefinition.PDA_CREATION); subRollDownAGVTask.apply(taskParam); diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/nbj/SubRollDownAGVTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/nbj/SubRollDownAGVTask.java index c23e201aa..f9cd02b6b 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/nbj/SubRollDownAGVTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/nbj/SubRollDownAGVTask.java @@ -138,11 +138,11 @@ public class SubRollDownAGVTask extends AbstractTask { public void agvReleaseCompleted(SchBaseTask task) { JSONObject request = JSONObject.parseObject(task.getRequest_param()); if (request.getString("release_point").equals(task.getPoint_code2())) { - JSONObject requestObj = JSONObject.parseObject(task.getRequest_param()); +// JSONObject requestObj = JSONObject.parseObject(task.getRequest_param()); // 终点赋值 SchBasePoint endPoint = pointService.getById(task.getPoint_code2()); endPoint.setPoint_status("3"); - endPoint.setMaterial_code(requestObj.getString("container_name")); +// endPoint.setMaterial_code(requestObj.getString("container_name")); endPoint.setVehicle_code(task.getVehicle_code()); setUpdateByType(endPoint, TaskFinishedTypeEnum.AUTO_ACS); pointService.updateById(endPoint); diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java index bcdba9634..6ae8e920b 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java @@ -68,12 +68,12 @@ public class SlitterDownAGVTask extends AbstractTask { taskLock(task.getConfig_code(), () -> { // 分切下料，子卷信息在请求参数中 JSONObject requestObj = JSONObject.parseObject(task.getRequest_param()); - JSONArray container = requestObj.getJSONArray("container"); - List containerList = container.toJavaList(String.class); + JSONArray container = requestObj.getJSONArray("qzzs"); + List qzzList = container.toJavaList(String.class); // 获取分切计划，最多4个需要出站的任务 List currentPlans = slittingproductionplanService.list( new LambdaQueryWrapper() - .in(PdmBiSlittingproductionplan::getContainer_name, containerList) + .in(PdmBiSlittingproductionplan::getQzzno, qzzList) .eq(PdmBiSlittingproductionplan::getIs_delete, "0") .eq(PdmBiSlittingproductionplan::getStatus, "05")); if (currentPlans.size() == 0) { diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java index f1c6b1d2a..2541feff8 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java @@ -398,4 +398,14 @@ public class TaskUtils { public static String createVirtualContainer(String rollCode, String format, String pointCode) { return "R-" + pointCode + "-" + TaskUtils.getDateTime(format) + "-" + rollCode; } + /** + * 创建虚拟的子卷号 + * @param format 时间格式 + * @param pointCode 点位编码 + * @param count 计数 + * @return + */ + public static String createVirtualSubContainer(String format, String pointCode, int count) { + return "S-" + pointCode + "-" + TaskUtils.getDateTime(format) + "-" + count; + } }