diff --git a/src/api/shopOrder/shopOrder.js b/src/api/shopOrder/shopOrder.js
index cb48304..7375f5b 100644
--- a/src/api/shopOrder/shopOrder.js
+++ b/src/api/shopOrder/shopOrder.js
@@ -103,3 +103,9 @@ export const shopNoticeSearch = data => createAPI('/shopOrder/shopNoticeSearch',
 // 获取文件export const downLoadObjectFile = data => createAPI(`pms/eamObject/downLoadObjectFile?id=`+data.id,'post',777)
 export const downLoadObjectFile = data => createAPI(`shopOrder/downLoadObjectFile?id=`+data.id,'post',777)
 
+// 派工单上移
+export const resortJobUp = data => createAPI('/scheduling/resortJobUp', 'post', data)
+
+// 派工单下移
+export const resortJobDown = data => createAPI('/scheduling/resortJobDown', 'post', data)
+
diff --git a/src/views/modules/schedule/order_schedule_expand.vue b/src/views/modules/schedule/order_schedule_expand.vue
index 4ff6edb..6fe61ec 100644
--- a/src/views/modules/schedule/order_schedule_expand.vue
+++ b/src/views/modules/schedule/order_schedule_expand.vue
@@ -124,7 +124,7 @@
               </el-select>
             </span>
             <span v-if="!item.columnHidden && item.columnProp == 'qtyToSchedule'">
-              <el-input v-model="scope.row.qtyToSchedule" type="number"></el-input>
+              <el-input-number :controls="false" :step="0" v-model="scope.row.qtyToSchedule"></el-input-number>
             </span>
             <span v-else> {{ scope.row[item.columnProp] }}</span>
           </template>
@@ -359,7 +359,6 @@ export default {
           status: true,
           fixed: false
         },
-
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
@@ -369,7 +368,7 @@ export default {
           columnProp: "qtyToSchedule",
           headerAlign: "center",
           align: "center",
-          columnLabel: "待排产数量",
+          columnLabel: "可排产数",
           columnWidth: 120,
           columnHidden: false,
           columnImage: false,
@@ -458,9 +457,9 @@ export default {
           tableName: "工单表",
           columnProp: "orderNo",
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: "订单号",
-          columnWidth: 80,
+          columnWidth: 120,
           columnHidden: false,
           columnImage: false,
           columnSortable: true,
@@ -476,7 +475,7 @@ export default {
           tableName: "工单表",
           columnProp: "itemNo",
           headerAlign: "center",
-          align: "center",
+          align: "right",
           columnLabel: "工序号",
           columnWidth: 80,
           columnHidden: false,
@@ -494,9 +493,9 @@ export default {
           tableName: "工单表",
           columnProp: "itemDesc",
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: "工序名称",
-          columnWidth: 100,
+          columnWidth: 120,
           columnHidden: false,
           columnImage: false,
           columnSortable: true,
@@ -530,9 +529,9 @@ export default {
           tableName: "工单表",
           columnProp: "partNo",
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: "产品编码",
-          columnWidth: 100,
+          columnWidth: 120,
           columnHidden: false,
           columnImage: false,
           columnSortable: true,
@@ -543,17 +542,17 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderCustomerName',
+          serialNumber: '5301OrderPartDesc',
           tableId: "5301Order",
           tableName: "工单表",
-          columnProp: "customerName",
+          columnProp: "partDesc",
           headerAlign: "center",
-          align: "center",
-          columnLabel: "客户名称",
-          columnWidth: 80,
+          align: "left",
+          columnLabel: "产品名称",
+          columnWidth: 200,
           columnHidden: false,
           columnImage: false,
-          columnSortable: true,
+          columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: false
@@ -561,13 +560,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderCustPartNo',
+          serialNumber: '5301OrderCustomerName',
           tableId: "5301Order",
           tableName: "工单表",
-          columnProp: "custPartNo",
+          columnProp: "customerName",
           headerAlign: "center",
-          align: "center",
-          columnLabel: "客户产品料号",
+          align: "left",
+          columnLabel: "客户名称",
           columnWidth: 120,
           columnHidden: false,
           columnImage: false,
@@ -579,17 +578,17 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5301,
-          serialNumber: '5301OrderPartDesc',
+          serialNumber: '5301OrderCustPartNo',
           tableId: "5301Order",
           tableName: "工单表",
-          columnProp: "partDesc",
+          columnProp: "custPartNo",
           headerAlign: "center",
-          align: "center",
-          columnLabel: "产成品名称",
-          columnWidth: 80,
+          align: "left",
+          columnLabel: "客户产品料号",
+          columnWidth: 120,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -602,7 +601,7 @@ export default {
           tableName: "工单表",
           columnProp: "lotSize",
           headerAlign: "center",
-          align: "center",
+          align: "right",
           columnLabel: "订单量",
           columnWidth: 80,
           columnHidden: false,
@@ -621,8 +620,8 @@ export default {
           columnProp: "qtyToSchedule",
           headerAlign: "center",
           align: "center",
-          columnLabel: "待排产数量",
-          columnWidth: 120,
+          columnLabel: "可排产数",
+          columnWidth: 80,
           columnHidden: false,
           columnImage: false,
           columnSortable: true,
@@ -638,9 +637,9 @@ export default {
           tableName: "工单表",
           columnProp: "qtyScheduled",
           headerAlign: "center",
-          align: "center",
-          columnLabel: "已排产数量",
-          columnWidth: 120,
+          align: "right",
+          columnLabel: "已排产数",
+          columnWidth: 80,
           columnHidden: false,
           columnImage: false,
           columnSortable: true,
@@ -656,9 +655,9 @@ export default {
           tableName: "工单表",
           columnProp: "qtyReported",
           headerAlign: "center",
-          align: "center",
-          columnLabel: "已报工数量",
-          columnWidth: 120,
+          align: "right",
+          columnLabel: "完工数量",
+          columnWidth: 80,
           columnHidden: false,
           columnImage: false,
           columnSortable: true,
@@ -674,27 +673,9 @@ export default {
           tableName: "工单表",
           columnProp: "spec",
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: "规格型号",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5301,
-          serialNumber: '5301OrderSite',
-          tableId: "5301Order",
-          tableName: "工单表",
-          columnProp: "site",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "工厂编号",
-          columnWidth: 80,
+          columnWidth: 100,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -710,7 +691,7 @@ export default {
           tableName: "工单表",
           columnProp: "workCenterNo",
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: "加工中心",
           columnWidth: 100,
           columnHidden: false,
@@ -728,9 +709,9 @@ export default {
           tableName: "工单表",
           columnProp: "nextItemNo",
           headerAlign: "center",
-          align: "center",
+          align: "right",
           columnLabel: "下道工序",
-          columnWidth: 100,
+          columnWidth: 80,
           columnHidden: false,
           columnImage: false,
           columnSortable: true,
@@ -746,9 +727,9 @@ export default {
           tableName: "工单表",
           columnProp: "nextItemDesc",
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: "下道工序名称",
-          columnWidth: 80,
+          columnWidth: 120,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -766,7 +747,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "下道工序已排产",
-          columnWidth: 150,
+          columnWidth: 120,
           columnHidden: false,
           columnImage: false,
           columnSortable: true,
@@ -782,7 +763,7 @@ export default {
           tableName: "工单表",
           columnProp: "preItemNo",
           headerAlign: "center",
-          align: "center",
+          align: "right",
           columnLabel: "上道工序",
           columnWidth: 80,
           columnHidden: false,
@@ -800,9 +781,9 @@ export default {
           tableName: "工单表",
           columnProp: "preItemDesc",
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: "上道工序名称",
-          columnWidth: 80,
+          columnWidth: 120,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -820,7 +801,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "上道工序已排产",
-          columnWidth: 80,
+          columnWidth: 100,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -854,9 +835,9 @@ export default {
           tableName: "工单表",
           columnProp: "availResource",
           headerAlign: "center",
-          align: "center",
+          align: "left",
           columnLabel: "可用机台",
-          columnWidth: 80,
+          columnWidth: 120,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -874,7 +855,7 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "录入日期",
-          columnWidth: 125,
+          columnWidth: 130,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -890,7 +871,7 @@ export default {
           tableName: "工单表",
           columnProp: "scheduleToPlanTime",
           headerAlign: "center",
-          align: "center",
+          align: "right",
           columnLabel: "计划时间",
           columnWidth: 80,
           columnHidden: false,
@@ -908,7 +889,7 @@ export default {
           tableName: "工单表",
           columnProp: "machRunFactor",
           headerAlign: "center",
-          align: "center",
+          align: "right",
           columnLabel: "单位产出",
           columnWidth: 80,
           columnHidden: false,
@@ -926,7 +907,7 @@ export default {
           tableName: "工单表",
           columnProp: "machSetupTime",
           headerAlign: "center",
-          align: "center",
+          align: "right",
           columnLabel: "调机时间",
           columnWidth: 80,
           columnHidden: false,
@@ -962,9 +943,9 @@ export default {
           tableName: "工单表",
           columnProp: "qtyScheduledPreOps",
           headerAlign: "center",
-          align: "center",
+          align: "right",
           columnLabel: "前道工序已排产数量",
-          columnWidth: 80,
+          columnWidth: 110,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -980,9 +961,9 @@ export default {
           tableName: "工单表",
           columnProp: "qtyApprovedPreOps",
           headerAlign: "center",
-          align: "center",
+          align: "right",
           columnLabel: "前道工序已报合格数",
-          columnWidth: 80,
+          columnWidth: 110,
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1016,7 +997,7 @@ export default {
           tableName: "工单表",
           columnProp: "efficiency",
           headerAlign: "center",
-          align: "center",
+          align: "right",
           columnLabel: "效率",
           columnWidth: 80,
           columnHidden: false,
diff --git a/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue b/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
index 10d6e61..54f42fd 100644
--- a/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
+++ b/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
@@ -71,9 +71,8 @@
         <el-input v-model="searchData.site" style="width: 80px"></el-input>
         <el-checkbox style="margin-left: 2px;margin-top: 0px" v-model="searchData.checked">仅显示当前排产的派工单
         </el-checkbox>
-        <el-button @click="getData()" type="primary" style="margin-left: 100px;margin-top: 0px">{{ '查询' }}</el-button>
-        <el-button @click="warnCancelScheduleConfirm" type="primary"
-                   style="margin-left: 30px; margin-top: 0px; margin-right: 20px;">{{ '取消排产' }}
+        <el-button @click="getData()" style="margin-left: 20px" type="primary">{{ '查询' }}</el-button>
+        <el-button @click="warnCancelScheduleConfirm" type="primary">{{ '取消排产' }}
         </el-button>
         <download-excel
           :fields="fields()"
@@ -89,8 +88,10 @@
           class="el-button el-button--primary el-button--medium">
           {{ buttons.download }}
         </download-excel>
-        <el-button @click="userSetting" style="margin-left: 28px;" type="primary">{{ buttons.settingTable }}</el-button>
+        <el-button @click="userSetting" type="primary">{{ buttons.settingTable }}</el-button>
         <el-button v-if="showDefault" @click="saveColumnList()" type="primary">{{ buttons.defaultTable }}</el-button>
+        <el-button @click="moveUp" type="primary">上移</el-button>
+        <el-button @click="moveDown" type="primary">下移</el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -99,7 +100,6 @@
       border
       highlight-current-row
       @row-click="setCurrentSchedulingRow"
-
       @row-dblclick="warnCancelScheduleConfirm"
       v-loading="dataListLoading"
       style="width: 100%;">
@@ -145,6 +145,8 @@ import {
 import {
   searchProductionDispatchList,
   cancelScheduleWithScheduleQuery,
+  resortJobUp,
+  resortJobDown,
 } from "@/api/shopOrder/shopOrder.js"
 
 export default {
@@ -208,6 +210,24 @@ export default {
         settingLanguage: "按控件设置"
       },
       columnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 6023,
+          serialNumber: '6023TableSScheduledSeqNo',
+          tableId: "6023Table",
+          tableName: "查询生产派工单表",
+          columnProp: "sScheduledSeqNo",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "订单优先级",
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 6023,
@@ -1106,6 +1126,65 @@ export default {
       });
     },
 
+    /*派工单上移*/
+    moveUp() {
+      //先判断是否已经选好了行要操作
+      if (!this.scheduleRow) {
+        this.$message.warning('请先选择派工单!');
+        return false;
+      }
+      //设置参数
+      console.log(this.scheduleRow)
+      const params = {
+        site: this.scheduleRow.site,
+        workCenterNo: this.scheduleRow.workCenterNo,
+        resourceId: this.scheduleRow.sResourceID,
+        scheduleSeqNo: this.scheduleRow.sScheduledSeqNo,
+        resortDirection: 'S'
+      };
+      //调用上移接口
+      resortJobUp(params).then(({data}) => {
+        if (data.code === 0) {
+          this.$message.success(data.msg || '上移成功');
+          //刷新数据
+          this.getData();
+        } else {
+          this.$message.error(data.msg);
+        }
+      }).catch((error) => {
+        this.$message.error('上移失败');
+      });
+    },
+
+    /*派工单下移*/
+    moveDown() {
+      //先判断是否已经选好了行要操作
+      if (!this.scheduleRow) {
+        this.$message.warning('请先选择派工单!');
+        return false;
+      }
+      //设置参数
+      const params = {
+        site: this.scheduleRow.site,
+        workCenterNo: this.scheduleRow.workCenterNo,
+        resourceId: this.scheduleRow.sResourceID,
+        scheduleSeqNo: this.scheduleRow.sScheduledSeqNo,
+        resortDirection: 'D'
+      };
+      //调用下移接口
+      resortJobDown(params).then(({data}) => {
+        if (data.code === 0) {
+          this.$message.success(data.msg || '下移成功');
+          //刷新数据
+          this.getData();
+        } else {
+          this.$message.error(data.msg);
+        }
+      }).catch((error) => {
+        this.$message.error('下移失败');
+      });
+    },
+
 
     // 打开页面设置
     userSetting() {
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index c822570..bc8d29c 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -352,60 +352,24 @@ export default {
       produceScheduleList: [],
       dataListLoading: false,
       columnList: [
-        // {
-        //   userId: this.$store.state.user.name,
-        //   functionId: 5302,
-        //   serialNumber: '5302ProduceMatIssueFlag',
-        //   tableId: '5302Produce',
-        //   tableName: '待生产工单',
-        //   columnProp: 'matIssueFlag',
-        //   headerAlign: 'center',
-        //   align: 'center',
-        //   columnLabel: '已排料',
-        //   columnWidth: 80,
-        //   columnHidden: false,
-        //   columnImage: false,
-        //   columnSortable: true,
-        //   sortLv: 0,
-        //   status: true,
-        //   fixed: ''
-        // },
-        // {
-        //   userId: this.$store.state.user.name,
-        //   functionId: 5302,
-        //   serialNumber: '5302ProduceToolIssueFlag',
-        //   tableId: '5302Produce',
-        //   tableName: '待生产工单',
-        //   columnProp: 'toolIssueFlag',
-        //   headerAlign: 'center',
-        //   align: 'center',
-        //   columnLabel: '刀模已发',
-        //   columnWidth: 90,
-        //   columnHidden: false,
-        //   columnImage: false,
-        //   columnSortable: true,
-        //   sortLv: 0,
-        //   status: true,
-        //   fixed: ''
-        // },
-        // {
-        //   userId: this.$store.state.user.name,
-        //   functionId: 5302,
-        //   serialNumber: '5302ProducePlateIssueFlag',
-        //   tableId: '5302Produce',
-        //   tableName: '待生产工单',
-        //   columnProp: 'plateIssueFlag',
-        //   headerAlign: 'center',
-        //   align: 'center',
-        //   columnLabel: '印版已发',
-        //   columnWidth: 90,
-        //   columnHidden: false,
-        //   columnImage: false,
-        //   columnSortable: true,
-        //   sortLv: 0,
-        //   status: true,
-        //   fixed: ''
-        // },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceScheduledSeqNo',
+          tableId: '5302Produce',
+          tableName: '待生产工单',
+          columnProp: 'scheduledSeqNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '订单优先级',
+          columnWidth: 80,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: ''
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 5302,