代码更新

lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/rest/CallMaterialController.java

@@ -27,6 +27,7 @@ public class CallMaterialController {
     @PostMapping("/queryPoint")
     @Log("查询区域点位")
     @ApiOperation("查询区域点位")
+    @SaIgnore
     public ResponseEntity<Object> queryPoint() {
         return new ResponseEntity<>(callMaterialService.queryPoint(), HttpStatus.OK);
     }
@@ -34,6 +35,7 @@ public class CallMaterialController {
     @PostMapping("/confirm")
     @Log("叫料确定")
     @ApiOperation("叫料确定")
+    @SaIgnore
     public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(callMaterialService.confirm(whereJson), HttpStatus.OK);
     }

lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/rest/CallVehicleController.java

@@ -28,6 +28,7 @@ public class CallVehicleController {
     @PostMapping("/queryPoint")
     @Log("查询区域点位")
     @ApiOperation("查询区域点位")
+    @SaIgnore
     public ResponseEntity<Object> queryPoint() {
         return new ResponseEntity<>(callVehicleService.queryPoint(), HttpStatus.OK);
     }
@@ -35,6 +36,7 @@ public class CallVehicleController {
     @PostMapping("/confirm")
     @Log("呼叫空托盘确定")
     @ApiOperation("呼叫空托盘确定")
+    @SaIgnore
     public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(callVehicleService.confirm(whereJson), HttpStatus.OK);
     }

lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/rest/SendMaterialController.java

@@ -27,6 +27,7 @@ public class SendMaterialController {
     @PostMapping("/queryPoint")
     @Log("查询区域点位")
     @ApiOperation("查询区域点位")
+    @SaIgnore
     public ResponseEntity<Object> queryPoint() {
         return new ResponseEntity<>(sendMaterialService.queryPoint(), HttpStatus.OK);
     }
@@ -34,6 +35,7 @@ public class SendMaterialController {
     @PostMapping("/confirm")
     @Log("送料确定")
     @ApiOperation("送料确定")
+    @SaIgnore
     public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(sendMaterialService.confirm(whereJson), HttpStatus.OK);
     }

lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/service/impl/SendMaterialServiceImpl.java

@@ -29,7 +29,7 @@ public class SendMaterialServiceImpl implements SendMaterialService {
         JSONObject resultJson = new JSONObject();
         for (int i = 0; i < regionArr.size(); i++) {
             JSONObject jsonRegion = regionArr.getJSONObject(i);
-            JSONArray pointArr = WQL.getWO("PDA_SENDMATERIAL_01").addParam("flag", "2").addParam("region_id", jsonRegion.getString("region_id")).process().getResultJSONArray(0);
+            JSONArray pointArr = WQL.getWO("PDA_SENDMATERIAL_01").addParam("flag", "2").addParam("region_code", jsonRegion.getString("region_code")).process().getResultJSONArray(0);
             jsonRegion.put("pointArr", pointArr);
         }
         resultJson.put("regionja", regionArr);
@@ -43,7 +43,7 @@ public class SendMaterialServiceImpl implements SendMaterialService {
     @Transactional(rollbackFor = Exception.class)
     public JSONObject confirm(JSONObject whereJson) {
         JSONObject result = new JSONObject();
-        // 1、准备参数：point_code、type：2为共挤区域，8为豪凯区域
+        // 1、准备参数：point_code、type：2为共挤区域，8为豪凯区域,7为油漆线满料
         JSONObject param = new JSONObject();
 
         String region_id = whereJson.getString("region_id");
@@ -51,6 +51,7 @@ public class SendMaterialServiceImpl implements SendMaterialService {
         String region_code = jsonObject.getString("region_code");
         if (StrUtil.equals(region_code, "GJQY01")) param.put("type", "2");
         if (StrUtil.equals(region_code, "HKQY01")) param.put("type", "8");
+        if (StrUtil.equals(region_code, "YQQY01")) param.put("type", "7");
 
         param.put("point_code", whereJson.getString("point_code"));
         param.put("material_num", whereJson.getString("qty"));

lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/wql/PDA_SENDMATERIAL_01.wql

@@ -15,6 +15,7 @@
 	#################################################
 	输入.flag					                 TYPEAS s_string
 	输入.region_id					             TYPEAS s_string
+	输入.region_code					             TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -47,7 +48,7 @@
                 FROM
                     sch_base_region
                 WHERE
-                   region_code in ('HKQY01','GJQY01')
+                   region_code in ('HKQY01','GJQY01','YQQY01')
 
 			ENDSELECT
 		ENDQUERY
@@ -64,11 +65,17 @@
                 WHERE
                     is_used = '1'
                     AND is_delete = '0'
-                    AND point_type = '3'
+                OPTION 输入.region_code = "YQQY01"
-
+                   point_type = '4'
-                OPTION 输入.region_id <> ""
-                    region_id = 输入.region_id
                 ENDOPTION
+                OPTION 输入.region_code <> "YQQY01"
+                   point_type = '3'
+                ENDOPTION
+
+                OPTION 输入.region_code <> ""
+                        region_code = 输入.region_code
+                ENDOPTION
+
 
 			ENDSELECT
 		ENDQUERY

lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/rest/SendVehicleController.java

@@ -29,6 +29,7 @@ public class SendVehicleController {
     @PostMapping("/queryPoint")
     @Log("查询区域点位")
     @ApiOperation("查询区域点位")
+    @SaIgnore
     public ResponseEntity<Object> queryPoint() {
         return new ResponseEntity<>(sendVehicleService.queryPoint(), HttpStatus.OK);
     }
@@ -36,6 +37,7 @@ public class SendVehicleController {
     @PostMapping("/confirm")
     @Log("送空托盘确定")
     @ApiOperation("送空托盘确定")
+    @SaIgnore
     public ResponseEntity<Object> confirm(@RequestBody JSONObject whereJson) {
         return new ResponseEntity<>(sendVehicleService.confirm(whereJson), HttpStatus.OK);
     }