diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
index f65651984..cb9986bb9 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
@@ -71,9 +71,17 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
         map.put("create_mode", (String) whereJson.get("create_mode"));
         map.put("bill_status", (String) whereJson.get("bill_status"));
         String bill_code = MapUtil.getStr(whereJson, "bill_code");
+        String sap_pcsn = MapUtil.getStr(whereJson, "sap_pcsn");
+        String pcsn = MapUtil.getStr(whereJson, "pcsn");
         if (!ObjectUtil.isEmpty(bill_code)) {
             map.put("bill_code", "%" + bill_code + "%");
         }
+        if (!ObjectUtil.isEmpty(sap_pcsn)) {
+            map.put("sap_pcsn", "%" + sap_pcsn + "%");
+        }
+        if (!ObjectUtil.isEmpty(pcsn)) {
+            map.put("pcsn", "%" + pcsn + "%");
+        }
         String begin_time = (String) whereJson.get("begin_time");
 
         if (!StrUtil.isEmpty(begin_time)) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
index 8365d9484..513aa4a79 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
@@ -20,6 +20,8 @@
     输入.bill_code    					TYPEAS s_string
     输入.create_mode    					TYPEAS s_string
     输入.stor_id    					    TYPEAS s_string
+    输入.sap_pcsn    					TYPEAS s_string
+    输入.pcsn    					    TYPEAS s_string
     输入.bill_status    					TYPEAS s_string
     输入.bill_type   					TYPEAS s_string
     输入.box_no   					    TYPEAS s_string
@@ -58,10 +60,12 @@
 
 	IF 输入.flag = "1"
 		PAGEQUERY
-			SELECT
+			SELECT DISTINCT
             	ios.*
             FROM
             	ST_IVT_IOStorInv ios
+            LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinv_id = ios.iostorinv_id
+            LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
             WHERE
                 ios.is_delete = '0'
             AND
@@ -71,6 +75,12 @@
             OPTION 输入.bill_code <> ""
                    ios.bill_code like 输入.bill_code
             ENDOPTION
+            OPTION 输入.sap_pcsn <> ""
+                   sub.sap_pcsn like 输入.sap_pcsn
+            ENDOPTION
+            OPTION 输入.pcsn <> ""
+                   dis.pcsn like 输入.pcsn
+            ENDOPTION
             OPTION 输入.stor_id <> ""
                   ios.stor_id = 输入.stor_id
             ENDOPTION
@@ -108,7 +118,8 @@
                 	width,
                 	thickness,
                 	net_weight,
-                	net_weight AS plan_qty
+                	net_weight AS plan_qty,
+                	sap_pcsn
                 FROM
                 	pdm_bi_subpackagerelation sub
                 WHERE
@@ -125,6 +136,9 @@
                 OPTION 输入.package_box_sn <> ""
                     sub.package_box_sn = 输入.package_box_sn
                 ENDOPTION
+                OPTION 输入.package_box_sn <> ""
+                    sub.sap_pcsn = 输入.sap_pcsn
+                ENDOPTION
                 OPTION 输入.container_name <> ""
                     sub.container_name = 输入.container_name
                 ENDOPTION
@@ -151,7 +165,7 @@
             	st_ivt_iostorinvdtl dtl
             	LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
             	LEFT JOIN ST_IVT_IOStorInv mst ON mst.iostorinv_id = dtl.iostorinv_id
-            	LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dtl.pcsn
+            	LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dtl.pcsn AND dtl.box_no = sub.package_box_sn
             where
                 mst.bill_code = 输入.bill_code
             OPTION 输入.open_flag = "1"
@@ -171,11 +185,13 @@
                     mb.material_code,
                     mb.material_name,
                     po.point_code,
-                    po.point_name
+                    po.point_name,
+                    sub.sap_pcsn
                 FROM
                 	st_ivt_iostorinvdis dis
                 INNER JOIN md_me_materialbase mb ON mb.material_id = dis.material_id
                 LEFT JOIN SCH_BASE_POINT po ON po.point_id = dis.point_id
+                LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
                 where
                 dis.box_no = 输入.package_box_sn
                 AND
@@ -204,12 +220,14 @@
                 po.point_name,
                 dis.iostorinvdis_id,
                 dis.task_id,
-                dis.box_no
+                dis.box_no,
+                sub.sap_pcsn
             FROM
                 st_ivt_iostorinvdis dis
             INNER JOIN md_me_materialbase mb ON mb.material_id = dis.material_id
             LEFT JOIN sch_base_point po ON po.point_id = dis.point_id
             LEFT JOIN sch_base_task task ON task.task_id = dis.task_id AND task.is_delete = '0'
+            LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn
             WHERE
                 dis.task_id <> ''
             AND
@@ -622,7 +640,8 @@
                     width,
                     thickness,
                     net_weight,
-                    net_weight AS plan_qty
+                    net_weight AS plan_qty,
+                    sap_pcsn
                 FROM
                     pdm_bi_subpackagerelation sub
                 WHERE
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 0fc6ff80d..26a291aeb 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
@@ -2095,7 +2095,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             JSONObject jsonSub = subTab.query("container_name = '" + dis.getString("pcsn") + "' and status = '2'").uniqueResult(0);
             if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("此子卷不存在或不为入库状态：" + dis.getString("pcsn"));
             // 如果是拆分入库则将包装关系改为生成状态
-            if (jo_mst.getString("bill_type").equals("1005") || (jo_mst.getString("bill_type").equals("1009") && StrUtil.isNotEmpty(dtl_jo.getString("source_bill_code")))){
+            if (jo_mst.getString("bill_type").equals("1005") || (jo_mst.getString("bill_type").equals("1009") && StrUtil.isEmpty(dtl_jo.getString("source_bill_code")))){
                 jsonSub.put("status", "0");
             } else {
                 jsonSub.put("status", "3");
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 50e47decf..8685aeb2d 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
@@ -11,99 +11,119 @@
           label-width="11 0px"
           label-suffix=":"
         >
-          <el-form-item label="订单类型">
-            <el-select
-              v-model="query.order_type"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              style="width: 250px"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.order_type"
-                :label="item.label"
-                :value="item.value"
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="订单类型">
+                <el-select
+                  v-model="query.order_type"
+                  clearable
+                  size="mini"
+                  placeholder="请选择"
+                  class="filter-item"
+                  style="width: 250px"
+                  @change="hand"
+                >
+                  <el-option
+                    v-for="item in dict.order_type"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="生产区域">
+                <el-select
+                  v-model="query.product_area"
+                  clearable
+                  size="mini"
+                  placeholder="请选择"
+                  class="filter-item"
+                  style="width: 250px"
+                  @change="hand"
+                >
+                  <el-option
+                    v-for="item in dict.product_area"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="状态">
+                <el-select
+                  v-model="query.status"
+                  clearable
+                  size="mini"
+                  placeholder="请选择"
+                  class="filter-item"
+                  style="width: 250px"
+                  @change="hand"
+                >
+                  <el-option
+                    v-for="item in dict.cut_product_status"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="机台编码">
+                <el-input
+                  v-model="query.resource_name"
+                  clearable
+                  size="mini"
+                  placeholder="机台编码"
+                  style="width: 250px"
+                  @keyup.enter.native="crud.toQuery"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="母卷号">
+                <el-input
+                  v-model="query.parent_container_name"
+                  clearable
+                  size="mini"
+                  placeholder="母卷号"
+                  style="width: 250px"
+                  @keyup.enter.native="crud.toQuery"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="子卷号">
+                <el-input
+                  v-model="query.container_name"
+                  clearable
+                  size="mini"
+                  placeholder="母卷号"
+                  style="width: 250px"
+                  @keyup.enter.native="crud.toQuery"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-form-item label="日期">
+              <el-date-picker
+                v-model="query.createTime"
+                type="daterange"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :default-time="['00:00:00', '23:59:59']"
+                @change="crud.toQuery"
               />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="生产区域">
-            <el-select
-              v-model="query.product_area"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              style="width: 250px"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.product_area"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="状态">
-            <el-select
-              v-model="query.status"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              style="width: 250px"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.cut_product_status"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="机台编码">
-            <el-input
-              v-model="query.resource_name"
-              clearable
-              size="mini"
-              placeholder="机台编码"
-              style="width: 250px"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="母卷号">
-            <el-input
-              v-model="query.parent_container_name"
-              clearable
-              size="mini"
-              placeholder="母卷号"
-              style="width: 250px"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="子卷号">
-            <el-input
-              v-model="query.container_name"
-              clearable
-              size="mini"
-              placeholder="母卷号"
-              style="width: 250px"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="日期">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-          <rrOperation />
+            </el-form-item>
+            <rrOperation />
+          </el-row>
+
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
diff --git a/lms/nladmin-ui/src/views/wms/pub/StructDialog.vue b/lms/nladmin-ui/src/views/wms/pub/StructDialog.vue
index 2b2810b85..d31f11ccc 100644
--- a/lms/nladmin-ui/src/views/wms/pub/StructDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pub/StructDialog.vue
@@ -49,7 +49,6 @@
       <el-table-column type="selection" width="55" />
       <el-table-column prop="struct_code" label="货位编码" />
       <el-table-column prop="struct_name" label="货位名称" />
-      <el-table-column prop="material_height_type_name" label="高度类型" />
       <el-table-column prop="sect_name" label="库区名称" />
     </el-table>
     <!--分页组件-->
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
index 226b2c09c..a9665f423 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -10,75 +10,90 @@
           label-width="80px"
           label-suffix=":"
         >
-          <el-form-item label="任务号">
-            <label slot="label">任&nbsp;&nbsp;务&nbsp;号:</label>
-            <el-input
-              v-model="query.task_code"
-              clearable
-              style="width: 180px"
-              placeholder="任务号"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="载具号">
-            <label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
-            <el-input
-              v-model="query.vehicle_code"
-              clearable
-              style="width: 180px"
-              placeholder="载具号1"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="点位编码">
-            <el-input
-              v-model="query.point_code1"
-              clearable
-              style="width: 180px"
-              placeholder="起点"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="任务类型">
-            <treeselect
-              v-model="query.task_type"
-              :load-options="loadChildNodes"
-              :options="classes1"
-              style="width: 180px"
-              placeholder="请选择"
-            />
-          </el-form-item>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="任务号">
+                <label slot="label">任&nbsp;&nbsp;务&nbsp;号:</label>
+                <el-input
+                  v-model="query.task_code"
+                  clearable
+                  style="width: 180px"
+                  placeholder="任务号"
+                  @keyup.enter.native="crud.toQuery"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="载具号">
+                <label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
+                <el-input
+                  v-model="query.vehicle_code"
+                  clearable
+                  style="width: 180px"
+                  placeholder="载具号1"
+                  @keyup.enter.native="crud.toQuery"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="点位编码">
+                <el-input
+                  v-model="query.point_code1"
+                  clearable
+                  style="width: 180px"
+                  placeholder="起点"
+                  @keyup.enter.native="crud.toQuery"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-          <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
-
-          <el-form-item label="任务状态">
-            <el-select
-              v-model="query.task_status"
-              multiple
-              style="width: 400px"
-              placeholder="任务状态"
-              class="filter-item"
-              clearable
-              @change="handTaskStatus"
-            >
-              <el-option
-                v-for="item in taskStatusList"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
-          </el-form-item>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="任务类型">
+                <treeselect
+                  v-model="query.task_type"
+                  :load-options="loadChildNodes"
+                  :options="classes1"
+                  style="width: 180px"
+                  placeholder="请选择"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="创建时间">
+                <el-date-picker
+                  v-model="query.createTime"
+                  type="daterange"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  :default-time="['00:00:00', '23:59:59']"
+                  @change="crud.toQuery"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="任务状态">
+                <el-select
+                  v-model="query.task_status"
+                  multiple
+                  style="width: 400px"
+                  placeholder="任务状态"
+                  class="filter-item"
+                  clearable
+                  @change="handTaskStatus"
+                >
+                  <el-option
+                    v-for="item in taskStatusList"
+                    :key="item.code"
+                    :label="item.name"
+                    :value="item.code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <rrOperation />
         </el-form>
 
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
index 98faa053b..dd2325634 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
@@ -130,12 +130,13 @@
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column show-overflow-tooltip prop="sale_order_name" label="订单号" />
-      <el-table-column show-overflow-tooltip width="205" prop="customer_name" label="客户编号" />
+      <el-table-column show-overflow-tooltip width="150" prop="sale_order_name" label="订单号" />
+      <el-table-column show-overflow-tooltip width="150" prop="customer_name" label="客户编号" />
       <el-table-column prop="customer_name" label="客户名称" />
       <el-table-column show-overflow-tooltip prop="package_box_sn" width="250" label="箱号" />
       <el-table-column show-overflow-tooltip width="100" prop="quanlity_in_box" label="箱内子卷数" />
       <el-table-column show-overflow-tooltip width="150" prop="container_name" label="子卷号" />
+      <el-table-column show-overflow-tooltip width="150" prop="sap_pcsn" label="sap批次" />
       <el-table-column show-overflow-tooltip width="150" prop="product_name" label="物料编码" />
       <el-table-column show-overflow-tooltip width="150" prop="product_description" label="物料描述" />
       <el-table-column show-overflow-tooltip prop="width" label="幅宽" />
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
index ed0d0142a..a911a9dc7 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
@@ -44,6 +44,15 @@
           clearable
           size="mini"
           placeholder="物料编码"
+          style="width: 230px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <el-input
+          v-model="query.sap_pcsn"
+          clearable
+          size="mini"
+          placeholder="sap批次"
           style="width: 200px;"
           class="filter-item"
           @keyup.enter.native="crud.toQuery"
@@ -61,14 +70,15 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column show-overflow-tooltip width="200" prop="sale_order_name" label="订单号" />
+        <el-table-column show-overflow-tooltip width="150" prop="sale_order_name" label="订单号" />
         <el-table-column show-overflow-tooltip width="150" prop="customer_name" label="客户编号" />
         <el-table-column width="200" prop="customer_description" label="客户名称" />
         <el-table-column show-overflow-tooltip prop="package_box_sn" width="250" label="箱号" />
         <el-table-column show-overflow-tooltip width="100" prop="quanlity_in_box" label="箱内子卷数" />
         <el-table-column show-overflow-tooltip width="150" prop="container_name" label="子卷号" />
+        <el-table-column show-overflow-tooltip width="150" prop="sap_pcsn" label="sap批次" />
         <el-table-column show-overflow-tooltip width="150" prop="product_name" label="物料编码" />
-        <el-table-column show-overflow-tooltip width="150" prop="product_description" label="物料描述" />
+        <el-table-column show-overflow-tooltip width="170" prop="product_description" label="物料描述" />
         <el-table-column show-overflow-tooltip prop="width" label="幅宽" />
         <el-table-column show-overflow-tooltip prop="thickness" label="产品厚度" />
       </el-table>
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
index cb60e505a..182adf6f9 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
@@ -55,6 +55,7 @@
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" />
+        <el-table-column show-overflow-tooltip prop="sap_pcsn" label="SAP批次" align="center" />
         <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
         <!--        <el-table-column show-overflow-tooltip prop="assign_qty" :formatter="crud.formatNum3" label="已分配数量"
                          align="center"/>
@@ -200,6 +201,7 @@
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" />
+        <el-table-column show-overflow-tooltip prop="sap_pcsn" label="SAP批次" align="center" />
         <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
         <el-table-column show-overflow-tooltip prop="point_code" label="入库点" align="center" />
         <el-table-column show-overflow-tooltip prop="struct_code" label="货位" align="center" />
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue
index 67b208d77..9c2e5569f 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue
@@ -36,10 +36,10 @@
       >
         <el-table-column show-overflow-tooltip type="index" label="序号" align="center" />
         <el-table-column show-overflow-tooltip prop="bill_code" label="入库单号" align="center" />
-        <el-table-column show-overflow-tooltip prop="seq_no" label="明细序号" align="center" />
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column show-overflow-tooltip prop="pcsn" label="批次号" align="center" />
+        <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" />
+        <el-table-column show-overflow-tooltip prop="sap_pcsn" label="SAP批次" align="center" />
         <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
         <el-table-column
           show-overflow-tooltip
@@ -129,22 +129,12 @@
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
         @row-click="clcikDisRow"
       >
-        <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
-        <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column show-overflow-tooltip prop="pcsn" label="批次" align="center" />
-        <el-table-column show-overflow-tooltip prop="seq_no" label="序号" align="center" />
-        <el-table-column
-          show-overflow-tooltip
-          align="center"
-          prop="storagevehicle_code"
-          width="120"
-          label="载具号"
-        >
-          <template slot-scope="scope">
-            <el-link type="primary" @click="bucketDtl(scope.row)">{{ scope.row.storagevehicle_code }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column show-overflow-tooltip prop="bucket_num" label="桶数" align="center" />
+        <el-table-column width="60" prop="seq_no" label="序号" align="center" />
+        <el-table-column width="150" prop="material_code" label="物料编码" align="center" />
+        <el-table-column width="150" prop="material_name" label="物料名称" align="center" />
+        <el-table-column width="170" prop="pcsn" label="子卷号" align="center" />
+        <el-table-column width="120" prop="sap_pcsn" label="SAP批次" align="center" />
+        <el-table-column width="230" prop="box_no" label="木箱码" align="center" />
         <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
         <el-table-column show-overflow-tooltip prop="struct_code" label="分配货位" align="center" />
         <el-table-column show-overflow-tooltip prop="work_status" label="指令状态" :formatter="statusFormat" align="center" />
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/index.vue b/lms/nladmin-ui/src/views/wms/st/inbill/index.vue
index 895a9fbce..a2109504a 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/index.vue
@@ -103,6 +103,24 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="子卷号">
+            <el-input
+              v-model="query.pcsn"
+              size="mini"
+              clearable
+              placeholder="子卷号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="SAP批次">
+            <el-input
+              v-model="query.sap_pcsn"
+              size="mini"
+              clearable
+              placeholder="SAP批次"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>