From ddb300bd410f6c9871c3c033e16451f709c2781e Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 16 四月 2024 10:09:46 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/controller/DaParamCollectionController.java | 9 ++++
jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java | 2
jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/testClass.java | 2
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java | 1
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 4 +-
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java | 9 ++++
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 54 +++++++++++++++++++--------
jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java | 2
jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml | 10 ++--
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 ++++
11 files changed, 93 insertions(+), 27 deletions(-)
diff --git a/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java b/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java
index 93ed826..1517545 100644
--- a/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java
+++ b/jcdm-framework/src/main/java/com/jcdm/framework/config/SecurityConfig.java
@@ -111,7 +111,7 @@
// 杩囨护璇锋眰
.authorizeRequests()
// 瀵逛簬鐧诲綍login 娉ㄥ唽register 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶
- .antMatchers("/login", "/register", "/captchaImage","/websocket/**","/postWebsocket/**","/em/inspectionPlanTask/**","/em/inspectionPlanItemsProject/**").permitAll()
+ .antMatchers("/login", "/register", "/captchaImage","/websocket/**","/postWebsocket/**","/em/inspectionPlanTask/**","/em/inspectionPlanItemsProject/**","/jcdmMes/**").permitAll()
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
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 60b8193..f9a4362 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
@@ -155,8 +155,8 @@
BsFormulaChildInfo checkInfo = new BsFormulaChildInfo();
checkInfo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
checkInfo.setProductCode(bsFormulaChildInfo.getProductCode());
- checkInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode());
-// bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
+// checkInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode());
+ bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(checkInfo);
if(bsFormulaChildInfos.size()>0){
String spareField4 = bsFormulaChildInfos.get(0).getSpareField4();
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 8976e8e..cf960ee 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
@@ -105,6 +105,15 @@
}
/**
+ * 鏇存崲鎬绘垚鍙�
+ */
+ @PostMapping("/replaceAssemblyCode")
+ public void replaceAssemblyCode(@RequestBody DaParamCollection daParamCollection)
+ {
+ daParamCollectionService.replaceAssemblyCode(daParamCollection);
+ }
+
+ /**
* 淇敼璁惧浜у搧杩囩▼鍙傛暟閲囬泦
*/
@PreAuthorize("@ss.hasPermi('main:paramCollection:edit')")
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 f277c2f..8838423 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
@@ -1,5 +1,6 @@
package com.jcdm.main.da.paramCollection.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;
import lombok.Data;
@@ -99,14 +100,20 @@
@Excel(name = "绫诲瀷")
private String type;
+ @TableField(exist = false)
private String model;
-
+ @TableField(exist = false)
private String productBarcode;
+ @TableField(exist = false)
private String tightenTheArray;
+ @TableField(exist = false)
private String productModel;
+ @TableField(exist = false)
+ private String yzSfcCode;
+
public String getTightenTheArray() {
return tightenTheArray;
}
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 cf4bae5..53dec1e 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
@@ -71,4 +71,5 @@
void insertBatch(List<DaParamCollection> confList);
+ void replaceAssemblyCode(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 3652b6a..c4d4395 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
@@ -60,6 +60,9 @@
@Resource
private SqlSessionFactory sqlSessionFactory;
+ @Autowired
+ private IDaParamCollectionService daParamCollectionService;
+
/**
* 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦
*
@@ -266,4 +269,19 @@
}
}
+
+ @Override
+ public void replaceAssemblyCode(DaParamCollection daParamCollection) {
+ List<DaParamCollection> list = daParamCollectionService.list(new LambdaQueryWrapper<DaParamCollection>()
+ .eq(DaParamCollection::getSfcCode, daParamCollection.getSfcCode())
+ .eq(DaParamCollection::getLocationCode, daParamCollection.getLocationCode())
+ );
+ if(list.size() > 0){
+ for (DaParamCollection paramCollection : list) {
+ paramCollection.setSfcCode(daParamCollection.getYzSfcCode());
+ daParamCollectionService.saveOrUpdate(paramCollection);
+ }
+ }
+
+ }
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/controller/testClass.java b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/testClass.java
similarity index 94%
rename from jcdm-main/src/main/java/com/jcdm/main/restful/controller/testClass.java
rename to jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/testClass.java
index 23b7f9d..832cd97 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/controller/testClass.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/testClass.java
@@ -1,4 +1,4 @@
-package com.jcdm.main.restful.controller;
+package com.jcdm.main.restful.factoryMes.controller;
import java.util.Date;
import java.util.Timer;
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/service/RestfulService.java b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
similarity index 98%
rename from jcdm-main/src/main/java/com/jcdm/main/restful/service/RestfulService.java
rename to jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
index b7ab013..bff26e2 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/service/RestfulService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
@@ -1,4 +1,4 @@
-package com.jcdm.main.restful.service;
+package com.jcdm.main.restful.factoryMes.service;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
diff --git a/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml b/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
index f8bfd29..d7175ed 100644
--- a/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/da/paramCollection/DaParamCollectionMapper.xml
@@ -18,8 +18,8 @@
<result property="paramLower" column="param_lower" />
<result property="paramStandard" column="param_standard" />
<result property="collectionTime" column="collection_time" />
- <result property="spareField1" column="spare_field_1" />
- <result property="spareField2" column="spare_field_2" />
+ <result property="spareField1" column="spare_field1" />
+ <result property="spareField2" column="spare_field2" />
<result property="createUser" column="create_user" />
<result property="createTime" column="create_time" />
<result property="updateUser" column="update_user" />
@@ -31,7 +31,7 @@
</resultMap>
<sql id="selectDaParamCollectionVo">
- select id, work_order_no, sfc_code, product_code, production_line, location_code, equipment_no, param_code, param_value, param_upper, param_lower, param_standard, collection_time, spare_field_1, spare_field_2, create_user, create_time, update_user, update_time, state, param_name, unit, type from da_param_collection
+ select id, work_order_no, sfc_code, product_code, production_line, location_code, equipment_no, param_code, param_value, param_upper, param_lower, param_standard, collection_time, spare_field1, spare_field2, create_user, create_time, update_user, update_time, state, param_name, unit, type from da_param_collection
</sql>
<select id="selectDaParamCollectionList" parameterType="DaParamCollection" resultMap="DaParamCollectionResult">
@@ -69,8 +69,8 @@
<if test="paramLower != null">param_lower,</if>
<if test="paramStandard != null">param_standard,</if>
<if test="collectionTime != null">collection_time,</if>
- <if test="spareField1 != null">spare_field_1,</if>
- <if test="spareField2 != null">spare_field_2,</if>
+ <if test="spareField1 != null">spare_field1,</if>
+ <if test="spareField2 != null">spare_field2,</if>
<if test="createUser != null">create_user,</if>
<if test="createTime != null">create_time,</if>
<if test="updateUser != null">update_user,</if>
diff --git a/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js b/jcdm-ui/src/api/main/da/paramCollection/paramCollection.js
index d16d5e0..ffc646b 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 replaceAssemblyCode(data) {
+ return request({
+ url: '/main/paramCollection/replaceAssemblyCode',
+ method: 'post',
+ data: data
+ })
+}
+
// 鏂板璁惧浜у搧杩囩▼鍙傛暟閲囬泦 saveCampaignTimeParameters
export function saveCampaignTimeParameters(data) {
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 2279822..e92d432 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -96,7 +96,13 @@
<!-- </el-col>-->
<!-- </el-row>-->
<el-row style="margin-top: 20px">
- <el-button @click="Release" type="primary">鏀捐</el-button>
+ <el-col></el-col>
+ <span style="width: 130px;" class="head-font">棰勮鎬绘垚鍙� : {{headContent.yzSfcCode}}</span>
+ </el-row>
+ <el-row style="margin-top: 20px">
+<!-- <el-button @click="Release" type="primary">缁戝畾</el-button>-->
+ <el-button @click="bindYzSfc" type="primary">缁戝畾</el-button>
+
</el-row>
</el-card>
@@ -308,7 +314,8 @@
addBasicParameters,
addParamCollection,
addTighteningParameters,
- saveCampaignTimeParameters
+ saveCampaignTimeParameters,
+ replaceAssemblyCode,
} from "@/api/main/da/paramCollection/paramCollection";
export default {
@@ -331,6 +338,7 @@
processesCode: 'OP1010',
processesName: '璐存爣鏈�-璐寸爜',
sfcCode: '',
+ yzSfcCode: '',
},
workpieceInformation: {
workOrderNo: null,
@@ -361,7 +369,7 @@
},
content: '',
activeName: 'first',
- url: "ws://192.168.1.100:8080/websocket/message/",
+ url: "ws://192.168.1.106:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
@@ -428,6 +436,19 @@
methods: {
serialLink() {
this.open1 = true
+ },
+ bindYzSfc(){
+ if(this.headContent.sfcCode!==""&&this.headContent.yzSfcCode!==""){
+ let param = {
+ sfcCode: this.headContent.sfcCode,
+ locationCode: this.headContent.processesCode,
+ yzSfcCode: this.headContent.yzSfcCode
+ }
+ this.$message('鍙互缁戝畾锛�');
+ replaceAssemblyCode(param).then(response => {
+
+ });
+ }
},
Release(){
// this.$message('portsList锛�'+this.portsList.length);
@@ -661,23 +682,24 @@
else {
const scanValue = this.myserialport.hex2atostr(value).replace(/[\r\n]/g, '');
console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
- // if(this.cakeLamp.InPlace=== 1){
- if(this.headContent.sfcCode !== ''){
+
+ if(this.headContent.sfcCode !== ''){
+ if(scanValue.includes("SS")){
+ this.headContent.yzSfcCode = scanValue
+ }else {
this.$message('鎵弿鐗╂枡缂栫爜'+scanValue);
console.log(scanValue)
this.serialPortMethod(scanValue)
- }else {
- this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
- this.headContent.sfcCode = scanValue;
- this.queryParams.productNum = scanValue;
- this.getList()
- // this.getListFormulaChild()
- this.cakeLamp.scanFinish = 1
- this.cakeLamp.startWork = 1
}
- // }else {
- // this.$message('宸ヤ欢鏈埌浣嶇姝㈡壂鐮侊紒');
- // }
+ } else {
+ this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
+ this.headContent.sfcCode = scanValue;
+ this.queryParams.productNum = scanValue;
+ this.getList()
+ this.cakeLamp.scanFinish = 1
+ this.cakeLamp.startWork = 1
+ }
+
}
},
clearHistory() {
--
Gitblit v1.9.3