From da2b7358b34d07d8e8576cf4eace8f6a7ccec3fb Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 3 Nov 2023 14:22:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=B7=A5=E5=8D=95=E5=8A=A0?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/plan/order.js              | 13 ++++++
 src/views/mes/reportWork/index.vue |  5 +--
 src/views/plan/order/index.vue     | 72 +++++++++++++++++++++---------
 src/views/plan/workorder/index.vue | 12 ++++-
 4 files changed, 78 insertions(+), 24 deletions(-)

diff --git a/src/api/plan/order.js b/src/api/plan/order.js
index 087ef90f..42c6e709 100644
--- a/src/api/plan/order.js
+++ b/src/api/plan/order.js
@@ -33,6 +33,19 @@ export function getProRoutes(prodCode) {
   })
 }
 
+// 获取当天的递增工单执行顺序
+export function getProSortNo(productDate) {
+	const data = {
+		productDate
+	}
+	return request({
+		url: '/plan/order/getProSortNo',
+		method: 'put',
+		data: data
+	})
+}
+
+
 // 通过工艺code获取设备信息
 export function getProEquipment(routeCode) {
   return request({
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 022181a5..777a522a 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -361,7 +361,7 @@
       			:total="consumeTotal"
       			:page.sync="consumeQueryParams.consumePageNum"
       			:limit.sync="consumeQueryParams.consumePageSize"
-      			@pagination="getReportWorkConsumeList"
+      			@pagination="getList"
       		/>
 		</el-dialog>
 
@@ -370,7 +370,6 @@
 
 <script>
 import { listReportWork, getReportWork, delReportWork, addReportWork, updateReportWork } from "@/api/mes/reportWork";
-import { listReportWorkConsume, getReportWorkConsume, delReportWorkConsume, addReportWorkConsume, updateReportWorkConsume} from "@/api/mes/reportWorkConsume";
 import ReportWorkConsume from "./reportWorkConsume.vue";
 
 export default {
@@ -543,7 +542,7 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = "添加报工报表";
+			this.title = "添加报工记录";
 			this.optType = "add";
 		},
 		/** 修改按钮操作 */
diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index f43d67ff..dcd085eb 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -388,13 +388,15 @@
             </el-form-item>
           </el-col>
           <el-col :offset="1" :span="7">
-            <el-form-item label="选择设备:">
-              <el-cascader
-                @focus="changeEquipment"
-                :options="eRouteOptions"
-                :props="eRouteProps"
-                v-model="splitForm.prodLineCodeArray"
-                clearable></el-cascader>
+            <!-- 工单日期 -->
+            <el-form-item size="small" label="工单日期: ">
+              <el-date-picker @change="checkDate" v-model="splitForm.productDate" type="date" placeholder="选择日期"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :offset="1" :span="7">
+            <el-form-item label="工单排序(插单<=0)" label-width="130px">
+              <el-input type="number" v-model="splitForm.sortNo"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -416,11 +418,17 @@
               <el-input required type="number" @input="splitNumChange" v-model="splitForm.splitNum"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :offset="1" :span="5">
-            <!-- 工单日期 -->
-            <el-form-item size="small" label="工单日期: ">
-              <el-date-picker @change="checkDate" v-model="splitForm.productDate" type="date" placeholder="选择日期"
-              ></el-date-picker>
+        </el-row>
+        <el-row>
+          <el-col :span="7">
+            <el-form-item label="选择设备:">
+             <div style="height: 130px;overflow-y: auto;">
+              <el-cascader
+                :options="eRouteOptions"
+                :props="eRouteProps"
+                v-model="splitForm.prodLineCodeArray"
+                clearable></el-cascader>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
@@ -483,7 +491,7 @@
 import {
   getCascadeProOrder,
   getProEquipment,
-  getProRoutes,
+  getProRoutes,getProSortNo,
   getProShifts,
   getWorkOrderList,
   subSplitOrder,
@@ -801,6 +809,7 @@ export default {
     splitBtn(e) {
       // 获取级联订单信息
       var row;
+      let _this = this;
       getCascadeProOrder(e.orderCode).then(response => {
         row = response.data
 
@@ -843,6 +852,12 @@ export default {
           this.routes = response.data
         })
 
+        var ymd = moment(this.splitForm.productDate).format('YYYY-MM-DD')
+        // 获取工单生产顺序
+        getProSortNo(ymd).then(response => {
+          _this.splitForm.sortNo = response
+        })
+
         this.workerLoading = true // 设置加载状态为true，表示正在加载
         // 获取历史拆分工单信息
         getWorkOrderList(row.id).then(response => {
@@ -946,7 +961,8 @@ export default {
     },
     // 拆分-校验工单日期
     checkDate(e) {
-      var now = new Date()
+      var now = new Date();
+      let _this = this;
       if (e < now) {
         e = now
         this.splitForm.productDate = now
@@ -954,6 +970,12 @@ export default {
           message: "工单日期不能早于今天",
           type: "warning"
         })
+      }else{
+        var ymd = moment(this.splitForm.productDate).format('YYYY-MM-DD')
+        // 获取工单生产顺序
+        getProSortNo(ymd).then(response => {
+          _this.splitForm.sortNo = response
+        })
       }
     },
     // 拆分-校验拆分批次号是否重复
@@ -1068,6 +1090,13 @@ export default {
         })
         return
       }
+      if (this.splitForm.sortNo == null) {
+        this.$message({
+          message: '工单生产顺序不能为空！',
+          type: 'warning'
+        })
+        return
+      }
       if (this.splitForm.prodLineCodeArray.length == 0) {
         this.$message({
           message: '请选择各流程节点的设备！',
@@ -1139,7 +1168,8 @@ export default {
         shiftId: this.splitForm.shiftId,
         splitNum: this.splitForm.splitNum,
         product: this.productData[0],
-        routeCode: this.splitForm.routeCode
+        routeCode: this.splitForm.routeCode,
+        sortNo: this.splitForm.sortNo
       }
 
       subSplitOrder(data).then(response => {
@@ -1160,7 +1190,7 @@ export default {
         splitNum: null,
         productDate: null,
         shiftId: null,
-        formFields: []
+        formFields: [],
       }
       this.formFields = [{
         batchCode: '',
@@ -1256,11 +1286,13 @@ export default {
     handleSyncSAP() {
       this.loading = true;
       let _this = this;
-      this.$modal.confirm('是否确认SAP同步操作步骤？').then(function () {
-        return syncSAP()
+      this.$modal.confirm('是否确认SAP同步操作步骤？执行后，需要一分钟后查看同步结果').then(function () {
+        _this.loading = false;
+        syncSAP()
+        
       }).then(() => {
-        this.getList()
-        this.loading = false;
+        //this.getList()
+        _this.loading = false;
         this.$modal.msgSuccess('同步成功')
       }).catch(
         function (e) {
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index 8dd34b14..aeef2919 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -395,6 +395,10 @@
             <el-form-item v-if="checkType" size="small" label="分配车数:">
               <el-input disabled type="number" @input="changeCarNum" v-model="splitForm.carNum"></el-input>
             </el-form-item>
+
+            <el-form-item v-else label="工单排序(插单<=0)" label-width="130px">
+              <el-input type="number" v-model="splitForm.sortNo" disabled></el-input>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -526,7 +530,7 @@ import {
   listWorkorder,
   delWorkorder,
   downWorkorder,
-  getOrderAndWork,
+  getOrderAndWork,getProSortNo,
   getWorkBatchList,
   subChangeWorkOrder,
   checkWorkOrder
@@ -890,6 +894,11 @@ export default {
             }
             // 订单为成品
             if (this.productData[0],prototype != 'white'){
+
+              if(this.splitData[0].sortNo != null){
+                this.splitForm.sortNo = this.splitData[0].sortNo
+              }
+
               // 递归将拆分数量还原
               function setAtrr1(order, work) {
                 order.quantitySplit = Number(order.quantitySplit) - Number(work.quantitySplit);
@@ -901,6 +910,7 @@ export default {
               }
 
               setAtrr1(this.productData[0], this.splitData[0]);
+              
             }
 
           })