diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index 10206ada..bea9dab1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -206,7 +206,7 @@ public class TaskServiceImpl implements TaskService { JSONArray cancel = new JSONArray(); JSONObject res2 = new JSONObject(); res2.put("task_id", task_id); - res2.put("task_status", "1"); + res2.put("task_status", "3"); cancel.add(res2); acsToWmsService.receiveTaskStatusAcs(JSON.toJSONString(cancel)); break; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SpeMachineryTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SpeMachineryTask.java index 9b697de1..f23c26c8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SpeMachineryTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SpeMachineryTask.java @@ -40,7 +40,7 @@ public class SpeMachineryTask extends AbstractAcsTask { WQLObject taskTable = WQLObject.getWQLObject("sch_base_task"); log.info(InterfaceLogType.ACS_TO_LMS.getDesc()); // 指令执行中 - JSONObject task = taskTable.query("task_id = '" + param.getString("taskId") + "'").uniqueResult(0); + JSONObject task = taskTable.query("task_id = '" + param.getString("task_id") + "'").uniqueResult(0); AcsTaskEnum taskType = AcsTaskEnum.getType(task.getString("task_type"),"TASK_"); try { SpeHandles.get(taskType.name()).handle(param,status,task);