前端页面功能处理

imcs-ui/src/api/Dispatch.js

@@ -24,6 +24,14 @@ const apiList = {
   preview: {
     method: 'POST',
     url: `/authority/dispatch/preview`
+  },
+  selectLogs: {
+    method: 'POST',
+    url: `/authority/dispatchRecord/selectLogs`
+  },
+  getPointInfo: {
+    method: 'POST',
+    url: `/authority/plc/getPointInfo`
   }
 }
 
@@ -57,5 +65,58 @@ export default {
       ...apiList.delete,
       data
     })
+  },
+  selectLogs(data){
+    return axiosApi({
+      ...apiList.selectLogs,
+      data
+    })
+  },
+  getPointInfo(){
+    return axiosApi({
+      ...apiList.getPointInfo
+    })
+  },
+  clearPlcPoint(point,flag){
+    return axiosApi({
+      method: 'GET',
+      url: `/authority/plc/clearPlcPoint`,
+      data: {point: point,flag:flag}
+    })
+  },
+  resendCommand(id){
+    return axiosApi({
+      method: 'GET',
+      url: `/authority/plc/resendCommand`,
+      data: {id: id}
+    })
+  },
+  unlockStorge(id,moveFlag){
+    return axiosApi({
+      method: 'GET',
+      url: `/authority/dispatchRecord/unlockStorge`,
+      data: {id: id,moveFlag: moveFlag}
+    })
+  },
+  executeNextNode(id){
+    return axiosApi({
+      method: 'GET',
+      url: `/authority/dispatchRecord/executeNextNode`,
+      data: {id: id}
+    })
+  },
+  cancelTaskNodeLog(id){
+    return axiosApi({
+      method: 'GET',
+      url: `/authority/dispatchRecord/cancelTaskNodeLog`,
+      data: {id: id}
+    })
+  },
+  taskNodeCallback(data){
+    return axiosApi({
+      method: 'POST',
+      url: `/authority/taskNode/taskNodeCallback`,
+      data
+    })
   }
 }

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

@@ -13,6 +13,10 @@ const apiList = {
     method: 'POST',
     url: `/authority/toolbar/updateStorge`
   },
+  updateJbwStorge: {
+    method: 'POST',
+    url: `/authority/toolbar/updateJbwStorge`
+  },
   addHikTask: {
     method: 'POST',
     url: `/authority/toolbar/addHikTask`
@@ -45,9 +49,9 @@ const apiList = {
     method: 'POST',
     url: `/authority/toolbar/updateDeviceStatus`
   },
-  manualXbk: {
+  addOrderTask: {
     method: 'POST',
-    url: `/authority/toolbar/manualXbk`
+    url: `/authority/toolbar/addOrderTask`
   },
   addNodeMsg: {
     method: 'POST',
@@ -110,6 +114,12 @@ export default {
       data
     })
   },
+  updateJbwStorge (data) {
+    return axiosApi({
+      ...apiList.updateJbwStorge,
+      data
+    })
+  },
   addHikTask (data) {
     return axiosApi({
       ...apiList.addHikTask,
@@ -158,9 +168,9 @@ export default {
       data
     })
   },
-  manualXbk (data) {
+  addOrderTask (data) {
     return axiosApi({
-      ...apiList.manualXbk,
+      ...apiList.addOrderTask,
       data
     })
   },

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

@@ -30,7 +30,8 @@ export default {
 				four: '出库',
 				five: '任务号出库',
 				six: '锁定',
-				serven: '解锁'
+				seven: '解锁',
+				eight: '批量出库'
 			}
 		},
 		// 列表搜索表单名称

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

@@ -348,7 +348,7 @@
 
 	<el-card class="box-card">
         <div slot="header" class="clearfix">查询缓存关键字</div>		
-		<el-form label-width="80px">
+		<el-form label-width="100px">
 		<el-row :gutter="10">
 			    <el-col :span="6">
 					<el-form-item label="是否排产">
@@ -357,7 +357,7 @@
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="线边库调度">
-					 {{cacheKeyList.YUNJIAN_XBK_SHEDULE==1? "自动调度中":"无调度"}}
+					 {{cacheKeyList.YUNJIAN_XBK_SCHEDULE==1? "自动调度中":"无调度"}}
 					</el-form-item>	
 				</el-col>
 				<el-col :span="9">

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

@@ -26,6 +26,31 @@
 	  </el-form>
 	</el-card>
 
+	<el-card class="box-card">
+        <div slot="header" class="clearfix">手动更新接驳位点位(包含托板)</div>
+		<el-form ref="form22" :model="form22" :rules="rules4"  label-width="80px">
+			<el-row :gutter="12">				
+				<el-col :xs="6" :sm="5">
+					<el-form-item label="起始位:" prop="start">
+						<el-tooltip content="例如:BZ_361" placement="top">
+                    		<el-input v-model="form22.start" placeholder="起始库位"></el-input>
+					   </el-tooltip>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="6" :sm="5">
+					<el-form-item label="目的位:" prop="goal">
+						<el-tooltip content="例如:KT_121" placement="top">
+                    		<el-input  v-model="form22.goal" placeholder="目的库位"></el-input>
+						</el-tooltip>
+					</el-form-item>
+				</el-col>							
+			</el-row>			
+			<el-form-item>				
+    			<el-button type="primary" @click="updateJbwStorge" >更改</el-button>    		
+  			</el-form-item>
+	  </el-form>
+	</el-card>
+
 	<el-card class="box-card">
         <div slot="header" class="clearfix">查询指令完成状态</div>
 		<el-form ref="form1" :model="form1" :rules="rules1"  label-width="80px">
@@ -176,27 +201,23 @@
 	  </el-form>
 	</el-card>
 
-	<el-card class="box-card" v-show="false">
-        <div slot="header" class="clearfix">零件动态入线边库(产线内)</div>
-		<el-form ref="form8" :model="form8" :rules="rules1" label-width="80px">
+	<el-card class="box-card">
+        <div slot="header" class="clearfix">创建自定义订单</div>
+		<el-form ref="form8" :model="form8" :rules="rules4" label-width="80px">
 			<el-row :gutter="12" >
 				<el-col :xs="6" :sm="5">
-					<!--					
-					<el-select v-model="form8.zoneId" placeholder="选择产线">
-						<el-option v-for="deviceUnit in lineList " :label="deviceUnit.name" :value="deviceUnit.id" :key="deviceUnit.id" ></el-option>		
-			  		</el-select> -->
-					  <el-form-item label="任务ID:" prop="taskId">
-                    	<el-input v-model="form8.taskId" placeholder="任务ID"></el-input>
+					  <el-form-item label="起点:" prop="start">
+                    	<el-input v-model="form8.start" placeholder="起点"></el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :xs="6" :sm="5">
-					<el-form-item label="节点ID:" prop="taskNodeId">
-                    	<el-input v-model="form8.taskNodeId" placeholder="任务节点Id"></el-input>
+					<el-form-item label="终点:" prop="goal">
+                    	<el-input v-model="form8.goal" placeholder="终点"></el-input>
 					</el-form-item>
 				</el-col>				
 			</el-row>
 			<el-form-item>
-    			<el-button type="primary" @click="manualXbk">执行</el-button>    		
+    			<el-button type="primary" @click="addOrderTask">执行</el-button>    		
   			</el-form-item>
 	  </el-form>
 	</el-card>
@@ -433,19 +454,23 @@
                     	<el-input  v-model="form20.taskNodeId" placeholder="节点ID"></el-input>
 					</el-form-item>
 				</el-col>
-				<el-col :xs="6" :sm="6">
+				<el-col :xs="6" :sm="7">
 					<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="线边库不可取回调" value="5"></el-option>
-							 <el-option label="缓存位线边库回调" value="6"></el-option>
-							 <el-option label="线边库允许取回调" value="7"></el-option>
+							 <el-option label="翼片机器人节点回调" value="5"></el-option>
+							 <el-option label="中舱机器人节点回调" value="6"></el-option>
+							 <el-option label="暂存位节点回调" value="7"></el-option>
 						</el-select>
 					</el-form-item>
 				</el-col>
+			</el-row>
+			<el-row :gutter="12" >	
+				<el-col :xs="6" :sm="7">
+				</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>
@@ -481,7 +506,7 @@
 			<el-form-item>				
     			<el-button type="primary" @click="reStationSchedule" >发送</el-button>    		
   			</el-form-item>
-	  </el-form>
+	  </el-form>	
 	</el-card>
   </div>
 </template>
@@ -587,7 +612,11 @@
 		  form21:{
 			orderName:""	
 		  },
-		  lineList: [{"name":"框体","value":"KT"},{"name":"舱体","value":"CT"},{"name":"保障中心","value":"BZ"}],
+		  form22:{			
+			start: "",
+			goal: ""			
+		  },
+		  lineList: [{"name":"框体","value":"KT"},{"name":"舱体","value":"CT"},{"name":"保障中心","value":"BZ"},{"name":"翼片","value":"YP"},{"name":"中舱","value":"ZC"}],
 		  typeList: [{"name":"全部","value":"0"},{"name":"FANUC","value":"1"},{"name":"HEIDENHAIN","value":"2"},{"name":"DMG","value":"3"},{"name":"HELLER","value":"4"}],
 	      tenantViewVisible: false,
 	      tableKey: 0,
@@ -761,6 +790,30 @@
 					return false
 				}				
 			});
+	    },
+		updateJbwStorge () {
+			this.$refs.form22.validate((valid) => {
+				if(valid){
+					toolbarApi.updateJbwStorge(this.form22).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
+				}				
+			});
 	    },
 	    getCallbackList () {
 			this.$refs.form1.validate((valid) => {
@@ -1006,10 +1059,10 @@
 				}				
 			});		
 		},
-		manualXbk(){
+		addOrderTask(){
             this.$refs.form8.validate((valid) => {
 				if(valid){
-					toolbarApi.manualXbk(this.form8).then(response=>{
+					toolbarApi.addOrderTask(this.form8).then(response=>{
 						const res = response.data
 						if(res.isSuccess){
 							this.$message({
@@ -1079,7 +1132,7 @@
 			});
 		},
 		callbackTypeChange(val){
-          if(val=="2"||val=="3"||val=="4"||val=="5"||val=="6"||val=="7"){
+          if(val=="2"||val=="3"||val=="4"||val=="5"||val=="6"){
 			this.show = true
 		  }else{
 			this.show = false			

imcs-ui/src/views/zuihou/lineSideLibrary/inOutRecord/Index.vue

@@ -72,8 +72,6 @@
       <el-table-column prop="brandNo" :label='$t("lineSide.table.inOutRecord.brandNo")' width="180px"></el-table-column>
       <!-- 产品名称 -->
       <el-table-column prop="name" :label='$t("lineSide.table.inOutRecord.name")' width="180px"></el-table-column>
-      <!-- 规格 -->
-      <el-table-column prop="specification" :label='$t("lineSide.table.inOutRecord.specification")' width="180px"></el-table-column>
       <!-- 库位 -->
       <el-table-column prop="shelvesDesc" :label='$t("lineSide.table.inOutRecord.storgeId")' width="180px"></el-table-column>
       <!-- 类型 -->
@@ -85,7 +83,8 @@
 					<el-tag v-if="row.optType == '4'" type="">{{$t("lineSide.common.optType.four")}}</el-tag>
 					<el-tag v-if="row.optType == '5'" type="">{{$t("lineSide.common.optType.five")}}</el-tag>
 					<el-tag v-if="row.optType == '6'" type="">{{$t("lineSide.common.optType.six")}}</el-tag>
-					<el-tag v-if="row.optType == '7'" type="">{{$t("lineSide.common.optType.serven")}}</el-tag>
+					<el-tag v-if="row.optType == '7'" type="">{{$t("lineSide.common.optType.seven")}}</el-tag>
+					<el-tag v-if="row.optType == '8'" type="">{{$t("lineSide.common.optType.eight")}}</el-tag>
 				</template>
       </el-table-column>
 	  <!-- 工装类型 -->
@@ -94,7 +93,9 @@
       		<el-tag v-if="row.goodsType == '1'" type="success">工装子盘</el-tag>
 	      	<el-tag v-if="row.goodsType == '2'" type="success">工装夹具</el-tag>
 			<el-tag v-if="row.goodsType == '3'" type="success">原材料</el-tag>
-			<el-tag v-if="row.goodsType == '4'" type="">零件产品</el-tag>					
+			<el-tag v-if="row.goodsType == '4'" type="">零件产品</el-tag>
+			<el-tag v-if="row.goodsType == '5'" type="">托板</el-tag>
+			<el-tag v-if="row.goodsType == '1,2,4'" type="">加工整体</el-tag>					
 		</template>
       </el-table-column>
       <!-- 数量 -->

imcs-ui/src/views/zuihou/lineSideLibrary/lineSideMgr/components/EditList.vue

@@ -410,8 +410,8 @@ export default {
         if (valid) {
           this.confirmDisabled = true
           if (this.type === 'add') {
-            //this.save()
-			this.manualTask()
+            this.save()
+			//this.manualTask()
           } else {
             this.update()
           }

imcs-ui/src/views/zuihou/markingMgr/resourcePrint/Index.vue

@@ -100,7 +100,8 @@
 					<el-tag v-if="row.optType == '4'" type="">{{$t("lineSide.common.optType.four")}}</el-tag>
 					<el-tag v-if="row.optType == '5'" type="">{{$t("lineSide.common.optType.five")}}</el-tag>
 					<el-tag v-if="row.optType == '6'" type="">{{$t("lineSide.common.optType.six")}}</el-tag>
-					<el-tag v-if="row.optType == '7'" type="">{{$t("lineSide.common.optType.serven")}}</el-tag>
+					<el-tag v-if="row.optType == '7'" type="">{{$t("lineSide.common.optType.seven")}}</el-tag>
+					<el-tag v-if="row.optType == '8'" type="">{{$t("lineSide.common.optType.eight")}}</el-tag>
 				</template>
       </el-table-column>
       <!-- 生成时间 -->

imcs-ui/src/views/zuihou/runManageCenter/robotMonitor/Index.vue

@@ -2,8 +2,7 @@
   <div class="formContaner">
   		<div class="formTitle">{{$t("runCenter.searchForm.robotMonitor")}}</div>
 			<!-- 表单模块 -->
-			<el-descriptions :title="robotList[index].pname" class="description" direction="vertical" :column="2" v-for="(item, index) in robotList" :key="item.id" :colon="false" v-if="index%3==0" border>
-			  	
+			<el-descriptions :title="robotList[index].pname" class="description" direction="vertical" :column="2" v-for="(item, index) in robotList" :key="item.id" :colon="false" v-if="index%3==0" border>			  	
 				<template slot="extra">
       				<el-button type="primary" icon="el-icon-refresh" size="small" @click="record(item, index)" >记录</el-button>
 					<el-button type="primary" icon="el-icon-refresh" size="small" @click="detail(item, index)" >详情</el-button>
@@ -106,7 +105,7 @@
 		  recordVisible: false,
 		  rowData: {}, // row数据
 		  queryParams: initQueryParams({}),
-	      robotList: [{name:"智能生产保障系统", runMode:"2"},{name:"舱体类加工单元", runMode:"2"},{name:"框体类加工单元", runMode:"1"}],
+	      robotList: [{name:"智能生产保障系统", runMode:"3"},{name:"舱体类加工单元", runMode:"3"},{name:"框体类加工单元", runMode:"3"},{name:"翼片类加工单元", runMode:"3"},{name:"中舱类加工单元", runMode:"3"}],
 	      confirmDisabled: false,
 	      tenant: this.initTenant(),
 	      rules: {
@@ -146,7 +145,7 @@
 			 areaMgrApi.robotList({}).then(res => {
 	    		res = res.data
 	    		if(res.isSuccess){
-	    			this.robotList = res.data
+	    			this.robotList = res.data					
 	    		}
 	    	})
 	    },
@@ -172,7 +171,13 @@
 	  	  this.modeVisible = true
 		  this.$refs.view.setTenant(item)
 		},
-		record(item, index){
+		record(item, index){	
+		  if(item.point_id==371){
+			item.storge_ids = item.storge_id	
+		  }else{
+			let storge_ids = [this.robotList[index].storge_id, this.robotList[index+1].storge_id,this.robotList[index+2].storge_id]	
+            item.storge_ids =  storge_ids.filter(item=>item!=null).join(",");
+		  }		 			  
 		  this.recordVisible = true
 		  this.$refs.recordView.setTenant(item)
 		}

imcs-ui/src/views/zuihou/runManageCenter/robotMonitor/components/Record.vue

@@ -155,7 +155,7 @@
 	
 	      this.queryParams.current = params.current ? params.current : this.queryParams.current
 	      this.queryParams.size = params.size ? params.size : 10
-		  this.queryParams.model.storgeId = this.tenant.storge_id
+		  this.queryParams.model.storgeIds = this.tenant.storge_ids
 	      lockingRecordApi.getStockLogList(this.queryParams).then(response => {
 	        const res = response.data
 	        if (res.isSuccess) {

imcs-ui/src/views/zuihou/runManageCenter/robotMonitor/components/View.vue

@@ -27,14 +27,14 @@
           <div class="view-item">
             <i class="el-icon-trophy" />
             <span>节点名称:</span>
-            {{ tenant.node_name }}
+            {{ tenant.nodeName }}
           </div>
         </el-col>
         <el-col :xs="24" :sm="12">
           <div class="view-item">
             <i class="el-icon-phone-outline" />
             <span>锁定状态:</span>
-            {{tenant.lock_status=='0'? '已锁定':(tenant.lock_status=='1')?'已放置':'未锁定'}}
+            {{tenant.lockStatus=='0'? '已锁定':(tenant.lockStatus=='1')?'已放置':'未锁定'}}
           </div>
         </el-col>
       </el-row>
@@ -74,13 +74,13 @@
 					    <el-tag size="medium">{{item.goods? item.goods : "零件"}}</el-tag>					   
 				    </el-descriptions-item>
               <el-descriptions-item label="工装编码">					   
-					    <el-tag size="small" >{{item.unique_code}}</el-tag>					   
+					    <el-tag size="small" >{{item.uniqueCode}}</el-tag>					   
 				      </el-descriptions-item>
                 <el-descriptions-item label="锁定状态">					   
-					    <el-tag size="small">{{item.lock_status=='0'? '已锁定':(item.lock_status=='1')?'已放置':'未锁定'}}</el-tag>					   
+					    <el-tag size="small">{{item.lockStatus=='0'? '已锁定':(item.lockStatus=='1')?'已放置':'未锁定'}}</el-tag>					   
 				    </el-descriptions-item>
             <el-descriptions-item label="工装位置">					   
-					    <el-tag size="small" >{{item.NAME}}</el-tag>					   
+					    <el-tag size="small" >{{item.stockName}}</el-tag>					   
 				      </el-descriptions-item>				    
             </el-descriptions>           
           </div>

imcs-ui/src/views/zuihou/statisticalAnalysis/taskBizStatistics/Index.vue

@@ -548,7 +548,7 @@ export default {
         resourceId: "",                
       },
       resourceIds:[],
-      zoneList: [{name:"框体类加工单元",value:"KT"},{name:"舱体类加工单元",value:"CT"},{name:"保障中心单元",value:"BZ"}],
+      zoneList: [{name:"框体类加工单元",value:"KT"},{name:"舱体类加工单元",value:"CT"},{name:"保障中心单元",value:"BZ"},{name:"翼片类加工单元",value:"YP"},{name:"中舱类加工单元",value:"ZC"}],
       bizTypeList: [{id:"1",name:"任务",key:""},{id:"2",name:"节点",key:"taskNode"}, {id:"3",name:"AGV",key:"agv"}],      
       bizType: "1",
       zoneId : "KT",