diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java
index 536938985..24a8d081e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java
@@ -200,7 +200,7 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService
         // 子卷号 是否计划外子卷 sap批次 制造完成日期 入库日期 状态
 
         JSONObject map = new JSONObject();
-        map.put("flag", "1");
+        map.put("flag", "4");
         if (ObjectUtil.isNotEmpty(material_code)) {
             map.put("material_code", "%" + material_code + "%");
         }
@@ -230,9 +230,8 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService
         map.put("date_of_production", date_of_production);
         map.put("date_of_FG_inbound", date_of_FG_inbound);
         map.put("status", status);
-
+        map.put("limits", "10000");
         JSONArray resultJSONArray = WQL.getWO("PDM_BI_SUBPACKAGER01").addParamMap(map).process().getResultJSONArray(0);
-
         List<Map<String, Object>> list = new ArrayList<>();
         for (int i = 0; i < resultJSONArray.size(); i++) {
             JSONObject json = resultJSONArray.getJSONObject(i);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql
index f6ed7ffec..fbd92e3ab 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SUBPACKAGER01.wql
@@ -20,6 +20,7 @@
 	输入.customer_name			            TYPEAS s_string
 	输入.customer_description			    TYPEAS s_string
 	输入.package_box_sn			            TYPEAS s_string
+	输入.limits			            TYPEAS f_string
 	输入.container_name			            TYPEAS s_string
 	输入.is_un_plan_production			            TYPEAS s_string
 	输入.sap_pcsn			            TYPEAS s_string
@@ -229,3 +230,64 @@
             ENDSELECT
         ENDPAGEQUERY
     ENDIF
+    IF 输入.flag = "4"
+            PAGEQUERY
+                SELECT
+                    *
+                FROM
+                    pdm_bi_subpackagerelation
+                WHERE
+                    1=1
+                    OPTION 输入.material_code <> ""
+                        product_name LIKE 输入.material_code
+                    ENDOPTION
+
+                    OPTION 输入.package_box_sn <> ""
+                        package_box_sn LIKE 输入.package_box_sn
+                    ENDOPTION
+
+                    OPTION 输入.material_name <> ""
+                        product_description LIKE 输入.material_name
+                    ENDOPTION
+
+                    OPTION 输入.sale_order_name <> ""
+                        sale_order_name LIKE 输入.sale_order_name
+                    ENDOPTION
+
+                    OPTION 输入.customer_name <> ""
+                        customer_name LIKE 输入.customer_name
+                    ENDOPTION
+
+                    OPTION 输入.customer_description <> ""
+                        customer_description LIKE 输入.customer_description
+                    ENDOPTION
+
+                    OPTION 输入.container_name <> ""
+                        container_name LIKE 输入.container_name
+                    ENDOPTION
+
+                    OPTION 输入.sap_pcsn <> ""
+                        sap_pcsn LIKE 输入.sap_pcsn
+                    ENDOPTION
+
+                    OPTION 输入.is_un_plan_production <> ""
+                        is_un_plan_production = 输入.is_un_plan_production
+                    ENDOPTION
+
+                    OPTION 输入.date_of_production <> ""
+                        date_of_production = 输入.date_of_production
+                    ENDOPTION
+
+                    OPTION 输入.date_of_FG_inbound <> ""
+                        date_of_FG_inbound = 输入.date_of_FG_inbound
+                    ENDOPTION
+
+                    OPTION 输入.status <> ""
+                        status = 输入.status
+                    ENDOPTION
+                    OPTION 输入.limits <> ""
+                       1=1 order by workorder_id desc limit 0,输入.limits
+                    ENDOPTION
+                ENDSELECT
+            ENDPAGEQUERY
+        ENDIF