diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java index 1a3fa98..146d3e4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java @@ -47,12 +47,22 @@ public class PdaServiceImpl implements PdaService { @Override public JSONArray point(String regionId) { - JSONArray points = WQL - .getWO("PDA") - .addParam("flag", "2") - .addParam("region_id", regionId) - .process() - .getResultJSONArray(0); + JSONArray points; + if (regionId.equals("99")) { + points = WQL + .getWO("PDA") + .addParam("flag", "2") + .addParam("outbound", regionId) + .process() + .getResultJSONArray(0); + } else { + points = WQL + .getWO("PDA") + .addParam("flag", "2") + .addParam("region_id", regionId) + .process() + .getResultJSONArray(0); + } for (int i = 0; i < points.size(); i++) { JSONObject point = points.getJSONObject(i); if (StrUtil.equals(point.getString("lock_type"), LockType.TASK_LOCKED.getCode())) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA.wql index f74fe17..47f80ca 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA.wql @@ -15,6 +15,7 @@ ################################################# 输入.flag TYPEAS s_string 输入.region_id TYPEAS s_string + 输入.outbound TYPEAS s_string 输入.vehicle_code TYPEAS s_string 输入.material_code TYPEAS s_string @@ -61,7 +62,15 @@ FROM sch_base_point WHERE - region_id = 输入.region_id + is_used = '1' + OPTION 输入.region_id <> "" + region_id = 输入.region_id + ENDOPTION + OPTION 输入.outbound <> "" + point.point_id IN ( + 1586194025294204928, + 1586194091908141056) + ENDOPTION ENDSELECT ENDQUERY ENDIF