From 66e7b1a2c8e45c233f05bfb12e499c09f42da536 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 25 Jun 2025 18:05:22 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BA=8C=E6=9C=9F=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/TwoOutExceptionalTask.java | 48 +++++++++++++++++-- .../org/nl/b_lms/sch/tasks/TwoOutTask.java | 1 + .../impl/StIvtIostorinvOutServiceImpl.java | 7 +++ 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java index 1370ee266..ebef48d17 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java @@ -66,6 +66,38 @@ public class TwoOutExceptionalTask extends AbstractAcsTask { return resultList; } + @Override + public List addTask(String taskId) { + /* + * 下发给ACS时需要特殊处理 + */ + JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0' and task_id = '"+taskId+"'").getResultJSONArray(0); + + ArrayList resultList = new ArrayList<>(); + for (int i = 0; i < arr.size(); i++) { + JSONObject json = arr.getJSONObject(i); + + char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); + AcsTaskDto dto = AcsTaskDto.builder() + .ext_task_id(json.getString("task_id")) + .task_code(json.getString("task_code")) + .task_type(json.getString("acs_task_type")) + .start_device_code(json.getString("point_code1")) + .next_device_code(json.getString("point_code2")) + .vehicle_code(json.getString("vehicle_code2")) + .vehicle_code2(json.getString("vehicle_code")) + .priority(json.getString("priority")) + .class_type(json.getString("task_type")) + .route_plan_code(getRoutePlanCode(json.getString("point_code1"))) + .dtl_type(String.valueOf(dtl_type)) + .product_area(IOSEnum.PRODUCT_AREA.code("BLK")) + .remark(json.getString("remark")) + .build(); + resultList.add(dto); + } + return resultList; + } + @Override @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject taskObj, String status) { @@ -100,9 +132,12 @@ public class TwoOutExceptionalTask extends AbstractAcsTask { // 判断任务是否被标记 if (jsonTask.getString("is_auto_issue").equals(IOSEnum.IS_SEND.code("否"))) { // 创建出库任务 - JSONObject jsonDis = disTab.query("iostorinv_id = '" + jsonTask.getString("table_fk") + "' and struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0); + JSONObject jsonDis = disTab.query("iostorinv_id = '" + jsonTask.getString("car_no") + "' and struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0); - JSONObject jsonPoint = pointTab.query("region_id = '" + RegionTypeEnum.TWO_OUT01.getId() + "' and is_delete = '0' and is_used = '1'").uniqueResult(0); + JSONObject jsonArr = WQLObject.getWQLObject("st_ivt_structattr") + .query("struct_code = '" + jsonTask.getString("point_code2") + "'") + .uniqueResult(0); + JSONObject jsonPoint = pointTab.query("point_code = '" + IOSEnum.OUT_POINT.code(jsonArr.getString("row_num")) + "' and is_delete = '0' and is_used = '1'").uniqueResult(0); // 查询木箱对应的载具 JSONObject jsonVeExt = extTab.query("pcsn = '" + jsonTask.getString("vehicle_code") + "'") @@ -118,8 +153,12 @@ public class TwoOutExceptionalTask extends AbstractAcsTask { jsonTaskParam.put("vehicle_code", jsonTask.getString("vehicle_code")); jsonTaskParam.put("vehicle_code2", jsonVeExt.getString("storagevehicle_code")); jsonTaskParam.put("task_group_id", jsonDis.getString("task_id")); + jsonTaskParam.put("vehicle_type", jsonArr.getString("storagevehicle_type")); + jsonTaskParam.put("containerType", jsonArr.getString("storagevehicle_type")); jsonTaskParam.put("is_auto_issue", IOSEnum.IS_SEND.code("否")); - jsonTaskParam.put("table_fk", jsonTask.getString("table_fk")); + jsonTaskParam.put("request_param", jsonTaskParam); + jsonTaskParam.put("table_fk", jsonTask.getString("car_no")); + jsonTaskParam.put("remark", "异常移库任务完成自动创建出库任务!"); jsonTaskParam.put("sort_seq", Integer.parseInt(IOSEnum.ZDEPTH_STRUCT.code("浅"))); TwoOutTask twoOutTask = new TwoOutTask(); @@ -129,7 +168,7 @@ public class TwoOutExceptionalTask extends AbstractAcsTask { JSONObject param = new JSONObject(); param.put("task_id",task_id); param.put("point_id",jsonPoint.getString("point_id")); - disTab.update(param,"iostorinv_id = '"+jsonTask.getString("table_fk")+"' and struct_code = '"+jsonTask.getString("point_code1")+"'"); + disTab.update(param,"iostorinv_id = '"+jsonTask.getString("car_no")+"' and struct_code = '"+jsonTask.getString("point_code1")+"'"); } } @@ -192,6 +231,7 @@ public class TwoOutExceptionalTask extends AbstractAcsTask { json.put("point_code2", form.getString("next_device_code")); json.put("handle_class", this.getClass().getName()); json.put("table_fk", form.getString("table_fk")); + json.put("remark", form.getString("remark")); json.put("create_id", SecurityUtils.getCurrentUserId()); json.put("create_name", SecurityUtils.getCurrentUsername()); json.put("create_time", DateUtil.now()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java index 3ad577019..4e945d45b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java @@ -259,6 +259,7 @@ public class TwoOutTask extends AbstractAcsTask { json.put("create_id", currentUserId); json.put("create_name", currentUsername); json.put("create_time", DateUtil.now()); + json.put("remark", form.getString("remark")); json.put("acs_task_type", "7"); WQLObject.getWQLObject("SCH_BASE_Task").insert(json); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java index 5c235c592..cc930f682 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java @@ -1486,6 +1486,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl { @@ -1770,6 +1773,9 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl().lambda()