diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 4d24a98..5d376da 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -78,7 +78,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { try { Class clz = Class.forName(processing_class); Object obj = clz.newInstance(); - // 调用每个任务类的forceFinishInst()强制结束方法 + // 调用每个任务类的updateTaskStatus()强制结束方法 Method m = obj.getClass().getDeclaredMethod("updateTaskStatus", JSONObject.class, String.class); m.invoke(obj, row, status); } catch (InvocationTargetException e) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/UpdateTaskStatusEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/UpdateTaskStatusEnum.java index 0ab99ae..2b99f83 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/UpdateTaskStatusEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/UpdateTaskStatusEnum.java @@ -2,7 +2,7 @@ package org.nl.wms.sch.manage; /** * @author: lyd - * @description: 更新任务状态 + * @description: 更新任务状态:ACS回传任务时任务状态 * @Date: 2022/11/15 */ public enum UpdateTaskStatusEnum { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnSendMaterialTask.java index a9e3180..42a6d0f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnSendMaterialTask.java @@ -68,6 +68,7 @@ public class HnSendMaterialTask extends AbstractAcsTask { /** * @param task 代表一条任务对象 * @param status 代表wcs任务完成状态: //0:acs,取消,:执行中,2:完成 + * @see org.nl.wms.sch.manage.UpdateTaskStatusEnum * @return * @discription wcs请求wms任务完成状态反馈接口, 比如agv从a点往b点走。生成任务的时候绑定b的物料信息,任务完成的时候,清除a的物料信息 * @author ldjun @@ -229,7 +230,7 @@ public class HnSendMaterialTask extends AbstractAcsTask { JSONArray taskArr = taskTab.query("handle_class = '" + THIS_CLASS + "'and is_delete = '0' and task_status = '2'").getResultJSONArray(0); for (int i = 0; i < taskArr.size(); i++) { JSONObject taskObj = taskArr.getJSONObject(i); - String vehicle_type = taskObj.getString("vehicle_type"); + String vehicle_type = taskObj.getString("vehicle_type");//混碾载具类型新旧料? JSONObject param1 = new JSONObject(); param1.put("flag", "1"); param1.put("region_code", "KLHJ");