From d545f19a84599c8664d3a7db87f35e02b1bf93f5 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 10 五月 2024 08:33:17 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 20 ++++++++++++++------
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 2 +-
2 files changed, 15 insertions(+), 7 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 3a21a26..7aa2cdf 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
@@ -6,6 +6,7 @@
import java.util.Map;
import java.util.stream.Collectors;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -214,7 +215,7 @@
Integer stepNumber = Integer.valueOf(bsFormulaChildInfos.get(0).getStepSort());
try {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".StepNumber").value(stepNumber).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".MStepNumber").value(stepNumber).build());
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -244,7 +245,9 @@
.eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode())
.eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode())
.eq(BsFormulaChildInfo::getOperationType, "2")
- );
+ ).stream().filter(x -> StrUtil.isBlank(x.getCollectData())).collect(Collectors.toList());
+
+
for (BsFormulaChildInfo formulaChildInfo : infos) {
if(bsFormulaChildInfo.getScanBarcode().contains(formulaChildInfo.getMaterialCode())){
bsFormulaChildInfos.add(formulaChildInfo);
@@ -348,7 +351,7 @@
public void jrmAddParameterCollection(BsFormulaChildInfo bsFormulaChildInfo){
String scanBarCode = bsFormulaChildInfo.getSfcBarcode();
String[] modeleSplit = scanBarCode.split(",");
- for (String modele : modeleSplit) {
+// for (String modele : modeleSplit) {
DaParamCollection daParamCollection = new DaParamCollection();
daParamCollection.setParamCode(bsFormulaChildInfo.getParamCode());
daParamCollection.setWorkOrderNo(bsFormulaChildInfo.getWorkOrderNo());
@@ -356,9 +359,14 @@
daParamCollection.setParamValue(bsFormulaChildInfo.getParamValue());
daParamCollection.setProductCode(bsFormulaChildInfo.getProductCode());
daParamCollection.setCollectionTime(new Date());
- daParamCollection.setSfcCode(modele);
+ if(bsFormulaChildInfo.getParamCode().contains("B")){
+ daParamCollection.setSfcCode(modeleSplit[1]);
+ }else {
+ daParamCollection.setSfcCode(modeleSplit[0]);
+ }
+// daParamCollection.setSfcCode(modele);
daParamCollectionMapper.insertDaParamCollection(daParamCollection);
- }
+// }
}
@@ -404,7 +412,7 @@
Integer stepNumber = Integer.valueOf(bsFormulaChildInfos.get(0).getStepSort());
try {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".StepNumber").value(stepNumber).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".MStepNumber").value(stepNumber).build());
} catch (Exception e) {
throw new RuntimeException(e);
}
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 188b8fe..dbe46e9 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
@@ -35,7 +35,7 @@
public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//鏂拌嚜鍔ㄥ伐绔�
- public List<String> automaticList = Arrays.asList("OP280", "OP300A","OP300B", "OP320A","OP320B", "OP340A","OP340B", "OP350A","OP350B", "OP360","OP365","OP370", "OP390", "OP470");
+ public List<String> automaticList = Arrays.asList("OP280","OP310A","OP310B", "OP300A","OP300B", "OP320A","OP320B", "OP340A","OP340B", "OP350A","OP350B", "OP360","OP365","OP370", "OP390", "OP470");
//閲囬泦妯＄粍宸ヤ綅 ModuleCode
public List<String> moduleCodeList = Arrays.asList("OP300A","OP300B","OP320A","OP320B","OP340A","OP340B","OP365", "OP350A", "OP350B", "OP330");
--
Gitblit v1.9.3