diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls
index 25f8c21a2..2c150d92a 100644
Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls differ
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AUTOQUERYBILLINFO.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AUTOQUERYBILLINFO.wql
index a786972e4..46f424faa 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AUTOQUERYBILLINFO.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AUTOQUERYBILLINFO.wql
@@ -174,6 +174,7 @@
           WHERE
           	mst.is_delete = '0'
           	AND mst.io_type = '0'
+          	AND mst.bill_type = '0001'
           	AND mst.bill_status = '99'
           	AND mst.biz_date = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
 
@@ -195,6 +196,7 @@
           WHERE
           	mst.is_delete = '0'
           	AND mst.io_type = '1'
+          	AND mst.bill_type in ('1001','1004')
           	AND mst.bill_status = '99'
           	AND mst.biz_date = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
 
@@ -216,6 +218,7 @@
           WHERE
           	mst.is_delete = '0'
           	AND mst.io_type = '0'
+          	AND mst.bill_type = '0001'
           	AND mst.bill_status = '99'
           	AND MONTH(mst.biz_date) = MONTH(CURDATE())
             AND YEAR(mst.biz_date) = YEAR(CURDATE())
@@ -238,6 +241,7 @@
           WHERE
           	mst.is_delete = '0'
           	AND mst.io_type = '1'
+          	AND mst.bill_type in ('1001','1004')
           	AND mst.bill_status = '99'
           	AND MONTH(mst.biz_date) = MONTH(CURDATE())
             AND YEAR(mst.biz_date) = YEAR(CURDATE())
@@ -260,6 +264,7 @@
           WHERE
           	mst.is_delete = '0'
           	AND mst.io_type = '0'
+          	AND mst.bill_type = '0001'
           	AND mst.bill_status = '99'
     	    AND mst.biz_date = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
 
@@ -281,6 +286,7 @@
           WHERE
           	mst.is_delete = '0'
           	AND mst.io_type = '1'
+          	AND mst.bill_type in ('1001','1004')
           	AND mst.bill_status = '99'
     	    AND mst.biz_date = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
 
@@ -303,6 +309,7 @@
           WHERE
           	mst.is_delete = '0'
           	AND mst.io_type = '0'
+          	AND mst.bill_type = '0001'
           	AND mst.bill_status = '99'
     	    AND mst.biz_date = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
 
@@ -325,6 +332,7 @@
           WHERE
           	mst.is_delete = '0'
           	AND mst.io_type = '1'
+          	AND mst.bill_type in ('1001','1004')
           	AND mst.bill_status = '99'
     	    AND mst.biz_date = DATE_SUB(CURDATE(), INTERVAL 1 DAY)
 
@@ -346,6 +354,7 @@
           WHERE
           	mst.is_delete = '0'
           	AND mst.io_type = '0'
+          	AND mst.bill_type = '0001'
           	AND mst.bill_status = '99'
     	    AND MONTH(mst.biz_date) = MONTH(CURDATE())
             AND YEAR(mst.biz_date) = YEAR(CURDATE())
@@ -368,6 +377,7 @@
           WHERE
           	mst.is_delete = '0'
           	AND mst.io_type = '1'
+          	AND mst.bill_type in ('1001','1004')
           	AND mst.bill_status = '99'
     	    AND MONTH(mst.biz_date) = MONTH(CURDATE())
             AND YEAR(mst.biz_date) = YEAR(CURDATE())
@@ -391,6 +401,7 @@
           WHERE
           	mst.is_delete = '0'
           	AND mst.io_type = '0'
+          	AND mst.bill_type = '0001'
           	AND mst.bill_status = '99'
     	   	AND MONTH(mst.biz_date) = MONTH(CURDATE())
             AND YEAR(mst.biz_date) = YEAR(CURDATE())
@@ -414,6 +425,7 @@
           WHERE
           	mst.is_delete = '0'
           	AND mst.io_type = '1'
+          	AND mst.bill_type in ('1001','1004')
           	AND mst.bill_status = '99'
     	   	AND MONTH(mst.biz_date) = MONTH(CURDATE())
             AND YEAR(mst.biz_date) = YEAR(CURDATE())
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java
index d25b86208..2d187f54f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryProudDayData.java
@@ -15,7 +15,8 @@ import org.nl.system.service.param.impl.SysParamServiceImpl;
 import org.nl.wms.ext.mes.service.LmsToMesService;
 import org.springframework.stereotype.Component;
 
-import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -154,19 +155,33 @@ public class AutoQueryProudDayData {
         // 2.数据
         JSONArray Arrayobject2 = new JSONArray();
 
+        String[] splitB = custB.split(",");
+        ArrayList<String> bList = new ArrayList<>(Arrays.asList(splitB));
+        String collectB1 = String.join("','", bList);
+
+        String[] splitC = custC.split(",");
+        ArrayList<String> cList = new ArrayList<>(Arrays.asList(splitC));
+        String collectC1 = String.join("','", cList);
+
+
+        String in_cust = custB + "," + custC;
+        String[] splitAll = in_cust.split(",");
+        ArrayList<String> aAndBList = new ArrayList<>(Arrays.asList(splitAll));
+        String collectAll = String.join("','", aAndBList);
+
         // B库存集合
         List<JSONObject> custIvtBList = WQL.getWO("AUTOQUERYBILLINFO").addParam("flag", "5")
-                .addParam("customer_name", "('10000708','10000698','10000779','10000561')")
+                .addParam("customer_name", "('"+collectB1+"')")
                 .process().getResultJSONArray(0).toJavaList(JSONObject.class);
 
         // C库存集合
         List<JSONObject> custIvtCList = WQL.getWO("AUTOQUERYBILLINFO").addParam("flag", "5")
-                .addParam("customer_name", "('10000426','2010')")
+                .addParam("customer_name", "('"+collectC1+"')")
                 .process().getResultJSONArray(0).toJavaList(JSONObject.class);
 
         // 其他库存集合
         List<JSONObject> custIvtOtherList = WQL.getWO("AUTOQUERYBILLINFO").addParam("flag", "6")
-                .addParam("customer_name", "('10000426','2010','10000708','10000698','10000779','10000561')")
+                .addParam("customer_name", "('"+collectAll+"')")
                 .process().getResultJSONArray(0).toJavaList(JSONObject.class);
 
         for (int i = 0; i < storArr.size(); i++) {
diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
index 792180257..fcda9738f 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
@@ -116,11 +116,11 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="母卷上料完成">
+              <el-form-item label="母卷上料">
                 <el-select
                   v-model="query.is_parent_ok"
                   clearable
-                  placeholder="母卷上料完成"
+                  placeholder="母卷上料"
                   class="filter-item"
                   @change="crud.toQuery"
                 >
@@ -134,11 +134,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="子卷套轴完成">
+              <el-form-item label="子卷套轴">
                 <el-select
                   v-model="query.is_child_tz_ok"
                   clearable
-                  placeholder="子卷套轴完成"
+                  placeholder="子卷套轴"
                   class="filter-item"
                   @change="crud.toQuery"
                 >
@@ -152,11 +152,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="子卷配送完成">
+              <el-form-item label="子卷配送">
                 <el-select
                   v-model="query.is_child_ps_ok"
                   clearable
-                  placeholder="子卷配送完成"
+                  placeholder="子卷配送"
                   class="filter-item"
                   @change="crud.toQuery"
                 >