修改

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/InServiceImpl.java

@@ -59,7 +59,6 @@ public class InServiceImpl implements InService {
             throw new BadRequestException("未查询到对应的分切机！");
         }
 
-
         JSONObject jo = new JSONObject();
         jo.put("point_code1",cut_row.getString("point_code"));
         jo.put("point_code2","point_code");
@@ -67,8 +66,6 @@ public class InServiceImpl implements InService {
         jo.put("task_type","010405");
         cutTrussTask.createTask(jo);
 
-
-
         JSONObject result = new JSONObject();
         result.put("message", "操作成功!");
         return result;
@@ -76,7 +73,18 @@ public class InServiceImpl implements InService {
 
     @Override
     public JSONObject devicePointQuery(JSONObject whereJson) {
-        return null;
+        String device_code = whereJson.getString("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);
+
+        JSONObject result = new JSONObject();
+        result.put("data", rows);
+        result.put("message", "操作成功!");
+        return result;
     }
 
 

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql

@@ -215,10 +215,29 @@
             OPTION 输入.product_area <> ""
                 del.product_area = 输入.product_area
             ENDOPTION
-            OPTION 输入.product_area <> ""
+            OPTION 输入.device_code <> ""
                 cut.point_code = 输入.device_code
             ENDOPTION
             ENDSELECT
         ENDQUERY
     ENDIF
 
+    IF 输入.flag = "8"
+        QUERY
+            SELECT
+            	up_point_code AS VALUE,
+            	CONCAT( point_code, '上轴位' ) AS text
+            FROM
+            	st_ivt_cutpointivt cut
+            WHERE
+                cut.point_code = 输入.device_code
+            UNION
+
+            SELECT
+            	down_point_code AS VALUE,
+            	CONCAT( point_code, '下轴位' ) AS text
+            FROM
+            	st_ivt_cutpointivt cut
+            WHERE
+                cut.point_code = 输入.device_code
+

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql

@@ -173,3 +173,5 @@
 			ENDSELECT
 		ENDQUERY
 	ENDIF
+
+

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InbillServiceImpl.java

@@ -49,7 +49,7 @@ public class InbillServiceImpl {
                 break;
             case "2":
                 //解锁终点,绑定载具
-                String vehicle_code = form.getString("box_no");
+                String vehicle_code = form.getString("vehicle_code");
                 map.put("lock_type", "1");
                 map.put("point_status", "02");
                 map.put("vehicle_code", vehicle_code);