diff --git a/src/api/board.js b/src/api/board.js
index 40c110a..8201bff 100644
--- a/src/api/board.js
+++ b/src/api/board.js
@@ -9,7 +9,7 @@ export const soLiuhuaBoard= data => createAPI(`board/soLiuhuaBoard`,'post',data)
 
 export const transFerBoard= data => createAPI(`board/transFerBoard`,'post',data)
 export const SORoutingBoard= data => createAPI(`board/SORoutingBoard`,'post',data)
-
+export const getPrintsList = data => createAPI(`board/getPrintsList/${data}`,'get',data)
 export const getStockPrintList= data => createAPI(`board/getStockPrintList/${data}`,'get',data)
 export const getStockPrintListHunlian= data => createAPI(`board/getStockPrintListHunlian`,'post',data)
 export const updateStockPrintFlag= data => createAPI(`board/updateStockPrintFlag`,'post',data)
diff --git a/src/router/index.js b/src/router/index.js
index 0e1fc02..b0ec168 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -32,6 +32,7 @@ const globalRoutes = [
   { path: '/padPartPhoto', component: _import('modules/pad/padPartPhoto'), name: 'padPartPhoto', meta: { title: '产品图片' } },
   { path: '/taskReport', component: _import('modules/taskmanage/taskReport'), name: 'taskReport', meta: { title: '任务看板' } },
   { path: '/autoPrintStock', component: _import('modules/autoPrint/autoPrintStock'), name: 'autoPrintStock', meta: { title: '自动打印库存' } },
+  { path: '/autoPrint', component: _import('modules/autoPrint/autoPrint'), name: 'autoPrint', meta: { title: '自动打印标签' } },
   { path: '/autoPrintStockHunlian', component: _import('modules/autoPrint/autoPrintStockHunlian'), name: 'autoPrintStockHunlian', meta: { title: '自动打印混炼胶库存' } },
   { path: '/SORoutingBoardForXiuBian', component: _import('modules/board/SORoutingBoardForXiuBian'), name: 'SORoutingBoardForXiuBian', meta: { title: '修边工序看板' } },
   { path: '/PODetailForW', component: _import('modules/board/PODetailForW'), name: 'PODetailForW', meta: { title: '外购件检验看板' } },
diff --git a/src/views/modules/autoPrint/autoPrint.vue b/src/views/modules/autoPrint/autoPrint.vue
new file mode 100644
index 0000000..9c89828
--- /dev/null
+++ b/src/views/modules/autoPrint/autoPrint.vue
@@ -0,0 +1,91 @@
+<template>
+  <div class="mod-config">
+    <h1>自动打印普通标签</h1>
+  </div>
+</template>
+
+<script>
+  let autoPrint = '' //数据刷新定时器
+  import {
+    getStockPrintList,
+    updateStockPrintFlag,
+    getPrintsList
+  } from '@/api/board.js'
+  import {
+    printMaterialLabel,
+  } from "@/views/modules/print/print_stock_label.js"
+  import {
+    printOutBoxLabel,
+  } from "@/views/modules/print/print_outBox_label.js"
+  import {
+    printPackageLabel,
+  } from "@/views/modules/print/print_package_label.js"
+  export default {
+    name: 'autoPrintStock',
+    data () {
+      return {
+        ip:this.$route.query.ip
+      }
+    },
+    mounted () {
+      this.refreshTable ()
+    },
+    methods: {
+      refreshTable () {
+        autoPrint = setInterval(() => {
+          this.printStock()
+        }, 3000)
+      },
+      printStock(){
+        let ipp='no'
+        if(this.ip){
+          ipp=this.ip
+        }
+        getPrintsList(ipp).then(({data}) => {
+          if (data.code == 0) {
+            let array2=[];
+            if(data.rows2.length>0){
+              for (let i = 0; i < data.rows2.length; i++) {
+                for (let j = 0; j <data.rows2[i].printQty ; j++) {
+                  array2.push(data.rows2[i])
+                }
+              }
+              printOutBoxLabel(array2);
+            }
+            let array3=[];
+            if(data.rows3.length>0){
+              for (let i = 0; i < data.rows3.length; i++) {
+                for (let j = 0; j <data.rows3[i].printQty ; j++) {
+                  array3.push(data.rows3[i])
+                }
+              }
+              printPackageLabel(array3);
+            }
+          }
+        })
+      },
+    },
+  }
+</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/print/print_package_label.js b/src/views/modules/print/print_package_label.js
index 6edd341..15d5b35 100644
--- a/src/views/modules/print/print_package_label.js
+++ b/src/views/modules/print/print_package_label.js
@@ -74,7 +74,7 @@ export function printPackageLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_LINE(37,12,36,364,0,1);
       LODOP.ADD_PRINT_LINE(216,12,215,364,0,1);
-      LODOP.ADD_PRINT_TEXT(116,294,76,25,printData.unitQty);
+      LODOP.ADD_PRINT_TEXT(116,294,76,25,printData.unitQty + printData.umid);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index fa8320a..9e39c77 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -29,7 +29,7 @@
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item :label="'计划完工日期：'">
+        <el-form-item :label="'要求完工日期：'">
           <el-date-picker
             style="width: 130px"
             v-model="searchData.startDate3"
@@ -158,7 +158,7 @@
         header-align="center"
         align="left"
         min-width="50"
-        label="计划完工日期">
+        label="要求完工日期">
       </el-table-column>
       <el-table-column
         prop="lotSize"
@@ -205,7 +205,7 @@
         <el-form-item :label="'计划开工日期：'">
           <el-input v-model="scheduledModelData.planStartDate" readonly style="width: 130px"></el-input>
         </el-form-item>
-        <el-form-item :label="'计划完工日期：'">
+        <el-form-item :label="'要求完工日期：'">
           <el-input v-model="scheduledModelData.needDate" readonly style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'已排产数量：'">
diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
index 18be3c4..5924ea8 100644
--- a/src/views/modules/production/scheduleForSOTask.vue
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -35,6 +35,27 @@
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
+        <el-form-item :label="'计划发货日期：'">
+          <el-date-picker
+            style="width: 130px"
+            v-model="searchData.startDate4"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item style="margin-top: 23px;">
+          <laber style="margin-left: -9px;font-size: 19px">&#10142</laber>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-date-picker
+            style="width: 130px"
+            v-model="searchData.endDate4"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;">
         <el-form-item :label="'状态：'">
@@ -63,6 +84,27 @@
             <el-option label="否" value="N"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item :label="'要求完工日期：'">
+          <el-date-picker
+            style="width: 130px"
+            v-model="searchData.startDate3"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item style="margin-top: 23px;">
+          <laber style="margin-left: -9px;font-size: 19px">&#10142</laber>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-date-picker
+            style="width: 130px"
+            v-model="searchData.endDate3"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item :label="' '">
           <el-button @click="search()" style="margin-left: 24px" type="primary">查询</el-button>
           <download-excel
@@ -169,6 +211,22 @@
         min-width="130"
         label="计划日期">
       </el-table-column>
+      <el-table-column
+        prop="needDate"
+        header-align="center"
+        align="left"
+        sortable
+        width="130"
+        label="要求完工日期">
+      </el-table-column>
+      <el-table-column
+        prop="planShipDate"
+        header-align="center"
+        align="left"
+        sortable
+        width="130"
+        label="计划发货日期">
+      </el-table-column>
       <el-table-column
         prop="orderRef1"
         header-align="center"
@@ -473,6 +531,10 @@
           orderNo: '',
           startDate1: new Date(),
           endDate1: '',
+          startDate3: '',
+          endDate3: '',
+          startDate4: '',
+          endDate4: '',
           status: '(\'已计划\')',
           partNo: '',
           orderRef1:'',
diff --git a/src/views/modules/production/scheduleForShopOrder.vue b/src/views/modules/production/scheduleForShopOrder.vue
index bd1a85f..bf132c7 100644
--- a/src/views/modules/production/scheduleForShopOrder.vue
+++ b/src/views/modules/production/scheduleForShopOrder.vue
@@ -29,7 +29,7 @@
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item :label="'计划完工日期：'">
+        <el-form-item :label="'要求完工日期：'">
           <el-date-picker
             style="width: 130px"
             v-model="searchData.startDate3"
@@ -86,6 +86,27 @@
           <span slot="label" style="" @click="getBaseList(5)"><a herf="#">物料编码</a></span>
           <el-input v-model="searchData.partNo" style="width: 130px"></el-input>
         </el-form-item>
+        <el-form-item :label="'计划发货日期：'">
+          <el-date-picker
+            style="width: 130px"
+            v-model="searchData.startDate4"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item style="margin-top: 23px;">
+          <laber style="margin-left: -9px;font-size: 19px">&#10142</laber>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-date-picker
+            style="width: 130px"
+            v-model="searchData.endDate4"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item :label="'派工情况：'">
           <el-select filterable v-model="searchData.planStatus" style="width: 120px">
             <el-option label="全部" value=""></el-option>
@@ -203,8 +224,17 @@
         prop="needDate"
         header-align="center"
         align="left"
+        sortable
+        width="130"
+        label="要求完工日期">
+      </el-table-column>
+      <el-table-column
+        prop="planShipDate"
+        header-align="center"
+        align="left"
+        sortable
         width="130"
-        label="计划完工日期">
+        label="计划发货日期">
       </el-table-column>
       <el-table-column
         prop="lotSize"
@@ -509,7 +539,7 @@
           "加工中心": "workCenterNo",
           "状态": "status",
           "计划开工日期": "planStartDate",
-          "计划完工日期": "needDate",
+          "要求完工日期": "needDate",
           "订单数量": "lotSize",
           "已派工数量": "scheduledQty",
           "已报工数量": "qtyReported",
@@ -538,6 +568,8 @@
           partNo: '',
           startDate3: '',
           endDate3: '',
+          startDate4: '',
+          endDate4: '',
           site: '',
           planStatus: 'ROUND(a.LotSize,3) >ROUND(ISNULL(SL.scheduledQty,0),3)',
           itemNo:'',