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 1eb0f7d84..536938985 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
@@ -25,10 +25,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 /**
  * @author lyd
@@ -99,9 +98,11 @@ 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);
-
-
-        JSONObject json = WQL.getWO("PDM_BI_SUBPACKAGER01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC");
+        JSONObject json = WQL.getWO("PDM_BI_SUBPACKAGER01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page),"workorder_id desc");
+        JSONArray content = json.getJSONArray("content");
+        String ids = content.stream().map(a -> ((JSONObject) a).getString("workorder_id")).collect(Collectors.joining("','"));
+        JSONArray subs = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("workorder_id in ('" + ids + "')").getResultJSONArray(0);
+        json.put("content",subs);
         return json;
     }
 
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 7a17406cc..f6ed7ffec 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
@@ -52,7 +52,7 @@
 	IF 输入.flag = "1"
         PAGEQUERY
             SELECT
-                *
+                workorder_id
             FROM
                 pdm_bi_subpackagerelation
             WHERE
@@ -105,7 +105,6 @@
                 OPTION 输入.status <> ""
                     status = 输入.status
                 ENDOPTION
-
             ENDSELECT
         ENDPAGEQUERY
     ENDIF
@@ -113,7 +112,7 @@
 	IF 输入.flag = "2"
         PAGEQUERY
             SELECT DISTINCT
-                sub.*
+                sub.workorder_id
             FROM
                 pdm_bi_subpackagerelation sub
                 INNER JOIN pdm_bi_subpackagerelationrecord record ON sub.container_name = record.container_name
@@ -167,7 +166,6 @@
                 OPTION 输入.status <> ""
                     sub.status = 输入.status
                 ENDOPTION
-
             ENDSELECT
         ENDPAGEQUERY
     ENDIF
@@ -175,13 +173,12 @@
 	IF 输入.flag = "3"
         PAGEQUERY
             SELECT
-                sub.*
+                sub.workorder_id
             FROM
                 pdm_bi_subpackagerelation sub
                 LEFT JOIN pdm_bi_subpackagerelationrecord record ON sub.container_name = record.container_name
             WHERE
-                IFNULL(record.bill_code,'') = ''
-
+                record.bill_code is null
                 OPTION 输入.material_code <> ""
                     sub.product_name LIKE 输入.material_code
                 ENDOPTION
@@ -229,7 +226,6 @@
                 OPTION 输入.status <> ""
                     sub.status = 输入.status
                 ENDOPTION
-
             ENDSELECT
         ENDPAGEQUERY
-    ENDIF
\ No newline at end of file
+    ENDIF