From 7b0ae22df506cfb0585515f52ddbaffc46671883 Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Tue, 1 Nov 2022 08:54:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/sch/service/impl/TaskServiceImpl.java | 20 ++++++++++++++----- .../callMaterial/YqxCallMaterialTask.java | 16 +++++---------- .../sendMaterial/GjxSendMaterialTask.java | 10 ++++++++-- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index 5283eaa..6158536 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -95,18 +95,21 @@ public class TaskServiceImpl implements TaskService { String point_code1 = taskObj.getString("point_code1"); if (ObjectUtil.isNotEmpty(point_code1)) { JSONObject point1 = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); - taskObj.put("point1_region_name", point1.getString("region_name")); + if (ObjectUtil.isNotEmpty(point1)) + taskObj.put("point1_region_name", point1.getString("region_name")); } String point_code2 = taskObj.getString("point_code2"); if (ObjectUtil.isNotEmpty(point_code2)) { JSONObject point2 = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); - taskObj.put("point2_region_name", point2.getString("region_name")); + if (ObjectUtil.isNotEmpty(point2)) + taskObj.put("point2_region_name", point2.getString("region_name")); } String point_code3 = taskObj.getString("point_code3"); if (ObjectUtil.isNotEmpty(point_code3)) { JSONObject point3 = pointTab.query("point_code = '" + point_code3 + "'").uniqueResult(0); - taskObj.put("point3_region_name", point3.getString("region_name")); + if (ObjectUtil.isNotEmpty(point3)) + taskObj.put("point3_region_name", point3.getString("region_name")); } res.add(taskObj); } @@ -127,8 +130,15 @@ public class TaskServiceImpl implements TaskService { Class clz = Class.forName(processing_class); Object obj = clz.newInstance(); // 调用每个任务类的method_name()强制结束方法 - Method m = obj.getClass().getMethod(method_name, String.class); - JSONObject result = (JSONObject) m.invoke(obj, task_id); + Method m; + JSONObject result; + if (method_name.equals("immediateNotifyAcs")) { // 立即下发不需要参数 + m = obj.getClass().getMethod(method_name); + result = (JSONObject) m.invoke(obj); + } else { + m = obj.getClass().getMethod(method_name, String.class); + result = (JSONObject) m.invoke(obj, task_id); + } if (ObjectUtil.isEmpty(result)) return; JSONArray arr = result.getJSONArray("errArr"); WQLObject wo = WQLObject.getWQLObject("sch_base_task"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java index be830eb..de47398 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java @@ -51,21 +51,12 @@ public class YqxCallMaterialTask extends AbstractAcsTask { if (StrUtil.equals(taskObj.getString("task_status"), TaskStatusEnum.FINISHED.getCode())) { throw new BadRequestException("已完成不能取消!"); } - String point_code2 = taskObj.getString("point_code2"); - String point_code3 = taskObj.getString("point_code3"); - //说明未二次申请过 - if (ObjectUtil.isEmpty(point_code3)) { - JSONObject json = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); - json.put("lock_type", "1"); - pointTab.update(json); - } taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); taskObj.put("remark", "已取消"); taskTab.update(taskObj); - // 点位解锁 并设置空位 + // 点位解锁 material_point.put("lock_type", "1"); - material_point.put("point_status", "1"); pointTab.update(material_point); } @@ -243,7 +234,7 @@ public class YqxCallMaterialTask extends AbstractAcsTask { if (ObjectUtil.isNotEmpty(taskObj)) this.updateTaskStatus(taskObj,"2"); else { - throw new BadRequestException("未找到该任务或者任务已完成"); + throw new BadRequestException("未找到该任务或者任务已完成!"); } } @@ -254,5 +245,8 @@ public class YqxCallMaterialTask extends AbstractAcsTask { JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); if (ObjectUtil.isNotEmpty(taskObj)) this.updateTaskStatus(taskObj,"0"); + else { + throw new BadRequestException("已完成不能取消!"); + } } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java index 5dd05a5..940e7d5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java @@ -112,7 +112,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask { regionIoObj.put("qty", requestObj.getString("qty")); regionIoObj.put("bill_status", "3"); regionIoObj.put("start_point_code", taskObj.getString("point_code1")); - regionIoObj.put("end_point_code", taskObj.getString("point_code3")); + regionIoObj.put("end_point_code", taskObj.getString("point_code2")); regionIoObj.put("create_mode", "2"); regionIoObj.put("pcsn", DateUtil.format(DateUtil.parse(DateUtil.today()), "yyyyMMdd")); regionIoObj.put("create_id", SecurityUtils.getCurrentUserId()); @@ -347,7 +347,13 @@ public class GjxSendMaterialTask extends AbstractAcsTask { @Override public void cancel(String task_id) { - + WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); + JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); + if (ObjectUtil.isNotEmpty(taskObj)) { + this.updateTaskStatus(taskObj, "0"); + } else { + throw new BadRequestException("已完成不能取消!"); + } } //TODO 暂时不用二次申请