diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java index c0c01fbb..981b90b7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/PlotterCallEmptyTask.java @@ -139,7 +139,8 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { try { pointConfirm(task); JSONArray data = new JSONArray(); - data.add(task); + JSONObject result = taskTab.query("task_id = '" + taskdtl_id + "'").uniqueResult(0); + data.add(result); // 下发 wms.issueTaskToAcs(data); } catch (Exception ex) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java index 669418ca..a4304681 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/WrapCallMaterialTask.java @@ -135,7 +135,8 @@ public class WrapCallMaterialTask extends AbstractAcsTask { try { pointConfirm(task); JSONArray data = new JSONArray(); - data.add(task); + JSONObject result = taskTab.query("task_id = '" + taskdtl_id + "'").uniqueResult(0); + data.add(result); // 下发 wms.issueTaskToAcs(data); } catch (Exception ex) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java index 31d96a38..315f1f6d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/WrapSendEmptyTask.java @@ -62,7 +62,6 @@ public class WrapSendEmptyTask extends AbstractAcsTask { pointObj.put("point_status", StatusEnum.POINT_STATUS_EMPTY_VEHICLE.getCode()); pointObj.put("update_time", DateUtil.now()); pointTab.update(pointObj); - // todo: 是否需要载具类型 } // 2任务完成 taskObj.put("task_status", StatusEnum.TASK_FINISH.getCode()); @@ -136,7 +135,8 @@ public class WrapSendEmptyTask extends AbstractAcsTask { try { pointConfirm(task); JSONArray data = new JSONArray(); - data.add(task); + JSONObject result = taskTab.query("task_id = '" + taskdtl_id + "'").uniqueResult(0); + data.add(result); // 下发 wms.issueTaskToAcs(data); } catch (Exception ex) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java index a302d1c8..2ad02ff9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/PlotterSendMaterialTask.java @@ -139,7 +139,8 @@ public class PlotterSendMaterialTask extends AbstractAcsTask { try { pointConfirm(task); JSONArray data = new JSONArray(); - data.add(task); + JSONObject result = taskTab.query("task_id = '" + taskdtl_id + "'").uniqueResult(0); + data.add(result); // 下发 wms.issueTaskToAcs(data); } catch (Exception ex) {