diff --git a/src/views/modules/print/print_package_label.js b/src/views/modules/print/print_package_label.js
index 6f36ab1..f01f59d 100644
--- a/src/views/modules/print/print_package_label.js
+++ b/src/views/modules/print/print_package_label.js
@@ -21,11 +21,11 @@ export function printPackageLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(136,18,128,24,"Cust.P/O:");
+      LODOP.ADD_PRINT_TEXT(153,18,128,24,"Cust.P/O:");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(136,141,145,25,printData.orderRef4);
+      LODOP.ADD_PRINT_TEXT(153,141,145,25,printData.orderRef4);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
@@ -37,11 +37,11 @@ export function printPackageLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(158,18,125,25,"MFG Lot:");
+      LODOP.ADD_PRINT_TEXT(175,18,125,25,"MFG Lot:");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(158,141,142,25,printData.batchNo);
+      LODOP.ADD_PRINT_TEXT(175,141,142,25,printData.batchNo);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
@@ -54,11 +54,11 @@ export function printPackageLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.SET_PRINT_STYLEA(0,"LineSpacing",-5);
-      LODOP.ADD_PRINT_TEXT(180,18,128,25,"MFG Date:");
+      LODOP.ADD_PRINT_TEXT(197,18,128,25,"MFG Date:");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(180,141,144,25,printData.receiveDate);
+      LODOP.ADD_PRINT_TEXT(197,141,144,25,printData.receiveDate);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
@@ -69,13 +69,13 @@ export function printPackageLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
-      LODOP.ADD_PRINT_TEXT(116,238,58,25,"Q.T.Y:");
+      LODOP.ADD_PRINT_TEXT(135,18,58,25,"Q.T.Y:");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
       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 + printData.umid);
+      LODOP.ADD_PRINT_TEXT(135,141,120,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);
@@ -92,6 +92,11 @@ export function printPackageLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(113,229,144,26,"Job No:"+printData.seqNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       if(printData.code=='CODE128') {
         LODOP.ADD_PRINT_BARCODE(40,143,236,23, "128A", printData.partSpec);
       }else {
diff --git a/src/views/modules/production/cancelSfdc.vue b/src/views/modules/production/cancelSfdc.vue
index e39445d..d859af9 100644
--- a/src/views/modules/production/cancelSfdc.vue
+++ b/src/views/modules/production/cancelSfdc.vue
@@ -365,6 +365,23 @@
             serialNumber: null,
             columnType: null,
             align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "jobType",
+            columnLabel: "派工类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'center'
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
diff --git a/src/views/modules/production/cancelSfdcForWareHouse.vue b/src/views/modules/production/cancelSfdcForWareHouse.vue
index 5cefd03..49eb4ee 100644
--- a/src/views/modules/production/cancelSfdcForWareHouse.vue
+++ b/src/views/modules/production/cancelSfdcForWareHouse.vue
@@ -307,6 +307,23 @@
             serialNumber: null,
             columnType: null,
             align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "jobType",
+            columnLabel: "派工类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'center'
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
diff --git a/src/views/modules/production/closeSchedule.vue b/src/views/modules/production/closeSchedule.vue
index 2e3eee2..b109e23 100644
--- a/src/views/modules/production/closeSchedule.vue
+++ b/src/views/modules/production/closeSchedule.vue
@@ -189,6 +189,13 @@
         min-width="80"
         label="派工数量">
       </el-table-column>
+      <el-table-column
+        prop="jobType"
+        header-align="center"
+        align="center"
+        min-width="70"
+        label="派工类型">
+      </el-table-column>
       <el-table-column
         prop="weight"
         header-align="center"
@@ -436,7 +443,7 @@
           '机台ID': 'sResourceID',
           '班次': 'sShiftNo',
           '加工中心': 'sWorkCenterNo',
-
+          '派工类型': 'jobType',
         },
         exportName: '派工单列表' + this.getStrDate(),
         exportHeader: ['派工单列表'],
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 139eb51..055bbc2 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -204,6 +204,13 @@
         min-width="80"
         label="派工数量">
       </el-table-column>
+      <el-table-column
+        prop="jobType"
+        header-align="center"
+        align="center"
+        min-width="70"
+        label="派工类型">
+      </el-table-column>
       <el-table-column
         prop="weight"
         header-align="center"
@@ -677,7 +684,7 @@
           '机台ID': 'sResourceID',
           '班次': 'sShiftNo',
           '加工中心': 'sWorkCenterNo',
-
+          '派工类型': 'jobType',
         },
         exportName: '派工单列表' + this.getStrDate(),
         exportHeader: ['派工单列表'],
diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
index e9b87e4..7b187f8 100644
--- a/src/views/modules/production/scheduleForSOTask.vue
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -393,7 +393,6 @@
                 v-model="scope.row.scheduleDate"
                 type="date"
                 value-format="yyyy-MM-dd"
-                @change="getTodayShiftNo2(scope.$index)"
                 placeholder="选择日期">
               </el-date-picker>
             </template>
@@ -450,6 +449,21 @@
               </el-select>
             </template>
           </el-table-column>
+          <el-table-column
+            prop="shiftNo"
+            header-align="center"
+            align="left"
+            min-width="80"
+            label="派工类型">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.jobType" placeholder="请选择" style="height: 12px;padding: 0px " filterable
+                         allow-create>
+                <el-option label="计件" value="计件"></el-option>
+                <el-option label="计时" value="计时"></el-option>
+                <el-option label="外协" value="外协"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="operatorId"
             header-align="center"
@@ -694,7 +708,8 @@
             shiftNo: this.schedulingModalData.shiftNo,
             scheduleDate: null,
             operatorId:this.schedulingModalData.operatorId,
-            createBy:this.$store.state.user.name
+            createBy:this.$store.state.user.name,
+            jobType:'',
           }
         if(this.schedulingModalData.partPlanQty!=null&&this.schedulingModalData.partPlanQty!=''&&this.schedulingModalData.partPlanQty!=0){
           data.scheduleQty=this.schedulingModalData.partPlanQty;
@@ -780,6 +795,13 @@
             })
             return false
           }
+          if(this.schedulingModalTableData[i].jobType==''||this.schedulingModalTableData[i].jobType==null){
+            this.$alert('请选择派工类型！', '错误', {
+              confirmButtonText: '确定'
+
+            })
+            return false
+          }
           if(''==this.schedulingModalTableData[i].scheduleDate||this.schedulingModalTableData[i].scheduleDate==null){
             this.$alert('存在派工记录没有填写日期！', '错误', {
               confirmButtonText: '确定'
diff --git a/src/views/modules/production/scheduleForShopOrder.vue b/src/views/modules/production/scheduleForShopOrder.vue
index a3563d3..05b4d6e 100644
--- a/src/views/modules/production/scheduleForShopOrder.vue
+++ b/src/views/modules/production/scheduleForShopOrder.vue
@@ -478,6 +478,21 @@
               </el-select>
             </template>
           </el-table-column>
+          <el-table-column
+            prop="shiftNo"
+            header-align="center"
+            align="left"
+            min-width="80"
+            label="派工类型">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.jobType" placeholder="请选择" style="height: 12px;padding: 0px " filterable
+                         allow-create>
+                <el-option label="计件" value="计件"></el-option>
+                <el-option label="计时" value="计时"></el-option>
+                <el-option label="外协" value="外协"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="operatorId"
             header-align="center"
@@ -753,6 +768,7 @@
           operatorId:this.schedulingModalData.operatorId,
           createBy:this.$store.state.user.name,
           materialWeight:'',
+          jobType:'',
         }
         if(this.schedulingModalData.partPlanQty!=null&&this.schedulingModalData.partPlanQty!=''&&this.schedulingModalData.partPlanQty!=0){
           data.scheduleQty=this.schedulingModalData.partPlanQty;
@@ -831,6 +847,13 @@
             })
             return false
           }
+          if(this.schedulingModalTableData[i].jobType==''||this.schedulingModalTableData[i].jobType==null){
+            this.$alert('请选择派工类型！', '错误', {
+              confirmButtonText: '确定'
+
+            })
+            return false
+          }
           if(''==this.schedulingModalTableData[i].resourceId||this.schedulingModalTableData[i].resourceId==null){
             this.$alert('存在派工记录没有选择机台！', '错误', {
               confirmButtonText: '确定'
diff --git a/src/views/modules/production/searchSfdc.vue b/src/views/modules/production/searchSfdc.vue
index 2b048e8..4987746 100644
--- a/src/views/modules/production/searchSfdc.vue
+++ b/src/views/modules/production/searchSfdc.vue
@@ -353,6 +353,23 @@
             serialNumber: null,
             columnType: null,
             align: 'left'
+          }, {
+            tableId: "sfdcList",
+            tableName: this.$route.meta.title,
+            columnProp: "jobType",
+            columnLabel: "派工类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 80,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'center'
           }, {
             tableId: "sfdcList",
             tableName: this.$route.meta.title,
diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue
index 7774f3a..794fb8c 100644
--- a/src/views/modules/production/soscheduleRouting.vue
+++ b/src/views/modules/production/soscheduleRouting.vue
@@ -190,6 +190,13 @@
         min-width="80"
         label="派工数量">
       </el-table-column>
+      <el-table-column
+        prop="jobType"
+        header-align="center"
+        align="center"
+        min-width="70"
+        label="派工类型">
+      </el-table-column>
       <el-table-column
         prop="weight"
         header-align="center"
@@ -397,6 +404,7 @@
           '上道派工单': 'previousSeqNo',
           '发料批号': 'previousBatchNo',
           '发料派工单': 'materSeqNo',
+          '派工类型': 'jobType',
         },
         exportName: '派工单列表' + this.getStrDate(),
         exportHeader: ['派工单列表'],