diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java
index b765ef736..4de91e752 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java
@@ -108,4 +108,13 @@ public class SubpackagerelationDto implements Serializable {
 
     /** sap批次 */
     private String sap_pcsn;
+
+    /** 长 */
+    private String box_length;
+
+    /** 宽 */
+    private String box_width;
+
+    /** 高 */
+    private String box_high;
 }
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 e25c12a09..3ce5cce05 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
@@ -46,6 +46,16 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService
         String customer_description = MapUtil.getStr(whereJson, "customer_description");
         String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn");
 
+        String container_name = MapUtil.getStr(whereJson, "container_name");
+        String is_un_plan_production = MapUtil.getStr(whereJson, "is_un_plan_production");
+        String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn");
+        String date_of_production = MapUtil.getStr(whereJson, "date_of_production");
+        String date_of_FG_inbound = MapUtil.getStr(whereJson, "date_of_FG_inbound");
+        String status = MapUtil.getStr(whereJson, "status");
+
+        // 子卷号 是否计划外子卷 sap批次 制造完成日期 入库日期 状态
+
+
         JSONObject map = new JSONObject();
         map.put("flag", "1");
         if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code","%"+material_code+"%");
@@ -55,6 +65,14 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService
         if (ObjectUtil.isNotEmpty(customer_name)) map.put("customer_name","%"+customer_name+"%");
         if (ObjectUtil.isNotEmpty(customer_description)) map.put("customer_description","%"+customer_description+"%");
 
+        if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name","%"+container_name+"%");
+        if (ObjectUtil.isNotEmpty(sap_pcsn)) map.put("sap_pcsn","%"+sap_pcsn+"%");
+        map.put("is_un_plan_production",is_un_plan_production);
+        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");
         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 dd04765ad..5bf9c3eb4 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,12 @@
 	输入.customer_name			            TYPEAS s_string
 	输入.customer_description			    TYPEAS s_string
 	输入.package_box_sn			            TYPEAS s_string
+	输入.container_name			            TYPEAS s_string
+	输入.is_un_plan_production			            TYPEAS s_string
+	输入.sap_pcsn			            TYPEAS s_string
+	输入.date_of_production			            TYPEAS s_string
+	输入.date_of_FG_inbound			            TYPEAS s_string
+	输入.status			            TYPEAS s_string
 
 
 [临时表]
@@ -76,6 +82,30 @@
                     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
+
             ENDSELECT
         ENDPAGEQUERY
     ENDIF
\ No newline at end of file
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
index 85f3794f6..d9dd2a380 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -2132,8 +2132,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
 
         WQLObject custTab = WQLObject.getWQLObject("MD_CS_CustomerBase"); // 客户基本信息表
         WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_IOStorInv"); // 出入库主表
-        WQLObject dtlTab = WQLObject.getWQLObject("ST_IVT_IOStorInv"); // 出入库明细表
-        WQLObject disTab = WQLObject.getWQLObject("ST_IVT_IOStorInv"); // 出入库分配明细
+        WQLObject dtlTab = WQLObject.getWQLObject("st_ivt_iostorinvdtl"); // 出入库明细表
+        WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 出入库分配明细
         WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); // 子卷包装关系表
 
         JSONObject jsonMst = mstTab.query("iostorinv_id = '" + MapUtil.getStr(whereJson, "iostorinv_id") + "'").uniqueResult(0);
@@ -2175,7 +2175,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         double all_box_qty = 0;
         for (int t = 0; t < jsonAllBox.size(); t++) {
             JSONObject json = jsonAllBox.getJSONObject(t);
-            NumberUtil.add(all_box_qty,json.getDoubleValue("box_qty"));
+            all_box_qty = NumberUtil.add(all_box_qty,json.getDoubleValue("box_qty"));
         }
         oneMap.put("all_box_qty", NumberUtil.round(all_box_qty,2).toString());
         oneMap.put("deliveryaddress", jsonMst.getString("deliveryaddress")); // 送货方地址
diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue
index a591f328c..17f4e7380 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue
@@ -20,9 +20,9 @@
         :before-close="crud.cancelCU"
         :visible.sync="crud.status.cu > 0"
         :title="crud.status.title"
-        width="1000px"
+        width="1100px"
       >
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="140px">
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="客户编码" prop="cust_code">
@@ -35,8 +35,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="法人代表">
-                <el-input v-model="form.jurid_name" style="width: 200px;" />
+              <el-form-item label="客户简称 " prop="cust_simple_name">
+                <el-input v-model="form.cust_simple_name" style="width: 200px;" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -92,7 +92,12 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="20">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="法人代表">
+                <el-input v-model="form.jurid_name" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="送货单打印模板路径">
                 <el-input v-model="form.shd_print_no" style="width: 200px;" />
@@ -123,7 +128,8 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column prop="cust_code" label="客户编码" />
-        <el-table-column prop="cust_name" label="客户名称 " />
+        <el-table-column prop="cust_name" label="客户名称 " show-overflow-tooltip width="150px" />
+        <el-table-column prop="cust_simple_name" label="客户简称 " show-overflow-tooltip />
         <el-table-column prop="corp_tele_no" label="公司电话" />
         <el-table-column prop="corp_address" label="公司地址" />
         <el-table-column prop="jurid_name" label="法人代表" />
diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
index b541f1c15..13109665e 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
@@ -8,7 +8,7 @@
           :inline="true"
           class="demo-form-inline"
           label-position="right"
-          label-width="90px"
+          label-width="115px"
           label-suffix=":"
         >
           <el-form-item label="物料编码">
@@ -41,6 +41,80 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="子卷号">
+            <el-input
+              v-model="query.container_name"
+              clearable
+              placeholder="输入子卷号"
+              style="width: 185px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="是否计划外子卷">
+            <el-select
+              v-model="query.is_un_plan_production"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in isPlanProducList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="sap批次">
+            <el-input
+              v-model="query.sap_pcsn"
+              clearable
+              placeholder="输入sap批次"
+              style="width: 185px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="制造完成日期">
+            <el-date-picker
+              v-model="query.date_of_production"
+              type="date"
+              placeholder="选择日期时间"
+              style="width: 185px"
+              value-format="yyyy-MM-dd"
+              @change="hand"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="入库日期">
+            <el-date-picker
+              v-model="query.date_of_FG_inbound"
+              type="date"
+              placeholder="选择日期时间"
+              style="width: 185px"
+              value-format="yyyy-MM-dd"
+              @change="hand"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="状态">
+            <el-select
+              v-model="query.status"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.sub_package_relation"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="订单号">
             <el-input
               v-model="query.sale_order_name"
@@ -241,14 +315,33 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="12">
+              <el-form-item label="长">
+                <el-input-number v-model="form.box_length" :max="10000" :min="0" :precision="2" :controls="false" style="width: 300px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="宽">
+                <el-input-number v-model="form.box_width" :max="10000" :min="0" :precision="2" :controls="false" style="width: 300px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="高">
+                <el-input-number v-model="form.box_high" :max="10000" :min="0" :precision="2" :controls="false" style="width: 300px;" />
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="销售订单及行号">
                 <el-input v-model="form.sale_order_name" style="width: 300px;" />
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="12">
               <el-form-item label="备注">
-                <el-input v-model="form.remark" style="width: 300px;" />
+                <el-input type="textarea" :rows="2" v-model="form.remark" style="width: 750px;" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -262,19 +355,22 @@
       <el-table ref="table" v-loading="crud.loading" style="width: 100%" :data="crud.data" size="mini" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" />
         <el-table-column prop="package_box_sn" label="木箱码" :min-width="flexWidth('package_box_sn',crud.data,'木箱码')" />
+        <el-table-column prop="container_name" label="子卷号" :min-width="flexWidth('container_name',crud.data,'子卷号')" />
+        <el-table-column prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'SAP批次')" />
         <el-table-column prop="quanlity_in_box" label="箱内子卷数量" :min-width="flexWidth('quanlity_in_box',crud.data,'箱内子卷数量')" />
-        <el-table-column prop="box_weight" label="木箱自身重量" :min-width="flexWidth('box_weight',crud.data,'木箱自身重量')" />
+        <el-table-column prop="status" label="状态" :min-width="flexWidth('status',crud.data,'状态')">
+          <template slot-scope="scope">
+            {{ dict.label.sub_package_relation[scope.row.status] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="box_weight" label="木箱自身重量" :min-width="flexWidth('box_weight',crud.data,'木箱自身重量')" :formatter="crud.formatNum3"  />
         <el-table-column prop="quality_guaran_period" label="保质期" :min-width="flexWidth('quality_guaran_period',crud.data,'保质期')" />
         <el-table-column prop="sale_order_name" label="销售订单及行号" :min-width="flexWidth('sale_order_name',crud.data,'保质期')" />
         <el-table-column prop="customer_description" label="客户名称" :min-width="flexWidth('customer_description',crud.data,'客户名称')" />
+        <el-table-column prop="customer_name" label="客户编码" :min-width="flexWidth('customer_name',crud.data,'客户编码')" />
         <el-table-column prop="product_name" label="产品描述" :min-width="flexWidth('product_name',crud.data,'产品描述')" />
         <el-table-column prop="product_description" label="产品描述" :min-width="flexWidth('product_description',crud.data,'产品描述')" />
         <el-table-column prop="date_of_fg_inbound" label="入库日期" :min-width="flexWidth('date_of_fg_inbound',crud.data,'入库日期')" />
-        <el-table-column prop="container_name" label="子卷号" :min-width="flexWidth('container_name',crud.data,'子卷号')" />
-        <el-table-column prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'SAP批次')" />
-        <el-table-column prop="width" label="产品规格(幅宽)" :min-width="flexWidth('width',crud.data,'产品规格(幅宽)')" />
-        <el-table-column prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
-        <el-table-column prop="mass_per_unit_area" label="单位面积质量" :formatter="crud.formatNum3" :min-width="flexWidth('mass_per_unit_area',crud.data,'单位面积质量')" />
         <el-table-column prop="net_weight" label="净重" :formatter="crud.formatNum3" :min-width="flexWidth('net_weight',crud.data,'净重')" />
         <el-table-column prop="length" label="长度" :formatter="crud.formatNum3" :min-width="flexWidth('length',crud.data,'长度')" />
         <el-table-column prop="date_of_production" label="制造完成日期" :min-width="flexWidth('date_of_production',crud.data,'制造完成日期')" />
@@ -287,16 +383,28 @@
         <el-table-column prop="un_plan_product_property1" label="子卷的物性值1" :min-width="flexWidth('un_plan_product_property1',crud.data,'子卷的物性值1')" />
         <el-table-column prop="un_plan_product_property2" label="子卷的物性值2" :min-width="flexWidth('un_plan_product_property2',crud.data,'子卷的物性值2')" />
         <el-table-column prop="un_plan_product_property3" label="子卷的物性值3" :min-width="flexWidth('un_plan_product_property3',crud.data,'子卷的物性值3')" />
+        <el-table-column prop="box_length" label="长" :min-width="flexWidth('box_length',crud.data,'长')" />
+        <el-table-column prop="box_width" label="宽" :min-width="flexWidth('box_width',crud.data,'宽')" />
+        <el-table-column prop="box_high" label="高" :min-width="flexWidth('box_high',crud.data,'高')" />
+        <el-table-column prop="width" label="产品规格(幅宽)" :min-width="flexWidth('width',crud.data,'产品规格(幅宽)')" />
+        <el-table-column prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
+        <el-table-column prop="mass_per_unit_area" label="单位面积质量" :formatter="crud.formatNum3" :min-width="flexWidth('mass_per_unit_area',crud.data,'单位面积质量')" />
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+        <el-table-column prop="vbeln" label="来源交货单" :min-width="flexWidth('vbeln',crud.data,'来源交货单')" />
+        <el-table-column prop="posnr" label="来源交货单行" :min-width="flexWidth('posnr',crud.data,'来源交货单行')" />
+        <el-table-column prop="sale_order_description" label="销售订单描述" :min-width="flexWidth('sale_order_description',crud.data,'销售订单描述')" />
         <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
         <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
-        <el-table-column prop="status" label="状态" :min-width="flexWidth('status',crud.data,'状态')">
+        <el-table-column prop="isreprintpackageboxlabel" label="是否需要重打外包装标签" :min-width="flexWidth('isreprintpackageboxlabel',crud.data,'是否需要重打外包装标签')">
           <template slot-scope="scope">
-            {{ dict.label.sub_package_relation[scope.row.status] }}
+            {{ dict.label.IS_OR_NOT[scope.row.isreprintpackageboxlabel] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="isunpackbox" label="是否需要拆包重打子卷标签" :min-width="flexWidth('isunpackbox',crud.data,'是否需要拆包重打子卷标签')">
+          <template slot-scope="scope">
+            {{ dict.label.IS_OR_NOT[scope.row.isunpackbox] }}
           </template>
         </el-table-column>
-        <el-table-column prop="isreprintpackageboxlabel" label="是否需要重打外包装标签" :min-width="flexWidth('isreprintpackageboxlabel',crud.data,'是否需要重打外包装标签')" />
-        <el-table-column prop="isunpackbox" label="是否需要拆包重打子卷标签" :min-width="flexWidth('isunpackbox',crud.data,'是否需要拆包重打子卷标签')" />
         <el-table-column v-permission="[]" label="操作" align="center" fixed="right" min-width="120">
           <template slot-scope="scope">
             <udOperation
@@ -333,6 +441,10 @@ export default {
     return {
       permission: {
       },
+      isPlanProducList: [
+        { 'label': '是', 'value': '1' },
+        { 'label': '否', 'value': '0' }
+      ],
       rules: {
         customer_description: [
           { required: true, message: '客户名称不能为空', trigger: 'blur' }
@@ -376,6 +488,9 @@ export default {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
+    },
+    hand(value) {
+      this.crud.toQuery()
     }
 
   }