From 49c784e6ac7d71c5eaf7352e0a215842b4ca5456 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期五, 15 三月 2024 08:26:26 +0800
Subject: [PATCH] 操作看板
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java | 4
jcdm-ui/src/views/main/om/productionOrde/index.vue | 4
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 5
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java | 15 +++
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 103 +++++++++++++------
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 18 +++
jcdm-ui/src/api/main/da/paramCollection/paramCollection.js | 9 +
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java | 10 ++
jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java | 13 ++
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java | 2
jcdm-ui/src/views/main/da/paramCollection/index.vue | 15 +-
jcdm-ui/src/views/main/da/collectionParamConf/index.vue | 15 +-
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/domain/BsFormulaChildInfo.java | 8 +
jcdm-ui/src/views/main/bs/formulaChild/index.vue | 2
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 22 ++++
jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml | 14 ++
16 files changed, 200 insertions(+), 59 deletions(-)
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 f215c09..b2fec38 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 lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.jcdm.common.annotation.Excel;
@@ -13,6 +14,7 @@
* @author ruimin
* @date 2023-12-26
*/
+@Data
public class BsFormulaChildInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -116,6 +118,12 @@
private String paramName;
+ private String scanBarcode;
+
+ private String sfcBarcode;
+
+
+
public String getParamName() {
return paramName;
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
index 79f3d9c..584ba79 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
@@ -118,12 +118,14 @@
@Override
public AjaxResult updateResults(BsFormulaChildInfo bsFormulaChildInfo) {
+ bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(bsFormulaChildInfo);
if(bsFormulaChildInfos.size()>0){
bsFormulaChildInfos.get(0).setResults("OK");
bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
- bsFormulaChildInfo.setParamValue(bsFormulaChildInfo.getMaterialCode());
+ bsFormulaChildInfo.setParamValue(bsFormulaChildInfo.getScanBarcode());
bsFormulaChildInfo.setParamCode(bsFormulaChildInfos.get(0).getParamCode());
+ bsFormulaChildInfo.setSfcBarcode(bsFormulaChildInfo.getSfcBarcode());
addParameterCollection(bsFormulaChildInfo);
}else {
return AjaxResult.error("闈炴湰宸ヤ綅鐗╂枡锛岃閲嶆柊鎵弿");
@@ -139,6 +141,7 @@
daParamCollection.setParamValue(bsFormulaChildInfo.getParamValue());
daParamCollection.setProductCode(bsFormulaChildInfo.getProductCode());
daParamCollection.setCollectionTime(new Date());
+ daParamCollection.setSfcCode(bsFormulaChildInfo.getSfcBarcode());
daParamCollectionMapper.insertDaParamCollection(daParamCollection);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java b/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java
index 55354b1..3e0c419 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/collectionParamConf/domain/DaCollectionParamConf.java
@@ -138,6 +138,19 @@
@Excel(name = "榛樿鍊�")
private String defaultValue;
+ /** 浜у搧鍨嬪彿 */
+ @Excel(name = "浜у搧鍨嬪彿")
+ private String productModel;
+
+
+ public String getProductModel() {
+ return productModel;
+ }
+
+ public void setProductModel(String productModel) {
+ this.productModel = productModel;
+ }
+
public String getProcessesName() {
return processesName;
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java
index f1b4092..98ce7de 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java
@@ -87,6 +87,15 @@
}
/**
+ * 鎷х揣鍙傛暟澧炲姞
+ */
+ @PostMapping("/addTighteningParameters")
+ public void addTighteningParameters(@RequestBody DaParamCollection daParamCollection)
+ {
+ daParamCollectionService.addTighteningParameters(daParamCollection);
+ }
+
+ /**
* 淇敼璁惧浜у搧杩囩▼鍙傛暟閲囬泦
*/
@PreAuthorize("@ss.hasPermi('main:paramCollection:edit')")
@@ -109,4 +118,5 @@
{
return toAjax(daParamCollectionService.deleteDaParamCollectionByIds(ids));
}
+
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
index 0865546..f277c2f 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
@@ -2,10 +2,12 @@
import com.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
+import java.util.Objects;
/**
* 璁惧浜у搧杩囩▼鍙傛暟閲囬泦瀵硅薄 da_param_collection
@@ -13,6 +15,7 @@
* @author yyt
* @date 2023-12-13
*/
+@Data
public class DaParamCollection extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -100,6 +103,18 @@
private String productBarcode;
+ private String tightenTheArray;
+
+ private String productModel;
+
+ public String getTightenTheArray() {
+ return tightenTheArray;
+ }
+
+ public void setTightenTheArray(String tightenTheArray) {
+ this.tightenTheArray = tightenTheArray;
+ }
+
public String getProductBarcode() {
return productBarcode;
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java
index 349e770..7488adb 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java
@@ -61,4 +61,6 @@
public int deleteDaParamCollectionById(Long id);
void addBasicParameters(DaParamCollection daParamCollection);
+
+ void addTighteningParameters(DaParamCollection daParamCollection);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
index 68dda81..6be9b13 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
@@ -130,4 +130,22 @@
daParamCollectionMapper.insertDaParamCollection(saveData);
});
}
+
+ @Override
+ public void addTighteningParameters(DaParamCollection daParamCollection) {
+ String str = daParamCollection.getTightenTheArray();
+ str = str.replace("[", "").replace("]", "").replace(" ", "");
+ String[] parts = str.split(",");
+ String value1 = parts[0];
+ String value2 = parts[2];
+
+ System.out.println("value1: " + value1);
+ System.out.println("value2: " + value2);
+
+// DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
+// daCollectionParamConf.setProductCode(daParamCollection.getProductCode());
+// daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
+// daCollectionParamConfMapper.selectDaCollectionParamConfList(daCollectionParamConf);
+ daParamCollectionMapper.insertDaParamCollection(daParamCollection);
+ }
}
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 4832124..93e0c9d 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
@@ -11,12 +11,12 @@
* OP010
*/
public static final String OP_OP010_RecordSN = "TestOP.OP1010.RecordSN";//璇锋眰涓嬪彂SN鍙�
- public static final String OP_OP230_RecordData = "TestOP.OP1010.RecordData";//璇锋眰璁板綍鏁版嵁
+ public static final String OP_OP230_RecordData = "OP.OP230.RecordData";//璇锋眰璁板綍鏁版嵁
/**
* OP020
*/
- public static final String OP_OP240_RecordData = "TestOP.OP2020.RecordData";//璇锋眰璁板綍鏁版嵁
+ public static final String OP_OP240_RecordData = "OP.OP240.RecordData";//璇锋眰璁板綍鏁版嵁
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 2434042..b3f749a 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
@@ -1,6 +1,7 @@
package com.jcdm.main.plcserver.sub;
+import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf;
import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
@@ -14,9 +15,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.websocket.Session;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
@@ -24,6 +27,8 @@
public class OPCUaSubscription implements SubscriptionCallback {
public static MiloService miloService;
+
+ Map<String, Session> map = WebSocketUsers.getUsers();
public IDaPassingStationCollectionService daPassingStationCollectionService;
@@ -93,8 +98,23 @@
//璁板綍鏁版嵁瀹屾垚
String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(recordDataDoneValue).build());
- }else{
+ }else if("3".equals(tabVlaue)){
+ String Torque = thoroughfare + "." + device + ".Torque";
+ String Angle = thoroughfare + "." + device + ".Angle";
+ String Result = thoroughfare + "." + device + ".Result";
+ String Result1 = thoroughfare + "." + device + ".Result1";
+ List<String> list = new ArrayList();
+ list.add(Torque);
+ list.add(Angle);
+ list.add(Result);
+ list.add(Result1);
+ List<ReadWriteEntity> list1 = miloService.readFromOpcUa(list);
+ List<Object> collect = list1.stream().map(ReadWriteEntity::getValue).collect(Collectors.toList());
+ String joinedString = String.join(",", collect.toString());
+ WebSocketUsers.sendMessageToUserByText(map.get(device), joinedString);
+ }else {
System.out.println("^");
+
}
diff --git a/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml b/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml
index 351d97a..d5d1775 100644
--- a/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/collectionParamConf/DaCollectionParamConfMapper.xml
@@ -39,10 +39,12 @@
<result property="demandDepartment" column="demand_department" />
<result property="whetherToCollect" column="whether_to_collect" />
<result property="defaultValue" column="default_value" />
+ <result property="productModel" column="product_model" />
+
</resultMap>
<sql id="selectDaCollectionParamConfVo">
- select id, processes_code, parameter_set_code, parameter_set_name, collect_parameter_id, collect_parameter_name, contrast_parameter_flag, collect_parameter_type, collect_parameter_unit, Descriptives, param_upper, param_lower, param_Central, product_code, gather_address, gather_sequence, remarks, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4, processes_name, device, project, accuracy, array_length, acquisition_frequency, demand_department, whether_to_collect, default_value from da_collection_param_conf
+ select id, processes_code, product_model, parameter_set_code, parameter_set_name, collect_parameter_id, collect_parameter_name, contrast_parameter_flag, collect_parameter_type, collect_parameter_unit, Descriptives, param_upper, param_lower, param_Central, product_code, gather_address, gather_sequence, remarks, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4, processes_name, device, project, accuracy, array_length, acquisition_frequency, demand_department, whether_to_collect, default_value from da_collection_param_conf
</sql>
<select id="selectDaCollectionParamConfList" parameterType="DaCollectionParamConf" resultMap="DaCollectionParamConfResult">
@@ -101,7 +103,9 @@
<if test="demandDepartment != null">demand_department,</if>
<if test="whetherToCollect != null">whether_to_collect,</if>
<if test="defaultValue != null">default_value,</if>
- </trim>
+ <if test="productModel != null">product_model,</if>
+
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="processesCode != null">#{processesCode},</if>
@@ -137,7 +141,9 @@
<if test="demandDepartment != null">#{demandDepartment},</if>
<if test="whetherToCollect != null">#{whetherToCollect},</if>
<if test="defaultValue != null">#{defaultValue},</if>
- </trim>
+ <if test="productModel != null">#{productModel},</if>
+
+ </trim>
</insert>
<update id="updateDaCollectionParamConf" parameterType="DaCollectionParamConf">
@@ -176,6 +182,8 @@
<if test="demandDepartment != null">demand_department = #{demandDepartment},</if>
<if test="whetherToCollect != null">whether_to_collect = #{whetherToCollect},</if>
<if test="defaultValue != null">default_value = #{defaultValue},</if>
+ <if test="productModel != null">product_model = #{productModel},</if>
+
</trim>
where id = #{id}
</update>
diff --git a/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js b/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js
index 446088e..911a5ba 100644
--- a/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js
+++ b/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js
@@ -35,6 +35,15 @@
})
}
+// 鏂板璁惧浜у搧杩囩▼鍙傛暟閲囬泦
+export function addTighteningParameters(data) {
+ return request({
+ url: '/main/paramCollection/addTighteningParameters',
+ method: 'post',
+ data: data
+ })
+}
+
// 淇敼璁惧浜у搧杩囩▼鍙傛暟閲囬泦
export function updateParamCollection(data) {
return request({
diff --git a/jcdm-ui/src/views/main/bs/formulaChild/index.vue b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
index 95a80ea..83916c2 100644
--- a/jcdm-ui/src/views/main/bs/formulaChild/index.vue
+++ b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
@@ -146,7 +146,7 @@
<!-- </el-table-column>-->
<el-table-column label="宸ュ簭" width="90" align="center" prop="processesCode">
</el-table-column>
- <el-table-column label="浜у搧缂栧彿" width="150" align="center" prop="productCode">
+ <el-table-column label="鐗╂枡缂栧彿" width="150" align="center" prop="productCode">
</el-table-column>
<el-table-column label="鎿嶄綔鍐呭" :show-overflow-tooltip='true' width="150" align="center" prop="operationSteps">
</el-table-column>
diff --git a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
index 866cb8b..a88cc5a 100644
--- a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
+++ b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
@@ -125,8 +125,10 @@
<el-table border v-loading="loading" :data="collectionParamConfList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="涓婚敭id" align="center" prop="id" />-->
-<!-- <el-table-column label="浜у搧缂栫爜" align="center" width="150" prop="productCode">-->
-<!-- </el-table-column>-->
+ <el-table-column label="浜у搧缂栫爜" align="center" width="150" prop="productCode">
+ </el-table-column>
+ <el-table-column label="浜у搧鍨嬪彿" align="center" prop="productModel">
+ </el-table-column>
<el-table-column label="宸ュ簭缂栧彿" align="center" width="80" prop="processesCode">
</el-table-column>
<el-table-column label="宸ュ簭鍚嶇О" width="150" align="center" prop="processesName">
@@ -157,8 +159,6 @@
</el-table-column>
<el-table-column label="鏁扮粍闀垮害" align="center" prop="arrayLength">
</el-table-column>
-
-
<!-- <el-table-column label="鏁版嵁鎻忚堪" align="center" width="160" prop="Descriptives">
</el-table-column>-->
<el-table-column label="涓婇檺鍊�" align="center" prop="paramUpper">
@@ -167,9 +167,6 @@
</el-table-column>
<el-table-column label="涓績鍊�" align="center" prop="paramCentral">
</el-table-column>
-
-
-
<el-table-column label="閲囬泦棰戠巼" width="107" align="center" prop="acquisitionFrequency">
</el-table-column>
<el-table-column label="涓氬姟闇�姹傞儴闂�" width="155" align="center" prop="demandDepartment">
@@ -417,7 +414,9 @@
acquisitionFrequency: null,
demandDepartment: null,
whetherToCollect: null,
- defaultValue: null
+ defaultValue: null,
+ productModel: null
+
};
this.resetForm("form");
},
diff --git a/jcdm-ui/src/views/main/da/paramCollection/index.vue b/jcdm-ui/src/views/main/da/paramCollection/index.vue
index a8f4ee1..7e5bf2e 100644
--- a/jcdm-ui/src/views/main/da/paramCollection/index.vue
+++ b/jcdm-ui/src/views/main/da/paramCollection/index.vue
@@ -74,23 +74,22 @@
<el-table v-loading="loading" border :data="paramCollectionList" @selection-change="handleSelectionChange" v-if="paramCollectionList.length > 0">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="宸ュ崟缂栧彿" width="150" align="center" prop="workOrderNo"></el-table-column>
-<!-- <el-table-column label="鎬绘垚搴忓垪鍙�" align="center" width="140" prop="sfcCode" ></el-table-column>-->
- <el-table-column label="浜у搧搴忓垪鍙�" align="center" width="150" prop="productCode"></el-table-column>
+ <el-table-column label="鎬绘垚搴忓垪鍙�" align="center" width="140" prop="sfcCode" ></el-table-column>
+ <el-table-column label="浜у搧缂栧彿" align="center" width="150" prop="productCode"></el-table-column>
<!-- <el-table-column label="浜х嚎缂栧彿" align="center" prop="productionLine"></el-table-column>-->
<el-table-column label="宸ュ簭缂栧彿" align="center" prop="locationCode"></el-table-column>
<!-- <el-table-column label="璁惧缂栧彿" align="center" prop="equipmentNo"></el-table-column>-->
<el-table-column label="鍙傛暟缂栫爜" width="150" align="center" prop="paramCode"></el-table-column>
<el-table-column label="鍙傛暟鍚嶇О" width="150" align="center" prop="paramName"></el-table-column>
- <el-table-column label="鍙傛暟鍊�" align="center" prop="paramValue"></el-table-column>
- <el-table-column label="鍙傛暟涓婇檺" align="center" prop="paramUpper"></el-table-column>
- <el-table-column label="鍙傛暟涓嬮檺" align="center" prop="paramLower"></el-table-column>
+ <el-table-column label="鍙傛暟鍊�" width="160" align="center" prop="paramValue"></el-table-column>
+<!-- <el-table-column label="鍙傛暟涓婇檺" align="center" prop="paramUpper"></el-table-column>
+ <el-table-column label="鍙傛暟涓嬮檺" align="center" prop="paramLower"></el-table-column>-->
<el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectionTime" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.collectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
- <el-table-column label="鐘舵��" align="center" prop="state"></el-table-column>
- <el-table-column label="鍙傛暟鍚嶇О" align="center" prop="paramName" width="150" ></el-table-column>
+<!-- <el-table-column label="鐘舵��" align="center" prop="state"></el-table-column>
<el-table-column label="鍗曚綅" align="center" prop="unit"></el-table-column>
<el-table-column label="绫诲瀷" align="center" prop="type"></el-table-column>
<el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" >
@@ -114,7 +113,7 @@
v-hasPermi="['main:paramCollection:remove']"
>鍒犻櫎</el-button>
</template>
- </el-table-column>
+ </el-table-column>-->
</el-table>
<el-empty v-else>
<span slot="description">鏆傛棤鏁版嵁</span>
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index e138770..8ff6692 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -34,7 +34,7 @@
<el-descriptions-item label="宸ュ崟缂栧彿">
<span>{{workpieceInformation.workOrderNo}}</span>
</el-descriptions-item>
- <el-descriptions-item label="浜у搧搴忓垪鍙�">
+ <el-descriptions-item label="浜у搧缂栧彿">
<span>{{workpieceInformation.productCode}}</span>
</el-descriptions-item>
<el-descriptions-item label="浜у搧鍨嬪彿">
@@ -291,7 +291,11 @@
import USBDevice from "@/utils/usb.json";
import {listProductionOrde} from "@/api/main/om/productionOrde/productionOrde";
import {addPassingStationCollection} from "@/api/main/da/passingStationCollection/passingStationCollection";
-import {addBasicParameters, addParamCollection} from "@/api/main/da/paramCollection/paramCollection";
+import {
+ addBasicParameters,
+ addParamCollection,
+ addTighteningParameters
+} from "@/api/main/da/paramCollection/paramCollection";
export default {
name: "stationTerminal",
@@ -312,7 +316,7 @@
headContent: {
processesCode: 'OP1010',
processesName: '璐存爣鏈�-璐寸爜',
- sfcCode: '10',
+ sfcCode: '',
},
workpieceInformation: {
workOrderNo: null,
@@ -343,7 +347,7 @@
},
content: '',
activeName: 'first',
- url: "ws://192.168.11.134:8080/websocket/message/",
+ url: "ws://192.168.11.76:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -371,6 +375,7 @@
title: "",
passingStationForm: {},
+ originalArray: [],
}
},
beforeDestroy() {
@@ -441,7 +446,8 @@
},
serialPortMethod(value){
let formulaChildParams = {
- materialCode: value,
+ scanBarcode: value,
+ sfcBarcode: this.headContent.sfcCode,
workOrderNo: this.workpieceInformation.workOrderNo,
productCode: this.workpieceInformation.productCode,
locationCode: this.headContent.processesCode,
@@ -571,23 +577,23 @@
alert("鏈繛鎺ュ埌鏈嶅姟鍣�");
}
},
- async initStation(){
+ initStation: async function () {
await getIpv4().then(response => {
this.StationConfQueryParams.ipAddress = response.msg
- console.log('鏌ヨ鍒版湰宸ヤ綅IP涓�'+this.StationConfQueryParams.ipAddress)
+ console.log('鏌ヨ鍒版湰宸ヤ綅IP涓�' + this.StationConfQueryParams.ipAddress)
});
await listStationConf(this.StationConfQueryParams).then(response => {
let rows = response.rows[0]
- if(response.rows.length===0){
+ if (response.rows.length === 0) {
this.$message('璇ュ伐浣嶆病鏈夐厤缃甀P锛岃鑱旂郴绠＄悊鍛橀厤缃甀P');
return
}
this.headContent.processesName = rows.processesName
this.headContent.processesCode = rows.processesCode
- console.log('璁剧疆宸ヤ綅缂栫爜'+this.headContent.processesCode)
+ console.log('璁剧疆宸ヤ綅缂栫爜' + this.headContent.processesCode)
});
- console.log('websocket杩炴帴宸ヤ綅涓�'+this.headContent.processesCode)
+ console.log('websocket杩炴帴宸ヤ綅涓�' + this.headContent.processesCode)
const wsuri = this.url + this.headContent.processesCode;
this.ws = new WebSocket(wsuri);
const self = this;
@@ -596,33 +602,62 @@
};
this.ws.onmessage = function (event) {
const DELAY_TIME = 2000;
- switch (event.data) {
- case "IN":
- self.cakeLamp.InPlace = 1;
- break;
- case "IN0":
+ if (event.data === "IN") {
+ self.cakeLamp.InPlace = 1;
+ } else if (event.data === "IN0") {
+ self.cakeLamp.InPlace = 0;
+ } else if (event.data === "OUT") {
+ self.cakeLamp.release = 1;
+ setTimeout(() => {
self.cakeLamp.InPlace = 0;
- break;
- case "OUT":
- self.cakeLamp.release = 1;
- setTimeout(() => {
- self.cakeLamp.InPlace = 0;
- self.cakeLamp.release = 0;
- self.cakeLamp.startWork = 0;
- self.cakeLamp.scanFinish = 0;
- self.Release();
- }, DELAY_TIME);
- break;
- case "TIGHTEN":
- this.formulaChildList = [];
- self.getListFormulaChild();
- break;
- default:
- break;
+ self.cakeLamp.release = 0;
+ self.cakeLamp.startWork = 0;
+ self.cakeLamp.scanFinish = 0;
+ self.Release();
+ }, DELAY_TIME);
+ } else if (event.data === "TIGHTEN") {
+ this.formulaChildList = [];
+ self.getListFormulaChild();
+ } else if (event.data.includes("[")) {
+ // 杩欓噷鏄� default 鍒嗘敮锛屽鏋滈渶瑕佹墽琛屾煇浜涙搷浣滐紝鍙互鏀惧湪杩欓噷
+ // console.log('鎺ユ敹鍒版暟鎹細', event.data)
+ // const arr = JSON.parse(event.data)
+ // console.log(arr)
+ const param = {
+ tightenTheArray: event.data,
+ workOrderNo: self.workpieceInformation.workOrderNo,
+ productCode: self.workpieceInformation.productCode,
+ locationCode: self.headContent.processesCode,
+ productBarcode: self.headContent.sfcCode,
+ }
+ addTighteningParameters(param).then(response => {});
}
+ // switch (event.data) {
+ // case "IN":
+ // self.cakeLamp.InPlace = 1;
+ // break;
+ // case "IN0":
+ // self.cakeLamp.InPlace = 0;
+ // break;
+ // case "OUT":
+ // self.cakeLamp.release = 1;
+ // setTimeout(() => {
+ // self.cakeLamp.InPlace = 0;
+ // self.cakeLamp.release = 0;
+ // self.cakeLamp.startWork = 0;
+ // self.cakeLamp.scanFinish = 0;
+ // self.Release();
+ // }, DELAY_TIME);
+ // break;
+ // case "TIGHTEN":
+ // this.formulaChildList = [];
+ // self.getListFormulaChild();
+ // break;
+ // default:
+ // break;
+ // }
};
},
-
//鎺ュ彈鏁版嵁鐨勫洖璋�
callBack(value) {
@@ -638,7 +673,7 @@
} else {
console.log('瀛楃涓蹭笉鍖呭惈瀛楁瘝"T"');
this.headContent.sfcCode = scanValue;
- this.queryParams.sfcCode = scanValue;
+ this.queryParams.productNum = scanValue;
this.getList()
// this.getListFormulaChild()
this.cakeLamp.scanFinish = 1
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index aad905d..56eb2ec 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -148,10 +148,12 @@
</el-table-column>
<el-table-column label="璁㈠崟缂栧彿" width="140" align="center" prop="salesOrderCode">
</el-table-column>
- <el-table-column label="浜у搧搴忓垪鍙�" width="110" align="center" prop="productCode">
+ <el-table-column label="浜у搧缂栧彿" width="110" align="center" prop="productCode">
</el-table-column>
<el-table-column label="浜у搧鍚嶇О" width="120" align="center" prop="productName">
</el-table-column>
+ <el-table-column label="浜у搧搴忓垪鍙�" width="110" align="center" prop="productNum">
+ </el-table-column>
<el-table-column label="浜у搧鍨嬪彿" align="center" prop="productModel">
</el-table-column>
<el-table-column label="宸ュ崟鐘舵��" width="100" align="center" prop="orderStatus">
--
Gitblit v1.9.3