fix：对接位分配查询优化

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

@@ -356,10 +356,10 @@ public class FeedingServiceImpl implements FeedingService {
                         break;
                 }
                 JSONObject map = new JSONObject();
-                map.put("flag", "1");
+                map.put("flag", "4");
                 map.put("reging_id", reging_id);
                 map.put("point_location", cool_jo.getString("point_location"));
-                //只找出箱点位
+                //只找入箱点位
                 map.put("point_type", "5");
 
                 JSONObject pointArr = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0);

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

@@ -299,13 +299,14 @@
                 	AND IFNULL(po.material_code,'') = ''
                 	AND po.region_id = 输入.reging_id
                 	AND po.point_location = 输入.point_location
+                	AND po.point_type = 输入.point_type
                 	AND NOT EXISTS (
                 	SELECT
                 		*
                 	FROM
                 		sch_base_task
                 	WHERE
-                		( point_code2 = point_code OR point_code4 = point_code )
+                		(point_code1 = point_code OR point_code2 = point_code OR point_code4 = point_code )
                 		AND task_status < '07'
                 	AND is_delete = '0'
                 	)

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java

@@ -92,6 +92,11 @@ public class PointDto implements Serializable {
      */
     private String vehicle_code;
 
+    /**
+     * 载具编码
+     */
+    private String material_code;
+
     /**
      * 载具数量
      */