From 03a0315b1281a3768b545017031458770c60a5b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?=
 <zhangjiangwei2000@outlook.com>
Date: Thu, 24 Nov 2022 10:14:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/pda/service/impl/PdaServiceImpl.java  | 22 ++++++++++++++-----
 .../src/main/java/org/nl/wms/pda/wql/PDA.wql  | 11 +++++++++-
 2 files changed, 26 insertions(+), 7 deletions(-)

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