From 4d3d8aabca7c9b87687c7f75e5238a7f7be81568 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Wed, 2 Nov 2022 08:51:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/pda/mps/service/impl/InServiceImpl.java | 14 ++++++--------
 .../main/java/org/nl/wms/pda/mps/wql/PDA_02.wql    |  3 +++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java
index 65610a49d..6b7f443bf 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java
@@ -60,10 +60,10 @@ public class InServiceImpl implements InService {
         }
 
         JSONObject jo = new JSONObject();
-        jo.put("point_code1",cut_row.getString("point_code"));
-        jo.put("point_code2","point_code");
-        jo.put("vehicle_code",cut_row.getString("qzzno"));
-        jo.put("task_type","010405");
+        jo.put("point_code1", cut_row.getString("point_code"));
+        jo.put("point_code2", "point_code");
+        jo.put("vehicle_code", cut_row.getString("qzzno"));
+        jo.put("task_type", "010405");
         cutTrussTask.createTask(jo);
 
         JSONObject result = new JSONObject();
@@ -75,17 +75,15 @@ public class InServiceImpl implements InService {
     public JSONObject devicePointQuery(JSONObject whereJson) {
         String device_code = whereJson.getString("device_code");
 
-        if (StrUtil.isEmpty(device_code)){
+        if (StrUtil.isEmpty(device_code)) {
             throw new BadRequestException("输入的设备号不能为空！");
         }
 
-        JSONArray rows = WQL.getWO("PDA_02").addParam("flag","8").addParam("device_code",device_code).process().getResultJSONArray(0);
+        JSONArray rows = WQL.getWO("PDA_02").addParam("flag", "8").addParam("device_code", device_code).process().getResultJSONArray(0);
 
         JSONObject result = new JSONObject();
         result.put("data", rows);
         result.put("message", "操作成功!");
         return result;
     }
-
-
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql
index 504681b7a..0bbf524a3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql
@@ -240,4 +240,7 @@
             	st_ivt_cutpointivt cut
             WHERE
                 cut.point_code = 输入.device_code
+            ENDSELECT
+       ENDQUERY
+   ENDIF