From 63b2548414682dd0127f0bffe3313ea465046957 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期一, 15 四月 2024 14:06:43 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 14 ++++++++++++--
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 8 ++++----
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 2 +-
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 12 ++++++++++--
4 files changed, 27 insertions(+), 9 deletions(-)
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 4f21d59..60b8193 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
@@ -39,6 +39,9 @@
private BsFormulaChildInfoMapper bsFormulaChildInfoMapper;
@Autowired
+ private IBsFormulaChildInfoService bsFormulaChildInfoService;
+
+ @Autowired
private DaParamCollectionMapper daParamCollectionMapper;
@Autowired
@@ -152,7 +155,7 @@
BsFormulaChildInfo checkInfo = new BsFormulaChildInfo();
checkInfo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
checkInfo.setProductCode(bsFormulaChildInfo.getProductCode());
- checkInfo.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){
@@ -195,7 +198,14 @@
@Override
public AjaxResult workpieceRelease(BsFormulaChildInfo bsFormulaChildInfo) {
- bsFormulaChildInfoMapper.workpieceRelease(bsFormulaChildInfo);
+ List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
+ .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode())
+ .eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode()));
+ for (BsFormulaChildInfo info : list) {
+ info.setSpareField4("");
+ info.setResults("");
+ bsFormulaChildInfoService.saveOrUpdate(info);
+ }
return AjaxResult.success();
}
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 75f616f..5a6836c 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
@@ -54,16 +54,16 @@
List<String> lists = new ArrayList<>();
// lists.add(OPCElement.PACK_OP010_RecordSN);//璇锋眰涓嬪彂SN鍙�
lists.add(OPCElement.PACK_OP230_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP240_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP240_RecordData);//璇锋眰璁板綍鏁版嵁.
// lists.add(OPCElement.PACK_OP240_AngleResult);//璇锋眰璁板綍鏁版嵁
// lists.add(OPCElement.PACK_OP250_RecordData);//璇锋眰璁板綍鏁版嵁
// lists.add(OPCElement.PACK_OP250_AngleResult);//璇锋眰璁板綍鏁版嵁
// lists.add(OPCElement.PACK_OP380_RecordData);//璇锋眰璁板綍鏁版嵁
// lists.add(OPCElement.PACK_OP380_AngleResult);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP300_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP300_RecordData);//璇锋眰璁板綍鏁版嵁
// lists.add(OPCElement.PACK_OP300_AngleResult);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP270_RecordData);//璇锋眰璁板綍鏁版嵁
-// lists.add(OPCElement.PACK_OP270_AngleResult);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP270_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP270_AngleResult);//璇锋眰璁板綍鏁版嵁
// lists.add(OPCElement.PACK_OP370_RecordData);//璇锋眰璁板綍鏁版嵁
return lists;
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 25de3cd..411e780 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
@@ -31,8 +31,10 @@
//鑷姩宸ヤ綅
public List<String> automaticList = Arrays.asList("OP300","OP280", "OP320", "OP340", "OP350", "OP360","OP370", "OP390", "OP470", "OP530", "OP540");
- public List<String> moduleCodeList = Arrays.asList("OP300","OP310", "OP320", "OP340", "OP350", "OP33");
+ //閲囬泦妯＄粍宸ヤ綅
+ public List<String> moduleCodeList = Arrays.asList("OP300","OP310", "OP320", "OP340", "OP350", "OP330");
+ //绌虹殑
public List<String> nullList = Arrays.asList("OP250","OP260");
@@ -90,11 +92,17 @@
//鏍￠獙鍏ョ珯鏄惁鍙互宸ヤ綔
//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";
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(productTye).value(Integer.valueOf(moduleCode.substring(7,8))).build());
+ }
//杩涚珯淇濆瓨鏁版嵁
// inSaveDate(thoroughfare,device)
//璁板綍鏁版嵁瀹屾垚
String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
if(automaticList.stream().noneMatch(s -> s.equals(device))){
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index c29cfdc..2279822 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -621,7 +621,7 @@
saveCampaignTimeParameters(param).then(response => {});
self.cakeLamp.release = 1;
self.endClear()
-
+ workpieceRelease(param).then(response => {});
} else if (event.data.includes("[")) {
let formulaChilds = "";
self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
--
Gitblit v1.9.3