diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/task/service/impl/HandTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/task/service/impl/HandTaskServiceImpl.java index 6ceb5b40..8473ade3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/task/service/impl/HandTaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/task/service/impl/HandTaskServiceImpl.java @@ -137,7 +137,13 @@ public class HandTaskServiceImpl implements HandTaskService { taskjo.put("taskdtl_id", taskdtl_id); taskjo.put("task_id", task_id); taskjo.put("task_code", task_code); - taskjo.put("acs_task_type", acs_task_type); + JSONObject start_point = WQLObject.getWQLObject("sch_base_point").query("point_code = '"+start_point_code+"'").uniqueResult(0); + JSONObject next_point = WQLObject.getWQLObject("sch_base_point").query("point_code = '"+next_point_code+"'").uniqueResult(0); + if (start_point.getString("area_type").equals("30")||next_point.getString("area_type").equals("30")){ + taskjo.put("acs_task_type", "3"); + }else { + taskjo.put("acs_task_type", acs_task_type); + } //其他 taskjo.put("task_type", "11"); //点对点 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls index 9eb4cc89..8b45bc7d 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/wql/sch.xls differ