diff --git a/src/views/modules/material/seekByNum.vue b/src/views/modules/material/seekByNum.vue
index d7dbb07..ce0d261 100644
--- a/src/views/modules/material/seekByNum.vue
+++ b/src/views/modules/material/seekByNum.vue
@@ -183,7 +183,7 @@ export default {
           serialNumber: '200005TableWarehouseId',
           tableId: "200005Table",
           tableName: "仓位编码",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'warehouseID',
           headerAlign: 'left',
           align: "left",
@@ -201,7 +201,7 @@ export default {
           serialNumber: '200005TablePartNo',
           tableId: "200005Table",
           tableName: "物料编码",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'partNo',
           headerAlign: 'left',
           align: "left",
@@ -219,7 +219,7 @@ export default {
           serialNumber: '200005TablePartDesc',
           tableId: "200005Table",
           tableName: "料号描述",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'partDesc',
           headerAlign: 'left',
           align: "left",
@@ -237,7 +237,7 @@ export default {
           serialNumber: '200005TableNum',
           tableId: "200005Table",
           tableName: "卷数量",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'num',
           headerAlign: 'right',
           align: "right",
@@ -255,7 +255,7 @@ export default {
           serialNumber: '200005TableQtyOnHand',
           tableId: "200005Table",
           tableName: "库存数量",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'qtyOnHand',
           headerAlign: 'right',
           align: "right",
@@ -274,7 +274,7 @@ export default {
           serialNumber: '200005TableBatchNo',
           tableId: "200005Table",
           tableName: "批号",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'batchNo',
           headerAlign: 'left',
           align: "left",
@@ -292,7 +292,7 @@ export default {
           serialNumber: '200005TableLocationID',
           tableId: "200005Table",
           tableName: "库位",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'locationID',
           headerAlign: 'left',
           align: "left",
@@ -310,7 +310,7 @@ export default {
           serialNumber: '200005TableManufactureDate',
           tableId: "200005Table",
           tableName: "生产日期",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'manufactureDate',
           headerAlign: 'center',
           align: "center",
@@ -328,7 +328,7 @@ export default {
           serialNumber: '200005TableFirstInDate',
           tableId: "200005Table",
           tableName: "首次入库日期",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'FirstInDate',
           headerAlign: 'center',
           align: "center",
@@ -346,7 +346,7 @@ export default {
           serialNumber: '200005TableExpiredDate',
           tableId: "200005Table",
           tableName: "失效日期",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'expiredDate',
           headerAlign: 'center',
           align: "center",
@@ -364,7 +364,7 @@ export default {
           serialNumber: '200005TableDaysUntilExpired',
           tableId: "200005Table",
           tableName: "剩余有效期天数",
-          columnWidth: 130,
+          columnWidth: 140,
           columnProp: 'daysUntilExpired',
           headerAlign: 'right',
           align: "right",
diff --git a/src/views/modules/material/seekByRolls.vue b/src/views/modules/material/seekByRolls.vue
index 42d99e1..7ebc0b9 100644
--- a/src/views/modules/material/seekByRolls.vue
+++ b/src/views/modules/material/seekByRolls.vue
@@ -17,6 +17,10 @@
         <el-input v-model="searchData.rollNo" clearable style="width: 120px"></el-input>
       </el-form-item>
 
+      <el-form-item :label="'出入库单号:'">
+        <el-input v-model="searchData.transNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+
       <el-form-item :label="' '">
         <el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
 <!--        <download-excel-->
diff --git a/src/views/modules/material/seekByTrans.vue b/src/views/modules/material/seekByTrans.vue
index d1e0759..b7ca2b9 100644
--- a/src/views/modules/material/seekByTrans.vue
+++ b/src/views/modules/material/seekByTrans.vue
@@ -13,6 +13,10 @@
         <el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input>
       </el-form-item>
 
+      <el-form-item :label="'出入库单号:'">
+        <el-input v-model="searchData.transNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+
 
       <el-form-item :label="' '">
         <el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
@@ -272,24 +276,6 @@ export default {
           status: true,
           fixed: '',
         },
-        // {
-        //   userId: this.$store.state.user.name,
-        //   functionId: 200003,
-        //   serialNumber: '200003TableRollNo',
-        //   tableId: "200003Table",
-        //   tableName: "卷号",
-        //   columnWidth: 100,
-        //   columnProp: 'rollNo',
-        //   headerAlign: 'center',
-        //   align: "center",
-        //   columnLabel: '卷号',
-        //   columnHidden: false,
-        //   columnImage: false,
-        //   columnSortable: false,
-        //   sortLv: 0,
-        //   status: true,
-        //   fixed: '',
-        // },
         {
           userId: this.$store.state.user.name,
           functionId: 200003,
diff --git a/src/views/modules/material/seekInvByRolls.vue b/src/views/modules/material/seekInvByRolls.vue
index 3d9fa04..d8a3104 100644
--- a/src/views/modules/material/seekInvByRolls.vue
+++ b/src/views/modules/material/seekInvByRolls.vue
@@ -17,6 +17,13 @@
         <el-input v-model="searchData.rollNo" clearable style="width: 120px"></el-input>
       </el-form-item>
 
+      <el-form-item :label="'查询在库或全部:'">
+        <el-select v-model="searchData.qtyOnHand" placeholder="请选择" style="width: 120px">
+          <el-option label="在库" value= 0></el-option>
+          <el-option label="全部" value=""></el-option>
+        </el-select>
+      </el-form-item>
+
 <!--      <el-form-item :label="'卷号:'">-->
 <!--        <el-input v-model="searchData.rollNo" clearable style="width: 120px"></el-input>-->
 <!--      </el-form-item>-->
@@ -157,7 +164,7 @@ export default {
           serialNumber: '200005TableWarehouseId',
           tableId: "200005Table",
           tableName: "仓位编码",
-          columnWidth: 130,
+          columnWidth: 142,
           columnProp: 'warehouseID',
           headerAlign: 'left',
           align: "left",
@@ -175,7 +182,7 @@ export default {
           serialNumber: '200005TablePartNo',
           tableId: "200005Table",
           tableName: "物料编码",
-          columnWidth: 130,
+          columnWidth: 142,
           columnProp: 'partNo',
           headerAlign: 'left',
           align: "left",
@@ -193,7 +200,7 @@ export default {
           serialNumber: '200005TablePartDesc',
           tableId: "200005Table",
           tableName: "料号描述",
-          columnWidth: 130,
+          columnWidth: 142,
           columnProp: 'partDesc',
           headerAlign: 'left',
           align: "left",
@@ -211,7 +218,7 @@ export default {
           serialNumber: '200004TableRollNo',
           tableId: "200004Table",
           tableName: "卷号",
-          columnWidth: 100,
+          columnWidth: 145,
           columnProp: 'rollNo',
           headerAlign: 'center',
           align: "center",
@@ -229,7 +236,7 @@ export default {
           serialNumber: '200005TableQtyOnHand',
           tableId: "200005Table",
           tableName: "库存数量",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'qtyOnHand',
           headerAlign: 'right',
           align: "right",
@@ -248,7 +255,7 @@ export default {
           serialNumber: '200005TableBatchNo',
           tableId: "200005Table",
           tableName: "批号",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'batchNo',
           headerAlign: 'left',
           align: "left",
@@ -266,7 +273,7 @@ export default {
           serialNumber: '200005TableLocationID',
           tableId: "200005Table",
           tableName: "库位",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'locationID',
           headerAlign: 'left',
           align: "left",
@@ -284,7 +291,7 @@ export default {
           serialNumber: '200005TableManufactureDate',
           tableId: "200005Table",
           tableName: "生产日期",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'manufactureDate',
           headerAlign: 'center',
           align: "center",
@@ -302,7 +309,7 @@ export default {
           serialNumber: '200005TableFirstInDate',
           tableId: "200005Table",
           tableName: "首次入库日期",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'FirstInDate',
           headerAlign: 'center',
           align: "center",
@@ -320,7 +327,7 @@ export default {
           serialNumber: '200005TableExpiredDate',
           tableId: "200005Table",
           tableName: "失效日期",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'expiredDate',
           headerAlign: 'center',
           align: "center",
@@ -338,7 +345,7 @@ export default {
           serialNumber: '200005TableDaysUntilExpired',
           tableId: "200005Table",
           tableName: "剩余有效期天数",
-          columnWidth: 130,
+          columnWidth: 145,
           columnProp: 'daysUntilExpired',
           headerAlign: 'right',
           align: "right",
diff --git a/src/views/modules/scheduleReport/com_separate_roll.vue b/src/views/modules/scheduleReport/com_separate_roll.vue
index 189dfe9..bf78f65 100644
--- a/src/views/modules/scheduleReport/com_separate_roll.vue
+++ b/src/views/modules/scheduleReport/com_separate_roll.vue
@@ -6,6 +6,13 @@
       <el-form :inline="true" label-position="top" style="height: 100px;"
                label-width="80px">
         <!-- 半成品卷卷号 -->
+        <el-row>
+          <el-col :span="24" style="margin-top: -5px;">
+            <el-form-item label="材料卷号:">
+              <el-input ref="rmRollNo" v-model="pageData.rmRollNo" style="width: 180px;"  @keyup.enter.native="checkRmRollNo" ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24" style="margin-top: -5px;">
             <el-form-item :label=labels.rollQty>
@@ -64,6 +71,7 @@ export default {
         username: this.$store.state.user.name,
         orderNo: '',
         itemNo: '',
+        rmRollNo: '',
         seqNo: '',
         rollNo: '',
         reportDate: '',
@@ -195,10 +203,11 @@ export default {
       this.getSeqStandardRollQtyFun();
       //清空参数
       this.pageData.rollNums = 1;
+      this.pageData.rmRollNo = '';
       this.visible = true;
       //获取焦点
       this.$nextTick(() => {
-        this.$refs.rollQty.focus();
+        this.$refs.rmRollNo.focus();
       });
       this.titleCon = this.labels.titleCon;//重置标题
     },
@@ -246,8 +255,28 @@ export default {
       }
     },
 
+    /*检查材料卷号的数据*/
+    checkRmRollNo() {
+      //判断null和空字符串
+      if (this.pageData.rmRollNo == null || this.pageData.rmRollNo == '') {
+        this.$message.error('卷号不能为空!');
+        return false;
+      } else {
+        //分拆site 和 卷号
+        let siteAndRollNo = this.pageData.rmRollNo.trim().split(',');
+        //判断材料卷号是否合规
+        if(siteAndRollNo.length != 2){
+          this.$message.error('材料卷号非法!');
+          return false;
+        }
+        this.pageData.rmRollNo = siteAndRollNo[1];
+      }
+      this.pageData.rollNo =  this.pageData.rmRollNo;
+    },
+
     //检查创建
     createSeparateRollFun() {
+      let rmRollNo = this.pageData.rmRollNo;
       //获取当前是的数量
       let rollQty = parseInt(this.pageData.rollQty);
       //判断是否可以修改
diff --git a/src/views/modules/scheduleReport/produce_order.vue b/src/views/modules/scheduleReport/produce_order.vue
index bf8eb8a..bccb1b8 100644
--- a/src/views/modules/scheduleReport/produce_order.vue
+++ b/src/views/modules/scheduleReport/produce_order.vue
@@ -205,24 +205,6 @@ export default {
           status: true,
           fixed: ''
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: functionId,
-          serialNumber: '600001ProduceQtyReported',
-          tableId: '600001Produce',
-          tableName: '待生产工单',
-          columnProp: 'qtyReported',
-          headerAlign: 'center',
-          align: 'right',
-          columnLabel: '已报告数量',
-          columnWidth: 100,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: true,
-          sortLv: 0,
-          status: true,
-          fixed: ''
-        },
         {
           userId: this.$store.state.user.name,
           functionId: functionId,
@@ -259,78 +241,6 @@ export default {
           status: true,
           fixed: ''
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: functionId,
-          serialNumber: '600001ProduceRemark',
-          tableId: '600001Produce',
-          tableName: '待生产工单',
-          columnProp: 'remark',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '备注',
-          columnWidth: 180,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: ''
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: functionId,
-          serialNumber: '600001ProduceScheduledDate',
-          tableId: '600001Produce',
-          tableName: '待生产工单',
-          columnProp: 'scheduledDate',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '排产日期',
-          columnWidth: 120,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: ''
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: functionId,
-          serialNumber: '600001ProduceShiftNo',
-          tableId: '600001Produce',
-          tableName: '待生产工单',
-          columnProp: 'shiftNo',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '班次',
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: ''
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: functionId,
-          serialNumber: '600001ProduceCustomerName',
-          tableId: '600001Produce',
-          tableName: '待生产工单',
-          columnProp: 'customerName',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '客户名称',
-          columnWidth: 180,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: ''
-        },
       ],
       reportButton: {
         dieCuttingButton: true,