对接mes订单 报工接口

imcs-ui/src/api/Dispatch.js

@@ -119,4 +119,11 @@ export default {
       data
     })
   },
+  automationTask(taskCode){
+    return axiosApi({
+      method: 'GET',
+      url: `/authority/order/automation-task`,
+      data: {taskCode: taskCode}
+    })
+  },
 }

imcs-ui/src/lang/zh/cuttingToolApply.js

@@ -26,6 +26,7 @@ export default {
       cuttingToolPicture: '刀具图片',
       cuttingToolInstallPicture: '安装指导',
       orderName:'订单名称',
+      taskCode:'订单编号',
       orderDeliveryTime:'订单交期',
       orderPartDeliveryTime:'零件交期',
       partNo:'零部件编号',

imcs-ui/src/lang/zh/machining.js

@@ -38,6 +38,7 @@ export default {
         workpieceName: '零件名称',
         orderNo: '订单编号',
 		orderName: '订单名称',
+        taskCode: 'MES订单编码',
         workpieceId: '零件编号',
 		uniqueCode: '零件唯一码',
         createTime: '生成日期',

imcs-ui/src/lang/zh/runCenter.js

@@ -118,6 +118,7 @@ export default {
 			customName: '客户名称',
 			orderNo: '订单编号',
 			orderName: '订单名称',
+			taskCode: 'MES订单编码',
 			bomName: '零件名称',
 			bomAlias: '产品代号',
 			deliveryTime: '订单交货期',
@@ -159,6 +160,7 @@ export default {
 	  		waitBtn: '待计划订单',
 	  		pleseSet: '请设置',
         checkCuttingTool: '刀具校验',
+        mes: 'MES订单',
         downloadOrderTemplate: '下载订单模板',
         uploadOrder: '上传订单',
 	  	},
@@ -168,6 +170,7 @@ export default {
 			oder: {
 				orderNo: '订单编号',
 				orderName: '订单名称',
+        operation: '工序',
 				custDesc: '客户简称',
 				bomName: '零件',
 				planAllNum: '零件总数',

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/outNewOrder/index.vue

@@ -46,9 +46,9 @@
 	      <el-button type="success" icon="el-icon-edit" size="medium" v-has-permission="['order:update']" @click="editOne">
 	        {{ $t("common.edit") }}
 	      </el-button>
-	      <!--<el-button type="danger" icon="el-icon-delete" size="medium" @click="batchDelete">
+	      <el-button type="danger" icon="el-icon-delete" size="medium" @click="batchDelete">
 	        {{ $t("table.delete") }}
-	      </el-button>-->
+	      </el-button>
 	      <el-button type="primary" icon="el-icon-thumb" size="medium" v-has-permission="['order:pushaudit']" @click="audioStatu('1')">{{$t("common.audio.addAudio")}}</el-button>
     	</el-col>
     </el-row>
@@ -338,7 +338,7 @@
 	    	if(status == "3"){
 	    		msg = this.$t("common.audio.aduioFail")+"！"
 	    	}
-	    	orderMgrApi.updateStatus({ id: this.selection[0].id, auditStatus: status}).then(response => {
+	    	orderMgrApi.updateStatus({ ids: this.selection.map(item => item.id), auditStatus: status}).then(response => {
 	        if (response.status == 200) {
 	        	// 如果是审核，成功后，关闭弹出框
 	        	if(status == '2' || status == '3'){
@@ -486,6 +486,10 @@
 	        const res = response.data
 	        if (res.isSuccess) {
 	          this.tableData = res.data
+            console.log(this.tableData)
+
+
+
 	          // 给列表设置条数
 	          this.$emit('setTabNums', res.data.total, 'tab5')
 	        }

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/runningOrder/index.vue

@@ -32,6 +32,10 @@
 		      align="right">
 		    </el-date-picker>
     	</span>
+      <span style="margin-left: 15px;">
+    		<span>{{$t("runCenter.searchForm.taskCode")}}：</span>
+    		<el-input v-model="taskCode"  style="width: 120px;" size="medium"/>
+    	</span>
       <!--<span style="margin-left: 15px;">
 	      <el-button plain type="primary" icon="el-icon-search" size="medium" @click="search">
 	        {{ $t("table.search") }}
@@ -71,7 +75,7 @@
     	<el-col>
         <!-- 刀具校验 -->
         <el-button type="primary" icon="el-icon-data-analysis" size="medium" v-has-permission="['order:checkCuttingTool']" @click="checkCuttingTool">{{$t("runCenter.buttons.checkCuttingTool")}}</el-button>
-
+        <el-button type="primary" icon="el-icon-data-analysis" size="medium" v-has-permission="['order:checkCuttingTool']" @click="clickMes">{{$t("runCenter.buttons.mes")}}</el-button>
     		<el-button type="primary" icon="el-icon-finished" size="medium" v-has-permission="['order:onebtn']" @click="viewPg">{{$t("runCenter.buttons.onebtn")}}</el-button>
         <!--<el-button type="success" icon="el-icon-finished" size="medium" v-has-permission="['order:gostBtn']" @click="editOne">{{$t("runCenter.buttons.gostBtn")}}</el-button>-->
 		<el-button type="primary" icon="el-icon-finished" size="medium" v-has-permission="['order:onebtn']" @click="viewConf" v-show="false">高级排产配置</el-button>
@@ -384,6 +388,7 @@
 	import elDragDialog from '@/directive/el-drag-dialog'
 	import { initQueryParams } from '@/utils/commons'
     import DyPriority from './components/dyPriority.vue'
+  import dispatchMgrApi from "@/api/Dispatch";
 
 	export default {
 	  name: "DraftOrder",
@@ -439,6 +444,7 @@
 	      queryParams: initQueryParams({}),
 	      selection: [],
 	      loading: false,
+        taskCode: '',
 	      tableData: {
 	        total: 0
 	      },
@@ -1135,6 +1141,32 @@
       checkCuttingToolsClose(){
         this.checkCuttingToolsVisible = false
       },
+      clickMes(){
+        console.log(this.taskCode)
+        // eslint-disable-next-line no-empty
+        if(this.taskCode!=''){
+          dispatchMgrApi.automationTask(this.taskCode).then((response)=>{
+            const res = response.data;
+            this.loading = false;
+            if(res.isSuccess){
+              this.$message({
+                message:res.data,
+                type: "success"
+              });
+
+            }
+          })
+
+
+
+        }else{
+          this.$message({
+            message: this.$t("请输入MES订单编码"),
+            type: "warning"
+          })
+          return
+        }
+      }
 	  }
 	}
 </script>