From 288790d3b02242a073769db87a20f0912adcdf56 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期一, 13 五月 2024 10:22:39 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java | 10 ++
jcdm-ui/src/views/main/om/productionOrde/index.vue | 57 +++++++++++++
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 9 ++
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 2
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 2
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 103 +++++++++++++------------
jcdm-main/src/main/java/com/jcdm/main/plcserver/util/TimeUtil.java | 28 +++++++
7 files changed, 157 insertions(+), 54 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
index 75e574a..d000934 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
@@ -83,7 +83,7 @@
if(list.size() > 0){
paramProductNum = list.get(list.size()-1).getProductNum();
}
- String orderJsonString = RestfulService.getProductionWorkOrderRequest(paramProductNum, "POP230");
+ String orderJsonString = RestfulService.getProductionWorkOrderRequest(paramProductNum, "OP230");
JSONObject jsonObject = new JSONObject(orderJsonString);
// 浠嶫SONObject涓幏鍙杁ata瀵硅薄
JSONObject dataObject = jsonObject.getJSONObject("data");
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 38049d5..9b7cba8 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
@@ -83,12 +83,19 @@
lists.add(OPCElement.PACK_OP400_AngleResult);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP410_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP410_AngleResult);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP4301_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP4302_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP4303_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP4304_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP440_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP440_AngleResult);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP450_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP450_AngleResult);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP460_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP460_AngleResult);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP4801_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP4802_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP4803_RecordData);//璇锋眰璁板綍鏁版嵁
+
lists.add(OPCElement.PACK_OP500_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP500_AngleResult);//璇锋眰璁板綍鏁版嵁
//
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 dc25db8..569af77 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
@@ -24,6 +24,16 @@
public static final String PACK_OP2502_AngleResult = "PACK.OP250-2.AngleResult";//璇锋眰鎷х揣鏁版嵁
public static final String PACK_OP2503_AngleResult = "PACK.OP250-3.AngleResult";//璇锋眰鎷х揣鏁版嵁
+ public static final String PACK_OP4301_RecordData = "PACK.OP430-1.RecordData";//璇锋眰鎷х揣鏁版嵁
+ public static final String PACK_OP4302_RecordData = "PACK.OP430-2.RecordData";//璇锋眰鎷х揣鏁版嵁
+ public static final String PACK_OP4303_RecordData = "PACK.OP430-3.RecordData";//璇锋眰鎷х揣鏁版嵁
+ public static final String PACK_OP4304_RecordData = "PACK.OP430-4.RecordData";//璇锋眰鎷х揣鏁版嵁
+
+ public static final String PACK_OP4801_RecordData = "PACK.OP480-1.RecordData";//璇锋眰鎷х揣鏁版嵁
+ public static final String PACK_OP4802_RecordData = "PACK.OP480-2.RecordData";//璇锋眰鎷х揣鏁版嵁
+ public static final String PACK_OP4803_RecordData = "PACK.OP480-3.RecordData";//璇锋眰鎷х揣鏁版嵁
+
+
/**
* OP260
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 12af80d..8a3770f 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
@@ -5,6 +5,7 @@
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.jcdm.common.utils.StringUtils;
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf;
import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
@@ -50,6 +51,9 @@
//鍖哄垎pack鍨嬪彿鐨勫伐浣�
public List<String> packIdList = Arrays.asList("OP280","OP360","OP390","OP470");
+ //娴嬭瘯璁惧鎵嬪姩宸ヤ綅
+ public List<String> testList = Arrays.asList("OP430-1","OP430-2","OP430-3","OP430-4","OP480-1","OP480-2","OP480-3","OP440");
+
//绌虹殑
public List<String> nullList = Arrays.asList("OP250","OP260");
@@ -91,20 +95,7 @@
String tab = nodes[2];//鏍囪
String tabVlaue = value.toString();//鍦板潃鍊�
- //璇锋眰涓嬪彂SN鍙�
- if (("RecordSN").equals(tab) && "1".equals(tabVlaue)) {
- //鑾峰彇SN鍙锋柟娉�
- String SNCode = getSNCode();
-
- //涓嬪彂SN
- String SNCodeAddress = thoroughfare + "." + device + ".SNCode";
- miloService.writeToOpcChar(ReadWriteEntity.builder().identifier(SNCodeAddress).value(SNCode).build());
- //涓嬪彂SN瀹屾垚
- String recordSNDoneAddress = thoroughfare + "." + device + ".RecordSNDone";
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(recordSNDoneAddress).value(1).build());
- }
- //璇锋眰璁板綍鏁版嵁
- else if (("RecordData").equals(tab)) {
+ if (("RecordData").equals(tab)) {
String recordDataDoneValue = "";
if("1".equals(tabVlaue)){
@@ -117,49 +108,51 @@
//鑷姩宸ヤ綅
if(automaticList.stream().anyMatch(s -> s.equals(device))){
//plc缁欐垜浠竴涓ā缁勭爜锛屾嬁妯＄粍鐮佹牎楠屽嚭鍨嬪彿
- if(distinguishingModules.stream().anyMatch(s -> s.equals(device))) {
+ if(moduleCodeList.stream().anyMatch(s -> s.equals(device))) {
+ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
//璇绘ā缁勭爜
-// 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";
-//
+ Object moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
+
+ if(moduleCode!=null){
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(RecordDataDoneAddress).value(12).build());
+ }
}else {
if(agvId.stream().anyMatch(s -> s.equals(device))){
- String agvId = miloService.readFromOpcUa(thoroughfare + "." + device + ".AGVID").getValue().toString();
- String PACKCode = thoroughfare + "." + device + ".MPACKCode";
- if (null != agvId) {
- OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getTrolleyYard, agvId));
- String packId = one.getProductNum();
- miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(PACKCode).value(packId).build());
- } else {
+ Object agvIdObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".AGVID").getValue();
+ //agvId 灏忚溅鐮佹槸鍚︿负绌�
+ if(agvIdObject!=null){
+ String PACKCode = thoroughfare + "." + device + ".MPACKCode";
+ OmProductionOrdeInfo one = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getTrolleyYard, agvIdObject.toString()));
+ //灏忚溅鐮佹煡鎵惧伐鍗曟槸鍚︿负绌�
+ if(one!=null){
+ String packId = one.getProductNum();
+ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(PACKCode).value(packId).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").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());
}
- }
- //pack 濡傛灉鍖哄垎鍨嬪彿鐨勮瘽灏辫澶勭悊
- //璁板綍鏁版嵁瀹屾垚
- String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
+ }else {
+ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+ Object packCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".PACKCode").getValue();
+ if(packCodeObject!=null){
+ //pack 濡傛灉鍖哄垎鍨嬪彿鐨勮瘽灏辫澶勭悊
+ //璁板綍鏁版嵁瀹屾垚
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
+ }else {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(12).build());
+ }
+
+ }
}
}else {
//鎵嬪姩宸ヤ綅澶勭悊閫昏緫
-// if(automaticList.stream().noneMatch(s -> s.equals(device))){
- //缁欏墠绔彂宸ヤ欢鍒颁綅淇″彿
- WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
-// }
- //鏍￠獙鍚堟牸涓嶅悎鏍煎鏋滃悎鏍煎彲浠ヨ繘绔�
+ WebSocketUsers.sendMessageToUserByText(map.get(device), "IN");
String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
@@ -181,6 +174,10 @@
WebSocketUsers.sendMessageToUserByText(map.get(str), "END");
}else {
WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
+ }
+ if(testList.stream().anyMatch(s -> s.equals(device))){
+ String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(21).build());
}
}
}else {
@@ -356,12 +353,20 @@
ParamCollection.setParamCode(list.get(i).getCollectParameterId());
ParamCollection.setLocationCode(device);
if(tt.contains("Time")){
- String str = TimeUtil.getTimestamp(TimeUtil.stringProcessing(tt));
- ParamCollection.setParamValue(str);
+// String str = TimeUtil.getTimestamp(TimeUtil.stringProcessing(tt));
+// ParamCollection.setParamValue(str);
+ ParamCollection.setParamValue(TimeUtil.getYyyyDdMm(TimeUtil.stringProcessing(tt)));
}else {
ParamCollection.setParamValue(readWriteEntityList.get(i).getValue().toString());
}
ParamCollection.setSfcCode(packCode);
+ if(device.contains("OP360")){
+ String node = nodeIdList.get(i);
+ Object value = miloService.readFromOpcUa("PACK.OP360.ModuleSNCode"+node.charAt(node.length()-1)).getValue();
+ if(value!=null){
+ ParamCollection.setModuleCode(value.toString());
+ }
+ }
ParamCollection.setParamName(list.get(i).getCollectParameterName());
ParamCollection.setParamUpper(list.get(i).getParamUpper());
ParamCollection.setParamLower(list.get(i).getParamLower());
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/util/TimeUtil.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/util/TimeUtil.java
index ff32fe8..ce16371 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/util/TimeUtil.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/util/TimeUtil.java
@@ -7,6 +7,11 @@
import java.util.TimeZone;
public class TimeUtil {
+ public static void main(String[] args) {
+ String str = "PACK.OP360.ModuleSNCode1";
+ System.out.println(str.charAt(str.length()-1));
+ }
+
public static String stringProcessing(String dateTimeStr){
String result = "";
// 鎵惧埌 "javaDate=" 鐨勪綅缃�
@@ -51,4 +56,27 @@
}
return result;
}
+
+ public static String getYyyyDdMm(String inputDate){
+ String outputPattern = "yyyy-MM-dd HH:mm:ss";
+
+ // 瀹氫箟涓�涓В鏋愬櫒锛岀敤浜庡拷鐣ユ椂鍖猴紙浠呬綔涓虹ず渚嬶紝鍙兘闇�瑕佽皟鏁翠互澶勭悊涓嶅悓鐨勮緭鍏ワ級
+ SimpleDateFormat parser = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.ENGLISH);
+ parser.setLenient(false); // 璁剧疆涓嶅鏉撅紝浠ヤ弗鏍煎尮閰嶆牸寮�
+
+ // 瑙ｆ瀽鏃ユ湡瀛楃涓�
+ Date date = null;
+ try {
+ date = parser.parse(inputDate);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+ // 瀹氫箟涓�涓牸寮忓寲鍣紝鐢ㄤ簬杈撳嚭鎵�闇�鐨勬牸寮�
+ SimpleDateFormat formatter = new SimpleDateFormat(outputPattern);
+
+ // 鏍煎紡鍖栨棩鏈�
+ String outputDate = formatter.format(date);
+ return outputDate;
+ }
}
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 8089177..5d4b36d 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -526,6 +526,8 @@
this.workpieceInformation.productModel = null;
this.workpieceInformation.productName = null;
this.headContent.sfcCode = '';
+ this.headContent.yzSfcCode = '';
+ this.headContent.cardCode = '';
},
changeMenu(tab, event) {
console.log(tab, event);
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index ade8ab0..ddb4020 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -28,6 +28,14 @@
/>
</el-select>
</el-form-item>
+ <div style="display: none">
+ <div id="printMe" style="width: 500px;">
+ <div ref="canvasWrapper" id="canvasWrapper" style="display: flex;justify-content: center;"></div>
+ <p style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;">{{packCode}}</p>
+ </div>
+ <el-button @click="print">鎵撳嵃</el-button>
+ <el-button @click="test1">鐢熸垚浜岀淮鐮�</el-button>
+ </div>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">楂樼骇鏌ヨ</el-button>
@@ -283,6 +291,7 @@
updateProductionOrde,
receivingWorkOrders
} from "@/api/main/om/productionOrde/productionOrde";
+import QRCode from "qrcodejs2";
export default {
name: "ProductionOrde",
@@ -292,6 +301,8 @@
},
data() {
return {
+ // packCode: '0RSPB001139E3AE4X0000011',
+ packCode: 'test111',
titleName: '',
options: [],
lineOptions: [],
@@ -383,12 +394,52 @@
this.getList();
this.initWorkshop();
},
+ mounted() {
+ this.test1()
+ },
methods: {
- getWorkOrders(){
- receivingWorkOrders().then(response => {
- this.$modal.msgSuccess(response.msg);
+ async getWorkOrders(){
+ await receivingWorkOrders().then(response => {
this.getList()
+ this.packCode = response.msg;
+ this.test1()
});
+ setTimeout(() => {
+ this.print()
+ },50)
+ },
+ print() {
+ // 鏈〉闈㈢洿鎺ユ墦鍗帮紙鏈塨ug鍗曞瞾鍏堜笉瑕佸垹锛�
+ // let oldStr = window.document.body.innerHTML;
+ // let newStr = document.getElementById('printMe').innerHTML;
+ // document.body.innerHTML = newStr;
+ // window.print();
+ // document.body.innerHTML = oldStr;
+ // return false;
+
+ // 鏂板紑椤甸潰鎵撳嵃
+ // document.getElementById('canvasWrapper').innerHTML = '';
+ let newStr = document.getElementById('printMe').innerHTML;
+ let newWin = window.open('', '_blank');
+ newWin.document.body.innerHTML = newStr;
+ newWin.print();
+ return false;
+ },
+ test1(){
+ document.getElementById('canvasWrapper').innerHTML = ''
+ this.$nextTick(() => {
+ let qrCode = new QRCode('canvasWrapper',{
+ width: 80,
+ height: 80,
+ padding: 0,
+ margin: 0,
+ text: this.packCode,
+ colorDark: '#000',
+ colorLight: '#fff'
+ })
+ })
+ // console.log(this.packCode)
+ // this.print()
},
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImport() {
--
Gitblit v1.9.3