前端接口处理

imcs-ui/src/api/systemMgr/toolQuery.js

@@ -28,6 +28,14 @@ const apiList = {
   getOrderTaskList:{
     method: 'POST',
     url: `/authority/toolQuery/getOrderTaskList`
+  },
+  getXbkDyTaskList:{
+    method: 'POST',
+    url: `/authority/toolQuery/getXbkDyTaskList`
+  },
+  getZcwDyTaskList:{
+    method: 'POST',
+    url: `/authority/toolQuery/getZcwDyTaskList`
   }
 }
 
@@ -73,5 +81,17 @@ export default {
       ...apiList.getOrderTaskList,      
       data
     })
-  }
+  },
+  getXbkDyTaskList (data) {
+    return axiosApi({
+      ...apiList.getXbkDyTaskList,      
+      data
+    }) 
+  },
+  getZcwDyTaskList (data) {
+    return axiosApi({
+      ...apiList.getZcwDyTaskList,      
+      data
+    }) 
+  },
 }

imcs-ui/src/api/systemMgr/toolbar.js

@@ -80,7 +80,11 @@ const apiList = {
   updateUnExeTask: {
     method: 'POST',
     url: `/authority/toolbar/updateUnExeTask`
-  } 
+  },
+  addCallbackCache: {
+    method: 'POST',
+    url: `/authority/toolbar/addCallbackCache`
+  }, 
 }
 
 export default {
@@ -203,5 +207,11 @@ export default {
       ...apiList.updateUnExeTask,
       data 
     })
-  }
+  },
+  addCallbackCache (data) {
+    return axiosApi({
+      ...apiList.addCallbackCache,
+      data
+    })
+  },
 }

imcs-ui/src/views/zuihou/dispatchMgr/toolQuery/Index.vue

@@ -208,6 +208,62 @@
 		</el-form>	  
 	</el-card>
 
+	<el-card class="box-card">
+        <div slot="header" class="clearfix">查询线边库调度任务</div>		
+		<el-form label-width="80px">
+		<el-row :gutter="10"  v-for="task in xbkDyTaskList" :key="task.id">
+			    <el-col :span="4">
+					<el-form-item label="订单名称">
+					 {{ task.orderName}}
+					</el-form-item>	
+				</el-col>
+				<el-col :span="4">
+					<el-form-item label="产品" label-width="100px">
+						{{task.bomDesc}}
+					</el-form-item>
+			    </el-col>
+				<el-col :span="5">
+					<el-form-item label="开始时间" label-width="100px">
+						{{task.startTime}}
+					</el-form-item>
+			    </el-col>
+				<el-col :span="6">
+					<el-form-item label="目标设备" label-width="100px">
+						{{task.resourceDesc}}
+					</el-form-item>
+			    </el-col>								
+		   </el-row>
+		</el-form>	  
+	</el-card>
+
+    <el-card class="box-card">
+        <div slot="header" class="clearfix">查询暂存位调度任务</div>		
+		<el-form label-width="80px">
+		<el-row :gutter="10"  v-for="task in zcwDyTaskList" :key="task.id">
+			    <el-col :span="4">
+					<el-form-item label="订单名称">
+					 {{ task.orderName}}
+					</el-form-item>	
+				</el-col>
+				<el-col :span="4">
+					<el-form-item label="产品" label-width="100px">
+						{{task.bomDesc}}
+					</el-form-item>
+			    </el-col>
+				<el-col :span="5">
+					<el-form-item label="开始时间" label-width="100px">
+						{{task.startTime}}
+					</el-form-item>
+			    </el-col>
+				<el-col :span="6">
+					<el-form-item label="目标设备" label-width="100px">
+						{{task.resourceDesc}}
+					</el-form-item>
+			    </el-col>								
+		   </el-row>
+		</el-form>	  
+	</el-card>
+
 	<el-card class="box-card">
         <div slot="header" class="clearfix">查询缓存关键字</div>		
 		<el-form label-width="80px">
@@ -250,6 +306,8 @@
 		  bizStatuList: [],
 		  agvLockList: [],
 		  cacheCallbackList: [],
+		  xbkDyTaskList:[],
+		  zcwDyTaskList:[],
 		  storgeLockList: [],
 		  cacheKeyList: [],
 		  offlineList:[],
@@ -393,6 +451,36 @@
 					return true		
 			})
 		},
+		getXbkDyTaskList(){
+            toolQueryApi.getXbkDyTaskList({}).then(response=>{
+						const res = response.data						
+						if(res.isSuccess){
+							this.xbkDyTaskList = res.data.data
+						}else{
+							this.$message({
+              					message: res.msg,
+              					type: 'warning'
+            				})
+						}
+				}).finally(()=>{
+					return true		
+			})
+		},
+		getZcwDyTaskList(){
+            toolQueryApi.getZcwDyTaskList({}).then(response=>{
+						const res = response.data						
+						if(res.isSuccess){
+							this.zcwDyTaskList = res.data.data
+						}else{
+							this.$message({
+              					message: res.msg,
+              					type: 'warning'
+            				})
+						}
+				}).finally(()=>{
+					return true		
+			})
+		},
 	    fetch () {
 	      	this.getBizStatusList()
 			this.getAgvLockList()
@@ -401,6 +489,8 @@
 			this.getCacheKeyList()
 			this.getOfflineList()
 			this.getOrderTaskList()
+			this.getXbkDyTaskList()
+			this.getZcwDyTaskList()
 	    }
 	  }
 	}

imcs-ui/src/views/zuihou/dispatchMgr/tools/Index.vue

@@ -423,6 +423,49 @@
   			</el-form-item>
 	  </el-form>
 	</el-card>
+
+	<el-card class="box-card">
+        <div slot="header" class="clearfix">添加产线回调缓存</div>
+		<el-form ref="form20" :model="form20" :rules="rules14" label-width="80px">
+			<el-row :gutter="12" >
+				<el-col :xs="6" :sm="7">
+					<el-form-item label="节点ID:" prop="taskNodeId">
+                    	<el-input  v-model="form20.taskNodeId" placeholder="节点ID"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="6" :sm="6">
+					<el-form-item label="类型:" prop="callbackType">
+                    	<el-select v-model="form20.callbackType" placeholder="选择回调类型" @change="callbackTypeChange(form20.callbackType)">
+			  			     <el-option label="机床加工完成回调" value="1"></el-option>
+							 <el-option label="框体机器人节点回调" value="2"></el-option>
+							 <el-option label="舱体机器人节点回调" value="3"></el-option>
+							 <el-option label="伺服舵机节点回调" value="4"></el-option>
+							 <el-option label="线边库Flag" value="5"></el-option>
+							 <el-option label="缓存位线边库Flag" value="6"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="6" :sm="5" v-if="show">
+					<el-form-item label="起点号:" prop="startNo">
+                    	<el-input-number v-model="form20.startNo" :min="0" :max="400" ></el-input-number>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="6" :sm="5" v-if="show">
+					<el-form-item label="目标号:" prop="targetNo">
+                    	<el-input-number v-model="form20.targetNo" :min="0" :max="400" ></el-input-number>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="6" :sm="5" v-if="show">
+					<el-form-item label="次序号:" prop="count">
+                    	<el-input-number v-model="form20.count" :min="0" :max="2"></el-input-number>
+					</el-form-item>
+				</el-col>											
+			</el-row>
+			<el-form-item>
+    			<el-button type="primary" @click="addCallbackCache" >发送</el-button>    		
+  			</el-form-item>
+	  </el-form>
+	</el-card>
   </div>
 </template>
 
@@ -516,7 +559,14 @@
 		  },
 		  form19:{
             taskNodeId: "",
-		 },
+		  },
+		  form20:{
+			taskNodeId: "",
+			startNo:0,
+			targetNo:0,
+			callbackType:"1",
+			count:0
+		  },
 		  lineList: [{"name":"框体","value":"KT"},{"name":"舱体","value":"CT"},{"name":"保障中心","value":"BZ"}],
 		  typeList: [{"name":"全部","value":"0"},{"name":"FANUC","value":"1"},{"name":"HEIDENHAIN","value":"2"},{"name":"DMG","value":"3"},{"name":"HELLER","value":"4"}],
 	      tenantViewVisible: false,
@@ -524,6 +574,7 @@
 	      queryParams: initQueryParams({}),
 	      selection: [],
 	      loading: false,
+		  show:false,
 	      rules1: {
         	taskNodeId: [
         		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
@@ -621,7 +672,25 @@
 			taskNodeId: [
         		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
         	],
-		  }
+		  },
+		  rules14: {
+			taskNodeId: [
+        		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+        	],
+			callbackType: [
+				{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+			],
+			startNo: [
+        		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+        	],
+			targetNo: [
+        		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+        	],
+			count: [
+        		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+        	],
+		  },
+
 		}
 	  },
 	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
@@ -985,6 +1054,37 @@
 				}				
 			});
 		},
+		callbackTypeChange(val){
+          if(val=="2"||val=="3"||val=="4"){
+			this.show = true
+		  }else{
+			this.show = false			
+		  }		  
+		},
+		addCallbackCache(){
+			this.$refs.form20.validate((valid) => {
+				if(valid){
+					toolbarApi.addCallbackCache(this.form20).then(response=>{
+						const res = response.data
+						if(res.isSuccess){
+							this.$message({
+              					message: this.$t('tips.updateSuccess'),
+              					type: 'success'
+            				})
+						}else{
+							this.$message({
+              					message: res.msg,
+              					type: 'warning'
+            				})
+						}
+					}).finally(()=>{
+					   return true		
+					})					
+				}else{
+					return false
+				}				
+			});
+		},
 		addMachineCallback(){
 			this.$refs.form15.validate((valid) => {
 				if(valid){