From 5b7821af491863c2e09068baefe7037f21af99a8 Mon Sep 17 00:00:00 2001 From: ludj Date: Sat, 24 Dec 2022 16:57:48 +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 --- .../main/java/org/nl/wms/sch/tasks/OutTask.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java index 3d0bd62..542b5b3 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java @@ -158,10 +158,11 @@ public class OutTask extends AbstractAcsTask { jo.put("label_uuid", disObj.getString("label_uuid")); jo.put("area_type", "'03'"); // JSONObject structObj = WQL.getWO("QSCH_OUTTASK01").addParam("flag", "1").addParam("material_uuid", material_uuid).process().uniqueResult(0); - JSONObject structObj = StructFindUtil.getOutStruct(jo).getJSONObject(0); - if (ObjectUtil.isEmpty(structObj)) { + JSONArray outStruct = StructFindUtil.getOutStruct(jo); + if (ObjectUtil.isEmpty(outStruct)) { continue; } + JSONObject structObj = outStruct.getJSONObject(0); //更新分配表 String bill_uuid = ""; StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl(); @@ -268,7 +269,15 @@ public class OutTask extends AbstractAcsTask { if (StrUtil.isEmpty(task_uuid)) { throw new BadRequestException("任务id不能为空！"); } - JSONObject taskjo = WQLObject.getWQLObject("sch_base_task").query("task_uuid='" + task_uuid + "'").uniqueResult(0); + WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); + JSONObject taskjo = taskTab.query("task_uuid='" + task_uuid + "'").uniqueResult(0); + //确定终点 + if ("02".equals(taskjo.getString("task_status"))){ + taskjo.put("task_status","06"); + taskTab.update(taskjo); + return; + } + taskjo.optString("taskfinish_mode", "02"); this.updateTaskStatus(taskjo, TaskStatusEnum.FINISHED.getCode());