Merge branch 'master' of http://106.14.142.95:3000/oyq28/imcs_331_web

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

@@ -60,6 +60,10 @@ const apiList = {
   manualXbk: {
     method: 'POST',
     url: `/authority/toolbar/manualXbk`
+  },
+  addNodeMsg: {
+    method: 'POST',
+    url: `/authority/toolbar/addNodeMsg`
   } 
 }
 
@@ -153,5 +157,11 @@ export default {
       ...apiList.manualXbk,
       data
     })
+  },
+  addNodeMsg (data) {
+    return axiosApi({
+      ...apiList.addNodeMsg,
+      data
+    })
   }
 }

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

@@ -207,7 +207,10 @@ export default {
 				name7: '上料任务号',
 				name8: '最后流转任务号',
 				name9: '入库时间',
-				name10: '是否锁定'
+				name10: '是否锁定',
+				name11: '是否冻结',
+				name12: '目标位置',
+				name13: '业务批次'
 			}
 		},
 		// 表单数据名称

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

@@ -7,14 +7,14 @@
 			<el-row :gutter="12">				
 				<el-col :xs="6" :sm="5">
 					<el-form-item label="起始位:" prop="start">
-						<el-tooltip content="例如:BZ_361" placement="top">
+						<el-tooltip content="例如:CT_LAUP000101" placement="top">
                     		<el-input v-model="form.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_130" placement="top">
+						<el-tooltip content="例如:CT_MERK000101" placement="top">
                     		<el-input  v-model="form.goal" placeholder="目的库位"></el-input>
 						</el-tooltip>
 					</el-form-item>
@@ -314,6 +314,37 @@
   			</el-form-item>
 	  </el-form>
 	</el-card>
+
+	<el-card class="box-card">
+        <div slot="header" class="clearfix">添加动态消息</div>
+		<el-form ref="form12" :model="form12" :rules="rules9" label-width="80px">
+			<el-row :gutter="12" >
+				<el-col :xs="6" :sm="8">
+					<el-form-item label="节点ID:" prop="taskNodeId">
+                    	<el-input  v-model="form12.taskNodeId" placeholder="节点ID"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="6" :sm="6">
+					<el-form-item label="类型:" prop="msgType">
+                    	<el-select v-model="form12.msgType" placeholder="选择消息类型">
+							 <!--<el-option v-for="deviceType in typeList" :label="deviceType.name" :value="deviceType.value" :key="deviceType.value" ></el-option>	-->	
+			  			     <el-option label="普通消息" value="1"></el-option>
+							 <el-option label="线边库消息" value="2"></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="6" :sm="5">
+					<el-form-item label="次序号:" prop="count">
+                    	<el-input-number v-model="form12.count" :min="0" :max="form12.msgType=='1'?3:5"></el-input-number>
+					</el-form-item>
+				</el-col>											
+			</el-row>
+			<el-form-item>
+    			<el-button type="primary" @click="addNodeMsg" >发送</el-button>    		
+  			</el-form-item>
+	  </el-form>
+	</el-card>
+
   </div>
 </template>
 
@@ -388,6 +419,11 @@
 			cutStartNo: "",
 			cutGoalNo: ""			
 		  },
+		  form12:{
+			taskNodeId: "",
+			count:0,
+			msgType:"1"
+		  },
 		  lineList: [],
 		  typeList: [{"name":"全部","value":"0"},{"name":"FANUC","value":"1"},{"name":"HEIDENHAIN","value":"2"},{"name":"DMG","value":"3"},{"name":"HELLER","value":"4"}],
 	      cutToolDeviceList: [],
@@ -453,7 +489,18 @@
 			deviceType: [
 				{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
 			]
-		  }
+		  },
+		  rules9: {
+			taskNodeId: [
+        		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
+        	],
+			msgType: [
+				{ 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中操作
@@ -835,6 +882,30 @@
 				}				
 			});
 		},
+		addNodeMsg(){
+			this.$refs.form12.validate((valid) => {
+				if(valid){
+					toolbarApi.addNodeMsg(this.form12).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
+				}				
+			});
+		},
 	    reset () {
 	      this.queryParams = initQueryParams({})
 	      this.$refs.table.clearSort()

imcs-ui/src/views/zuihou/lineSideLibrary/lineSideEmulate/components/Edit.vue

@@ -40,7 +40,7 @@
 	      <!-- 库存编码 -->
 	      <el-table-column prop="storgeNo" label='库存编码' width="180px"></el-table-column>
 	      <!-- 数量 -->
-	      <el-table-column prop="num" :label='$t("lineSide.table.emulateProd.name6")' width="180px"></el-table-column>
+	      <el-table-column prop="num" :label='$t("lineSide.table.emulateProd.name6")' width="60px"></el-table-column>
 	      <!-- 入库时间 -->
 	     	<el-table-column prop="createTime" :label='$t("lineSide.table.emulateProd.name9")' width="180px"></el-table-column>
 	      <!-- 是否锁定 -->
@@ -51,6 +51,26 @@
 	          </el-tag>
 	        </template>
 	      </el-table-column>
+        <!-- 是否冻结 -->
+        <el-table-column prop="status" :label='$t("lineSide.table.emulateProd.name11")' align="center" width="90px">
+	      	<template slot-scope="{ row }">             
+	          <el-tag :type="row.status=='0' ? 'danger':'success'">
+	          	{{ row.status=='0' ? $t("common.yes") : $t("common.no") }}
+	          </el-tag>
+	        </template>
+	      </el-table-column>
+        <el-table-column  prop="targetName" :label='$t("lineSide.table.emulateProd.name12")' align="center" width="180px">
+          <template slot-scope="{ row }">
+            <el-tag :type="row.targetName ? 'success' : 'danger'">
+	            {{ row.targetName? row.targetName: '无'}}
+            </el-tag>  
+	        </template>
+        </el-table-column>
+        <el-table-column prop="completeBatchNo" :label='$t("lineSide.table.emulateProd.name13")' align="center" width="200px">
+          <template slot-scope="{ row }">
+            {{ row.completeBatchNo? row.completeBatchNo: (row.campId? row.campId: '')}}
+	        </template>
+        </el-table-column>
 	    </el-table>
 	    <!--<pagination
 	      v-show="tableData.total > 0"

imcs-ui/src/views/zuihou/prepareProductMgr/cuttingToolMgr/components/customizeCuttingTool/components/Edit.vue

@@ -8,11 +8,11 @@
   	width="750px"
   	top="50px"
   >
-    <el-form ref="form" :disabled="formDisabled" :model="customizeCuttingTool" :rules="rules" label-position="right" label-width="130px">
-      <!-- 刀具号 -->
+    <el-form ref="form" :disabled="formDisabled" :model="customizeCuttingTool" :rules="rules" label-position="right" label-width="100px">
+      <!-- 刀具编号 -->
       <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cuttingToolNo")+"："' prop="cuttingToolNo">
-        <el-input v-model.trim="customizeCuttingTool.cuttingToolNo"  :label='$t("common.pleaseEnter")' maxlength="128" style="width: 93%;"></el-input>
-      </el-form-item>
+        <el-input-number v-model="customizeCuttingTool.cuttingToolNo" :min="1" :max="1200"></el-input-number>
+      </el-form-item>      
       <!-- 刀具名称-->
       <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cuttingToolName")+"："' prop="cuttingToolName">
         <el-input v-model.trim="customizeCuttingTool.cuttingToolName"  :label='$t("common.pleaseEnter")' maxlength="128" style="width: 93%;"></el-input>
@@ -26,10 +26,15 @@
       	<el-select v-model="customizeCuttingTool.cuttingToolType.key" :placeholder='$t("common.pleaseSelect")' style="width: 93%;">
           <el-option :key="index" :label="item" :value="key" v-for="(item, key, index) in dicts.CUTTING_TOOL_TYPE" />
       	</el-select>
+      </el-form-item>      
+      <el-form-item v-if="customizeCuttingTool.cutterNo > 0"  :label='$t("cuttingTool.form.customizeCuttingtool.deviceId")+"："' prop="deviceId" >        
+      	<el-select v-model="customizeCuttingTool.deviceId" :placeholder='$t("common.pleaseSelect")' style="width: 50%;" >
+          <el-option :key="item.name" :label="item.name" :value="item.id" v-for="(item, index) in deviceData.records" />
+      	</el-select>
       </el-form-item>
       <!-- 刀位号 -->
-      <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cutterNo")+"："' prop="cutterNo">
-      	<el-input-number v-model="customizeCuttingTool.cutterNo" :min="0" :max="1000"></el-input-number>
+      <el-form-item v-if="customizeCuttingTool.cutterNo > 0 " :label='$t("cuttingTool.form.customizeCuttingtool.cutterNo")+"："' prop="cutterNo">
+      	<el-input-number v-model="customizeCuttingTool.cutterNo" :min="1"></el-input-number>
       </el-form-item>
 
       <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cuttingToolPicture")+"："' prop="cuttingToolPicture">
@@ -170,8 +175,8 @@ export default {
       },
       roles: [],
       rules: {
-        cuttingToolNo: [
-        	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
+        cuttingToolNo:[
+          { required: true, message: this.$t("rules.require"), trigger: 'blur' },
         ],
         specifications: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
@@ -254,7 +259,7 @@ export default {
       return {
         id: '',
         specifications: '',
-
+        cuttingToolNo: 1,  
         cuttingToolName: '',
         cuttingToolType: {
             key: ""
@@ -264,7 +269,7 @@ export default {
         },
         deviceId: '',
         resourceIdList: [],
-        cutterNo: 0,
+        cutterNo: 1,
         cuttingToolPicture: '',
         cuttingToolInstallPicture: '',
         remark: '',

imcs-ui/src/views/zuihou/prepareProductMgr/cuttingToolMgr/components/customizeCuttingTool/index.vue

@@ -66,7 +66,11 @@
 		<!-- 刀具规格 -->
 		<el-table-column align="center" prop="specifications" :label='$t("cuttingTool.table.customizeCuttingtool.specifications")' :show-overflow-tooltip="true"></el-table-column>
 		<!-- 设备名称 -->
-  <!--	  <el-table-column align="center" prop="deviceName" :label='$t("cuttingTool.table.customizeCuttingtool.deviceName")' :show-overflow-tooltip="true"></el-table-column>-->
+		<el-table-column align="center" prop="deviceName" :label='$t("cuttingTool.table.customizeCuttingtool.storgeName")' :show-overflow-tooltip="true">
+	    	<template slot-scope="{ row }">
+				{{row['deviceName']? row['deviceName']+"_"+row['cutterNo']+"号刀位" : row['storgeName']}}
+	    	</template>		
+	 	</el-table-column>
 		<!-- 刀具类型 -->
 	   <el-table-column align="center"
 		  :filter-multiple="false"
@@ -128,6 +132,7 @@
 		  <template slot-scope="{ row }">
 			<el-tooltip class="item" :content='$t("common.edit")' effect="dark" placement="top-start">
 				<i
+				  v-if="row.cutterNo==0"
 				  class="el-icon-edit table-operation"
 				  style="color: #2db7f5;"
 				  @click="edit(row)"
@@ -135,6 +140,7 @@
 			</el-tooltip>
 			<el-tooltip class="item" :content='$t("common.delete")' effect="dark" placement="top-start">
 				<i
+				  v-if="row.cutterNo==0"
 				  class="el-icon-delete table-operation"
 				  style="color: #f50;"
 				  @click="singleDelete(row)"