diff --git a/src/api/board.js b/src/api/board.js
index 3e5109f..597c316 100644
--- a/src/api/board.js
+++ b/src/api/board.js
@@ -16,3 +16,5 @@ export const SORoutingBoardForXiuBian= data => createAPI(`board/SORoutingBoardFo
 export const SORoutingBoardForJianYan= data => createAPI(`board/SORoutingBoardForJianYan`,'post',data)
 
 export const PODetailForW= data => createAPI(`board/PODetailForW`,'post',data)
+export const transFerBoardForHunlian= data => createAPI(`board/transFerBoardForHunlian`,'post',data)
+
diff --git a/src/router/index.js b/src/router/index.js
index 15de051..56cdc67 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -34,7 +34,7 @@ const globalRoutes = [
   { path: '/autoPrintStock', component: _import('modules/autoPrint/autoPrintStock'), name: 'autoPrintStock', meta: { title: '自动打印库存' } },
   { path: '/SORoutingBoardForXiuBian', component: _import('modules/board/SORoutingBoardForXiuBian'), name: 'SORoutingBoardForXiuBian', meta: { title: '修边工序看板' } },
   { path: '/PODetailForW', component: _import('modules/board/PODetailForW'), name: 'PODetailForW', meta: { title: '外购件检验看板' } },
-
+  { path: '/transFerBoardForHunlian', component: _import('modules/board/transFerBoardForHunlian'), name: 'transFerBoardForHunlian', meta: { title: '混炼待入库看板' } },
 ]
 
 // 主入口路由(需嵌套上左右整体布局)
diff --git a/src/views/modules/board/soLiuhuaBoard.vue b/src/views/modules/board/soLiuhuaBoard.vue
index f570f3d..82cb89a 100644
--- a/src/views/modules/board/soLiuhuaBoard.vue
+++ b/src/views/modules/board/soLiuhuaBoard.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mod-config">
     <div style="text-align: center">
-      <h1>硫化看板</h1>
+      <h1>生产制造看板</h1>
     </div>
     <div class="board2">
       <!--        @mouseenter.native="mouseEnter"-->
@@ -28,7 +28,7 @@
           align="left"
           min-width="65"
           style="font-size: 20px"
-          label="硫化订单号">
+          label="生产订单号">
         </el-table-column>
         <el-table-column
           prop="partNo"
diff --git a/src/views/modules/board/transFerBoard.vue b/src/views/modules/board/transFerBoard.vue
index e99bebb..14a7508 100644
--- a/src/views/modules/board/transFerBoard.vue
+++ b/src/views/modules/board/transFerBoard.vue
@@ -30,6 +30,14 @@
           style="font-size: 20px"
           label="生产订单号">
         </el-table-column>
+        <el-table-column
+          prop="type"
+          header-align="center"
+          align="left"
+          min-width="60"
+          style="font-size: 20px"
+          label="订单类型">
+        </el-table-column>
         <el-table-column
           prop="site"
           header-align="center"
diff --git a/src/views/modules/board/transFerBoardForHunlian.vue b/src/views/modules/board/transFerBoardForHunlian.vue
new file mode 100644
index 0000000..57944e1
--- /dev/null
+++ b/src/views/modules/board/transFerBoardForHunlian.vue
@@ -0,0 +1,188 @@
+<template>
+  <div class="mod-config">
+    <div style="text-align: center">
+      <h1>混炼待入库看板</h1>
+    </div>
+    <div class="board2">
+      <!--        @mouseenter.native="mouseEnter"-->
+      <!--        @mouseleave.native="mouseLeave"-->
+      <el-table
+        cell-style="cc"
+        :height="height"
+        :data="tableData"
+        ref="wt_table"
+        border
+        :row-class-name="tableRowClassName"
+        style="width: 100%;">
+        <el-table-column
+          prop="transNo"
+          header-align="center"
+          align="left"
+          min-width="80"
+          style="font-size: 20px"
+          label="入库通知单号">
+        </el-table-column>
+        <el-table-column
+          prop="orderNo"
+          header-align="center"
+          align="left"
+          min-width="65"
+          style="font-size: 20px"
+          label="生产订单号">
+        </el-table-column>
+        <el-table-column
+          prop="site"
+          header-align="center"
+          align="left"
+          min-width="65"
+          style="font-size: 20px"
+          label="工厂编号">
+        </el-table-column>
+        <el-table-column
+          prop="transDate"
+          header-align="center"
+          align="left"
+          min-width="105"
+          label="报工日期">
+        </el-table-column>
+        <el-table-column
+          prop="partNo"
+          header-align="center"
+          align="left"
+          min-width="105"
+          label="产品编号">
+        </el-table-column>
+        <el-table-column
+          prop="partDesc"
+          header-align="center"
+          align="left"
+          min-width="180"
+          label="产品名称">
+        </el-table-column>
+        <el-table-column
+          prop="qty"
+          header-align="center"
+          align="right"
+          min-width="60"
+          label="未入库数量">
+        </el-table-column>
+        <el-table-column
+          prop="seqNo"
+          header-align="center"
+          align="right"
+          min-width="45"
+          label="派工单号">
+        </el-table-column>
+      </el-table>
+    </div>
+
+  </div>
+</template>
+
+<script>
+  let rollstop = ''
+  let rolltimer = ''// 自动滚动的定时任务
+  let refresher = '' //数据刷新定时器
+  import {
+    transFerBoardForHunlian,
+  } from '@/api/board.js'
+  export default {
+    name: 'transFerBoardForHunlian',
+    data () {
+      return {
+        pageIndex: 1,
+        totalPage: 1,
+        height: 200,
+        tableData: [],
+        // 默认的刷新，滚动时间，滚动间距
+        // refreshTime: 5,
+        // rollTime: 5,
+        // rollPx: 1,
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 80
+      })
+      // this.autoRoll()
+    },
+    methods: {
+      tableRowClassName ({row, rowIndex}) {
+      },
+      search () {
+        let inData= {number:this.pageIndex};
+        transFerBoardForHunlian(inData).then(({data}) => {
+          this.tableData = data.rows;
+          this.totalPage= data.maxPage;
+          if(this.pageIndex+1>data.maxPage){
+            this.pageIndex=1
+          }else {
+            this.pageIndex=this.pageIndex+1
+          }
+        })
+      },
+      // 鼠标进入
+      // mouseEnter (time) {
+      //   // 鼠标进入停止滚动和切换的定时任务
+      //   this.autoRoll(true)
+      // },
+// 鼠标离开
+//       mouseLeave () {
+//         // 开启
+//         this.autoRoll()
+//       },
+// 设置自动滚动
+//       autoRoll (stop) {
+//         if (stop) {
+//           clearInterval(rolltimer)
+//           return
+//         }
+//         // 拿到表格挂载后的真实DOM
+//         const table = this.$refs.wt_table
+//         // 拿到表格中承载数据的div元素
+//         const divData = table.bodyWrapper
+//         // 拿到元素后，对元素进行定时增加距离顶部距离，实现滚动效果
+//         rolltimer = setInterval(() => {
+//           // 元素自增距离顶部像素
+//           divData.scrollTop = this.decimalUtil.add(Number(divData.scrollTop), Number(this.rollPx))
+//           // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度)
+//           if (divData.clientHeight + divData.scrollTop +1>= divData.scrollHeight) {
+//             // 重置table距离顶部距离
+//               divData.scrollTop = 0
+//           }
+//         }, this.rollTime * 10)
+//       },
+      refreshTable () {
+        refresher = setInterval(() => {
+          this.search()
+        }, 30000)
+      }
+    },
+    created () {
+      this.search()
+      this.refreshTable()
+    }
+  }
+</script>
+
+<style >
+
+
+  .board2 .el-table .cell {
+    line-height: 13px;
+    font-size: 12px;
+    height: 13px;
+    padding: 0px;
+  }
+
+  .board2 .el-table .success-row {
+    background: #1bb61b;
+  }
+  .board2 .el-table .false-row {
+    /*background: #cbcb14;*/
+    background: #db1212;
+  }
+  .board2 .el-table .yellow-row{
+    background: #ffff00;
+  }
+</style>
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 99dedc5..0fc38f8 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -22,11 +22,11 @@
           <el-option label="日计划派工单" value="日计划派工单"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="'是否报工完成'">
+      <el-form-item :label="'派工单是否关闭'">
         <el-select v-model="searchData.reportFlag" style="width: 120px">
           <el-option label="全部" value=""></el-option>
-          <el-option label="是" value="QtyReported>=QtyRequired"></el-option>
-          <el-option label="否" value="QtyRequired>QtyReported"></el-option>
+          <el-option label="是" value="closedFlag='Y'"></el-option>
+          <el-option label="否" value="closedFlag='N'"></el-option>
         </el-select>
       </el-form-item>
     </el-form>
@@ -567,7 +567,7 @@
           site: this.$store.state.user.site,
           itemNo:'',
           scheduleType:'',
-          reportFlag:'QtyRequired>QtyReported',
+          reportFlag:"closedFlag='N'",
           startDate:'',
           endDate:'',
           operatorName:'',
diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
index b491515..e2bb4cb 100644
--- a/src/views/modules/production/scheduleForSOTask.vue
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -159,6 +159,13 @@
         min-width="80"
         label="订单数量">
       </el-table-column>
+      <el-table-column
+        prop="qtyfinished"
+        header-align="center"
+        align="right"
+        min-width="90"
+        label="打料完成数量">
+      </el-table-column>
       <el-table-column
         prop="scheduledQty"
         header-align="center"
@@ -507,6 +514,12 @@
           })
           return false
         }
+        if (row.qtyfinished == 0) {
+          this.$alert('该日计划尚未打料完成！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
         this.schedulingModalData = {
           orderNo: row.orderNo,
           site: row.site,
diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue
index b4d9ce4..3b66902 100644
--- a/src/views/modules/production/soscheduleRouting.vue
+++ b/src/views/modules/production/soscheduleRouting.vue
@@ -25,8 +25,8 @@
       <el-form-item :label="'是否报工完成'">
         <el-select v-model="searchData.reportFlag" style="width: 120px">
           <el-option label="全部" value=""></el-option>
-          <el-option label="是" value="QtyReported>=QtyRequired"></el-option>
-          <el-option label="否" value="QtyRequired>QtyReported"></el-option>
+          <el-option label="是" value="QtyApprove>=QtyRequired"></el-option>
+          <el-option label="否" value="QtyRequired>QtyApprove"></el-option>
         </el-select>
       </el-form-item>
     </el-form>
@@ -338,7 +338,7 @@
           site: this.$store.state.user.site,
           itemNo:'',
           scheduleType:'',
-          reportFlag:'QtyRequired>QtyReported',
+          reportFlag:'QtyRequired>QtyApprove',
           startDate:'',
           endDate:'',
           operatorName:'',