From 0caf8761b4af8163a691ebb56723286926529ee4 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期五, 29 三月 2024 15:29:38 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java | 7 +++
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 2 +
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 7 ++-
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java | 27 +++++++++++++
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/BsFormulaChildInfo.java | 13 ++++++
jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js | 9 ++++
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 4 +-
jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml | 28 +++++++-------
8 files changed, 78 insertions(+), 19 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
index a065715..40ddd9b 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -37,6 +39,31 @@
/**
* 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
*/
+ @GetMapping("/noPageListFormulaChild")
+ public TableDataInfo noPageListFormulaChild(BsFormulaChildInfo bsFormulaChildInfo)
+ {
+ List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
+ .eq(BsFormulaChildInfo::getProductCode,bsFormulaChildInfo.getProductCode())
+ .eq(BsFormulaChildInfo::getProcessesCode,bsFormulaChildInfo.getProcessesCode()));
+ for (BsFormulaChildInfo formulaChildInfo : list) {
+// formulaChildInfo.setSort(formulaChildInfo.getStepSort());
+// formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());
+// formulaChildInfo.setImg(formulaChildInfo.getOperationSteps());
+ if(formulaChildInfo.getCollectData()!=null&& !"".equals(formulaChildInfo.getCollectData())){
+ if(formulaChildInfo.getCollectData().contains("[")){
+ String data = formulaChildInfo.getCollectData();
+ data = data.replace("[", "").replace("]", "").replace(" ", "");
+ String[] tightenDataParts = data.split(",");
+ formulaChildInfo.setCollectData("鎵煩"+tightenDataParts[0]+"瑙掑害"+tightenDataParts[1]+"鎵煩缁撴灉"+tightenDataParts[2]+"瑙掑害缁撴灉"+tightenDataParts[3]);
+ }
+ }
+ }
+ return getDataTable(list);
+ }
+
+ /**
+ * 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
+ */
@PreAuthorize("@ss.hasPermi('bs:formulaChild:list')")
@GetMapping("/list")
public TableDataInfo list(BsFormulaChildInfo bsFormulaChildInfo)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/BsFormulaChildInfo.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/BsFormulaChildInfo.java
index fd8207b..66d188b 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/BsFormulaChildInfo.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/BsFormulaChildInfo.java
@@ -1,5 +1,6 @@
package com.jcdm.main.bs.formulaChild.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -102,28 +103,40 @@
@Excel(name = "缁撴灉")
private String results;
+ @TableField(exist = false)
private String sort;
+ @TableField(exist = false)
private String address;
+ @TableField(exist = false)
private String img;
+ @TableField(exist = false)
private String workOrderNo;
+ @TableField(exist = false)
private Date collectionTime;
+ @TableField(exist = false)
private String locationCode;
+ @TableField(exist = false)
private String paramValue;
+ @TableField(exist = false)
private String paramName;
+ @TableField(exist = false)
private String scanBarcode;
+ @TableField(exist = false)
private String sfcBarcode;
+ @TableField(exist = false)
private String tightenTheArray;
+ @TableField(exist = false)
private Integer counts;
public String getParamName() {
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index ce57a86..b847049 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -55,6 +55,8 @@
lists.add(OPCElement.OP_OP240_AngleResult);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.OP_OP250_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.OP_OP250_AngleResult);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.OP_OP380_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.OP_OP380_AngleResult);//璇锋眰璁板綍鏁版嵁
return lists;
}
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
index 8b2601f..17eae5c 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
@@ -27,6 +27,13 @@
public static final String OP_OP250_AngleResult = "OP.OP250.AngleResult";//璇锋眰鎷х揣鏁版嵁
+ /**
+ * OP380
+ */
+ public static final String OP_OP380_RecordData = "OP.OP380.RecordData";//璇锋眰璁板綍鏁版嵁
+
+ public static final String OP_OP380_AngleResult = "OP.OP380.AngleResult";//璇锋眰鎷х揣鏁版嵁
+
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index c4683f6..16ea856 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -109,9 +109,9 @@
}
//淇濆瓨鎷х揣鏁版嵁
else if (("AngleResult").equals(tab)) {
- if("1".equals(tabVlaue)||"2".equals(tabVlaue)){
+ if("OK".equals(tabVlaue)||"NG".equals(tabVlaue)){
List<String> list = new ArrayList<>();
- String[] suffixes = {"Torque", "Angle", "Result", "Result1"};
+ String[] suffixes = {"Torque", "Angle", "TorqueResult", "AngleResult"};
for (String suffix : suffixes) {
String string = thoroughfare + "." + device + "." + suffix;
diff --git a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
index fa1dd2a..05bb608 100644
--- a/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/formulaChild/BsFormulaChildInfoMapper.xml
@@ -23,10 +23,10 @@
<result property="createTime" column="create_time" />
<result property="updateUser" column="update_user" />
<result property="updateTime" column="update_time" />
- <result property="spareField1" column="spare_field_1" />
- <result property="spareField2" column="spare_field_2" />
- <result property="spareField3" column="spare_field_3" />
- <result property="spareField4" column="spare_field_4" />
+ <result property="spareField1" column="spare_field1" />
+ <result property="spareField2" column="spare_field2" />
+ <result property="spareField3" column="spare_field3" />
+ <result property="spareField4" column="spare_field4" />
<result property="collectData" column="collect_data" />
<result property="results" column="results" />
<result property="counts" column="counts" />
@@ -34,7 +34,7 @@
</resultMap>
<sql id="selectBsFormulaChildInfoVo">
- select id, workshop_code, line_code, processes_code, product_code, operation_steps, tech_requirement, operation_type, step_sort, param_code, material_code, formula_code, picture, remarks, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4, collect_data, results from bs_formula_child_info
+ select id, workshop_code, line_code, processes_code, product_code, operation_steps, tech_requirement, operation_type, step_sort, param_code, material_code, formula_code, picture, remarks, create_user, create_time, update_user, update_time, spare_field1, spare_field2, spare_field3, spare_field4, collect_data, results from bs_formula_child_info
</sql>
<select id="selectBsFormulaChildInfoList" parameterType="BsFormulaChildInfo" resultMap="BsFormulaChildInfoResult">
@@ -50,7 +50,7 @@
<if test="results != null and result != ''"> and result = #{results}</if>
<if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if>
<if test="paramCode != null and paramCode != ''"> and param_code = #{paramCode}</if>
- <if test="spareField4 != null and spareField4 != ''"> and spare_field_4 = #{spareField4}</if>
+ <if test="spareField4 != null and spareField4 != ''"> and spare_field4 = #{spareField4}</if>
@@ -83,10 +83,10 @@
<if test="createTime != null">create_time,</if>
<if test="updateUser != null">update_user,</if>
<if test="updateTime != null">update_time,</if>
- <if test="spareField1 != null">spare_field_1,</if>
- <if test="spareField2 != null">spare_field_2,</if>
- <if test="spareField3 != null">spare_field_3,</if>
- <if test="spareField4 != null">spare_field_4,</if>
+ <if test="spareField1 != null">spare_field1,</if>
+ <if test="spareField2 != null">spare_field2,</if>
+ <if test="spareField3 != null">spare_field3,</if>
+ <if test="spareField4 != null">spare_field4,</if>
<if test="collectData != null">collect_data,</if>
<if test="results != null">results,</if>
</trim>
@@ -137,10 +137,10 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateUser != null">update_user = #{updateUser},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="spareField1 != null">spare_field_1 = #{spareField1},</if>
- <if test="spareField2 != null">spare_field_2 = #{spareField2},</if>
- <if test="spareField3 != null">spare_field_3 = #{spareField3},</if>
- <if test="spareField4 != null">spare_field_4 = #{spareField4},</if>
+ <if test="spareField1 != null">spare_field1 = #{spareField1},</if>
+ <if test="spareField2 != null">spare_field2 = #{spareField2},</if>
+ <if test="spareField3 != null">spare_field3 = #{spareField3},</if>
+ <if test="spareField4 != null">spare_field4 = #{spareField4},</if>
<if test="collectData != null">collect_data = #{collectData},</if>
<if test="results != null">results = #{results},</if>
</trim>
diff --git a/jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js b/jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js
index 9ed8494..9b7d04f 100644
--- a/jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js
+++ b/jcdm-ui/src/api/main/bs/formulaChild/formulaChild.js
@@ -9,6 +9,15 @@
})
}
+// 涓嶅垎椤垫煡璇㈤厤鏂归厤缃瓙淇℃伅鍒楄〃
+export function noPageListFormulaChild(query) {
+ return request({
+ url: '/bs/formulaChild/noPageListFormulaChild',
+ method: 'get',
+ params: query
+ })
+}
+
// 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛�
export function releaseCheck(query) {
return request({
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 2ddddc1..cf056fe 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -106,7 +106,7 @@
<el-tab-pane name="first">
<span slot="label"> <a class="el-icon-date"></a>棣栭〉</span>
<el-col :span="24">
- <el-table :cell-style="rowStyle" :data="formulaChildList">
+ <el-table height="500" :cell-style="rowStyle" :data="formulaChildList">
<el-table-column label="鎺掑簭" width="60" align="center" type="index">
</el-table-column>
<el-table-column label="鎿嶄綔鍐呭" :show-overflow-tooltip='true' align="center" prop="operationSteps">
@@ -294,6 +294,7 @@
import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
import {
listFormulaChild,
+ noPageListFormulaChild,
releaseCheck,
updateResults,
updateTighteningFormula,
@@ -360,7 +361,7 @@
},
content: '',
activeName: 'first',
- url: "ws://192.168.10.198:8080/websocket/message/",
+ url: "ws://192.168.11.6:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -495,7 +496,7 @@
this.formulaChildParams.productCode = this.workpieceInformation.productCode
this.formulaChildParams.processesCode = this.headContent.processesCode
console.log(this.formulaChildParams)
- listFormulaChild(this.formulaChildParams).then(response => {
+ noPageListFormulaChild(this.formulaChildParams).then(response => {
this.formulaChildList = response.rows;
});
},
--
Gitblit v1.9.3