From 5316c506119ad056a5640650e5e79babe4194d38 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期四, 25 四月 2024 20:33:31 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java | 7 ++
jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/testClass.java | 37 +++++------
jcdm-main/src/main/resources/mapper/bs/processes/BsProcessesInfoMapper.xml | 22 +-----
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 18 +++--
jcdm-main/src/main/java/com/jcdm/main/bs/processes/controller/BsProcessesInfoController.java | 7 ++
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 17 +++--
jcdm-ui/src/api/main/bs/processes/processes.js | 8 ++
jcdm-ui/src/views/main/sc/stationConf/index.vue | 5 +
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 4 +
jcdm-admin/src/main/resources/application-druid.yml | 2
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 40 ++++++++-----
11 files changed, 94 insertions(+), 73 deletions(-)
diff --git a/jcdm-admin/src/main/resources/application-druid.yml b/jcdm-admin/src/main/resources/application-druid.yml
index a820d91..af3fb75 100644
--- a/jcdm-admin/src/main/resources/application-druid.yml
+++ b/jcdm-admin/src/main/resources/application-druid.yml
@@ -22,6 +22,8 @@
username: sa
# password: JCDM@2023
password: admin@123
+# password: 1!deshine
+
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
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 91899ee..9fea30c 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
@@ -1,5 +1,6 @@
package com.jcdm.main.bs.formulaChild.service.impl;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -152,17 +153,18 @@
@Override
public AjaxResult updateResults(BsFormulaChildInfo bsFormulaChildInfo) {
String result = "";
-// BsFormulaChildInfo checkInfo = new BsFormulaChildInfo();
-// checkInfo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
-// checkInfo.setProductCode(bsFormulaChildInfo.getProductCode());
-//// checkInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode());
-// bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2));
-// List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(checkInfo);
- List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
+ List<BsFormulaChildInfo> bsFormulaChildInfos = new ArrayList<>();
+ List<BsFormulaChildInfo> infos = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
.eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode())
.eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode())
- .eq(BsFormulaChildInfo::getMaterialCode, bsFormulaChildInfo.getScanBarcode().substring(1, 2))
+ .eq(BsFormulaChildInfo::getOperationType, "2")
);
+ for (BsFormulaChildInfo formulaChildInfo : infos) {
+ if(bsFormulaChildInfo.getScanBarcode().contains(formulaChildInfo.getMaterialCode())){
+ bsFormulaChildInfos.add(formulaChildInfo);
+ break;
+ }
+ }
if(bsFormulaChildInfos.size()>0){
String spareField4 = bsFormulaChildInfos.get(0).getSpareField4();
bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getScanBarcode());
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/processes/controller/BsProcessesInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/processes/controller/BsProcessesInfoController.java
index 19dfebd..cbe0f5c 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/processes/controller/BsProcessesInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/processes/controller/BsProcessesInfoController.java
@@ -47,6 +47,13 @@
return getDataTable(list);
}
+ @GetMapping("/noList")
+ public TableDataInfo noList()
+ {
+ List<BsProcessesInfo> list = bsProcessesInfoService.list();
+ return getDataTable(list);
+ }
+
/**
* 瀵煎嚭宸ュ簭淇℃伅鍒楄〃
*/
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 c9c9d3d..53b1df6 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
@@ -89,14 +89,15 @@
lists.add(OPCElement.PACK_OP500_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP500_AngleResult);//璇锋眰璁板綍鏁版嵁
//
-// lists.add(OPCElement.PACK_OP280_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP320_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP340_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP350_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP360_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP370_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP390_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP470_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP280_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP320A_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP320B_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP340_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP350_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP360_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP370_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP390_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP470_RecordData);//璇锋眰璁板綍鏁版嵁
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 686581f..b28eddb 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
@@ -54,6 +54,11 @@
public static final String PACK_OP310_RecordData = "PACK.OP310.RecordData";//璇锋眰璁板綍鏁版嵁
public static final String PACK_OP310_AngleResult = "PACK.OP310.AngleResult";//璇锋眰鎷х揣鏁版嵁
+
+ public static final String PACK_OP320A_RecordData = "PACK.OP320A.RecordData";//璇锋眰璁板綍鏁版嵁
+
+ public static final String PACK_OP320B_RecordData = "PACK.OP320B.RecordData";//璇锋眰璁板綍鏁版嵁
+
/**
* OP330
*/
@@ -110,7 +115,7 @@
/**
* OP320
*/
- public static final String PACK_OP320_RecordData = "PACK.OP320.RecordData";//璇锋眰璁板綍鏁版嵁
+
/**
* OP340
*/
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 57e3805..dc802b1 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
@@ -34,11 +34,17 @@
public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ //鏂拌嚜鍔ㄥ伐绔�
+ public List<String> automaticList = Arrays.asList("OP280", "OP320A","OP320B", "OP340A","OP340B", "OP350A","OP350B", "OP360","OP365","OP370", "OP390", "OP470");
+
//鑷姩宸ヤ綅
- public List<String> automaticList = Arrays.asList("OP300","OP280", "OP320", "OP340", "OP350", "OP360","OP370", "OP390", "OP470", "OP530", "OP540");
+// public List<String> automaticList = Arrays.asList("OP300","OP280", "OP320A","OP320B", "OP340", "OP350", "OP360","OP370", "OP390", "OP470", "OP530", "OP540");
//閲囬泦妯＄粍宸ヤ綅
- public List<String> moduleCodeList = Arrays.asList("OP300","OP310", "OP320", "OP340", "OP350", "OP330");
+ public List<String> moduleCodeList = Arrays.asList("OP300","OP310", "OP340", "OP350", "OP330");
+
+ //鍖哄垎pack鍨嬪彿鐨勫伐浣�
+ public List<String> packIdList = Arrays.asList("OP280");
//绌虹殑
public List<String> nullList = Arrays.asList("OP250","OP260");
@@ -104,24 +110,26 @@
// }
//鑷姩宸ヤ綅
- //plc缁欐垜浠竴涓猵ack鐮侊紝鎷縫ack鐮佹牎楠屽嚭鍨嬪彿
- if(moduleCodeList.stream().anyMatch(s -> s.equals(device))){
- //璇绘ā缁勭爜
- String moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue().toString();
- String productTye = thoroughfare + "." + device + ".ProductType";
- if(null!=moduleCode && moduleCode.length() == 24){
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(productTye).value(Integer.valueOf(moduleCode.substring(7,8))).build());
- //杩涚珯淇濆瓨鏁版嵁
+ if(automaticList.stream().anyMatch(s -> s.equals(device))){
+ //plc缁欐垜浠竴涓ā缁勭爜锛屾嬁妯＄粍鐮佹牎楠屽嚭鍨嬪彿
+ if(moduleCodeList.stream().anyMatch(s -> s.equals(device))) {
+ //璇绘ā缁勭爜
+ String moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue().toString();
+ String productTye = thoroughfare + "." + device + ".ProductType";
+ if (null != moduleCode && moduleCode.length() == 24) {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(productTye).value(Integer.valueOf(moduleCode.substring(7, 8))).build());
+ //杩涚珯淇濆瓨鏁版嵁
// inSaveDate(thoroughfare,device)
- //璁板綍鏁版嵁瀹屾垚
- String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+ //璁板綍鏁版嵁瀹屾垚
+ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
- //璇锋眰宸ュ崟
- }else {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
+ //璇锋眰宸ュ崟
+ } else {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
+ }
}
}else {
//鎵嬪姩宸ヤ綅澶勭悊閫昏緫
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/testClass.java b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/testClass.java
index 832cd97..4e849eb 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/testClass.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/testClass.java
@@ -1,30 +1,27 @@
package com.jcdm.main.restful.factoryMes.controller;
-import java.util.Date;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.*;
public class testClass {
public static void main(String[] args) {
- // 鍒涘缓Timer瀹炰緥
- Timer timer = new Timer();
-
- // 鍒涘缓TimerTask瀹炰緥
- TimerTask task = new TimerTask() {
- @Override
- public void run() {
- // 鍦ㄨ繖閲岀紪鍐欏畾鏃朵换鍔＄殑鍏蜂綋閫昏緫
- System.out.println("瀹氭椂浠诲姟瑙﹀彂锛屽綋鍓嶆椂闂达細" + new Date());
+ String str = "123990016680564";
+ List<String> l = new ArrayList<>();
+ l.add("9900166805");
+ l.add("9900171753");
+ l.add("9900173353");
+ Integer i = 0;
+ String o = "";
+ for (String s : l) {
+ if(str.contains(s)){
+ i = s.length();
+ o = s;
+ break;
}
- };
+ }
+ System.out.println(i);
+ System.out.println(o);
- // 璁剧疆瀹氭椂浠诲姟鐨勮Е鍙戞椂闂翠负姣忓ぉ鐨�9:25
- // 鑾峰彇褰撳墠鏃堕棿
- Date currentTime = new Date();
- // 璁剧疆瀹氭椂浠诲姟鐨勮Е鍙戞椂闂翠负褰撳ぉ鐨�9:25
- Date scheduleTime = new Date(currentTime.getYear(), currentTime.getMonth(), currentTime.getDate(), 9, 27, 0);
- // 鍚姩瀹氭椂浠诲姟
- timer.schedule(task, scheduleTime);
+
}
}
diff --git a/jcdm-main/src/main/resources/mapper/bs/processes/BsProcessesInfoMapper.xml b/jcdm-main/src/main/resources/mapper/bs/processes/BsProcessesInfoMapper.xml
index 3245a3f..c0cf60a 100644
--- a/jcdm-main/src/main/resources/mapper/bs/processes/BsProcessesInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/processes/BsProcessesInfoMapper.xml
@@ -12,10 +12,10 @@
<result property="preparationTime" column="preparation_time" />
<result property="productiveTime" column="productive_time" />
<result property="status" column="status" />
- <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="createUser" column="create_user" />
<result property="createTime" column="create_time" />
<result property="updateUser" column="update_user" />
@@ -24,7 +24,7 @@
</resultMap>
<sql id="selectBsProcessesInfoVo">
- select id, processes_code, processes_name, processes_type, preparation_time, productive_time, status, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from bs_processes_info
+ select id, processes_code, processes_name, processes_type, preparation_time, productive_time, status, spare_field1, spare_field2, spare_field3, spare_field4, create_user, create_time, update_user, update_time, remarks from bs_processes_info
</sql>
<select id="selectBsProcessesInfoList" parameterType="BsProcessesInfo" resultMap="BsProcessesInfoResult">
@@ -52,10 +52,6 @@
<if test="preparationTime != null">preparation_time,</if>
<if test="productiveTime != null">productive_time,</if>
<if test="status != null">status,</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="createUser != null">create_user,</if>
<if test="createTime != null">create_time,</if>
<if test="updateUser != null">update_user,</if>
@@ -70,10 +66,6 @@
<if test="preparationTime != null">#{preparationTime},</if>
<if test="productiveTime != null">#{productiveTime},</if>
<if test="status != null">#{status},</if>
- <if test="spareField1 != null">#{spareField1},</if>
- <if test="spareField2 != null">#{spareField2},</if>
- <if test="spareField3 != null">#{spareField3},</if>
- <if test="spareField4 != null">#{spareField4},</if>
<if test="createUser != null">#{createUser},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateUser != null">#{updateUser},</if>
@@ -91,10 +83,6 @@
<if test="preparationTime != null">preparation_time = #{preparationTime},</if>
<if test="productiveTime != null">productive_time = #{productiveTime},</if>
<if test="status != null">status = #{status},</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="createUser != null">create_user = #{createUser},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateUser != null">update_user = #{updateUser},</if>
diff --git a/jcdm-ui/src/api/main/bs/processes/processes.js b/jcdm-ui/src/api/main/bs/processes/processes.js
index f9e93e4..5e6da0d 100644
--- a/jcdm-ui/src/api/main/bs/processes/processes.js
+++ b/jcdm-ui/src/api/main/bs/processes/processes.js
@@ -9,6 +9,14 @@
})
}
+export function listProcessesNoPage(query) {
+ return request({
+ url: '/bs/processes/noList',
+ method: 'get',
+ params: query
+ })
+}
+
// 鏌ヨ宸ュ簭淇℃伅璇︾粏
export function getProcesses(id) {
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 cfc464f..bed610d 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -119,6 +119,8 @@
</el-table-column>
<el-table-column label="浜у搧缂栧彿" align="center" prop="productCode">
</el-table-column>
+ <el-table-column label="鐗╂枡缂栫爜" align="center" prop="materialCode">
+ </el-table-column>
<el-table-column label="閲囬泦鍊�" align="center" prop="collectData">
</el-table-column>
<el-table-column label="缁撴灉" align="center" prop="results">
@@ -533,11 +535,11 @@
this.cakeLamp.release= 0 //鍏佽鏀捐
this.formulaChildList = []
- this.headContent.sfcCode = null
this.workpieceInformation.productCode = null;
this.workpieceInformation.workOrderNo = null;
this.workpieceInformation.productModel = null;
this.workpieceInformation.productName = null;
+ this.headContent.sfcCode = '';
},
changeMenu(tab, event) {
console.log(tab, event);
diff --git a/jcdm-ui/src/views/main/sc/stationConf/index.vue b/jcdm-ui/src/views/main/sc/stationConf/index.vue
index d924ef6..89d2e39 100644
--- a/jcdm-ui/src/views/main/sc/stationConf/index.vue
+++ b/jcdm-ui/src/views/main/sc/stationConf/index.vue
@@ -161,7 +161,7 @@
<script>
import {listStationConf, getStationConf, delStationConf, addStationConf, updateStationConf} from "@/api/main/sc/stationConf";
-import {listProcesses} from "@/api/main/bs/processes/processes";
+import {listProcesses, listProcessesNoPage} from "@/api/main/bs/processes/processes";
export default {
name: "StationConf",
@@ -232,7 +232,8 @@
},
initProcesses(){
- listProcesses(this.queryParams).then(response => {
+ this.options = [];
+ listProcessesNoPage().then(response => {
this.options = response.rows;
});
},
--
Gitblit v1.9.3