From 2377332554103dcbc54fff45777ef1c67cf0fb0e Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 28 五月 2024 08:53:35 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 11 deletions(-)
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 52557f1..7879018 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
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.db.Db;
import cn.hutool.http.HttpRequest;
@@ -9,6 +10,7 @@
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jcdm.common.core.domain.AjaxResult;
import com.jcdm.common.utils.DateUtils;
import com.jcdm.common.utils.StringUtils;
import com.jcdm.main.bs.formula.service.IBsFormulaInfoService;
@@ -27,6 +29,7 @@
import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import com.jcdm.main.plcserver.sub.OPCUaSubscription;
+import com.jcdm.main.restful.factoryMes.service.RestfulService;
import com.jcdm.main.restful.qingYan.doman.ChildVO;
import com.jcdm.main.restful.qingYan.doman.ParentVO;
import com.kangaroohy.milo.model.ReadWriteEntity;
@@ -79,6 +82,8 @@
@Autowired
private IDaCollectionParamConfService daCollectionParamConfService;
+
+ public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/**
* 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦
@@ -229,7 +234,16 @@
.eq(BsFormulaChildInfo::getProcessesCode, daParamCollection.getLocationCode())
.eq(BsFormulaChildInfo::getSpareField4, "1")
);
- if(!list.get(0).getResults().equals("OK")){
+ if(StringUtils.isNotBlank(list.get(0).getResults())){
+ if(!list.get(0).getResults().equals("OK")){
+ try {
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(22).build());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return;
+ }
+ }else {
try {
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(22).build());
} catch (Exception e) {
@@ -273,6 +287,9 @@
//缁檕pc鍙�21
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
+ if(daParamCollection.getLocationCode().equals("OP240")){
+ RestfulService.getWorkReportResultFeedback(daParamCollection.getProductBarcode(),"OP230",format.format(new Date()));
+ }
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -442,19 +459,21 @@
childVO.setItemCode(daParamCollection.getParamCode());
BsFormulaChildInfo childOne = bsFormulaChildInfoService.getOne(new LambdaQueryWrapper<BsFormulaChildInfo>().eq(BsFormulaChildInfo::getParamCode, daParamCollection.getParamCode()));
DaCollectionParamConf paramConfOne = daCollectionParamConfService.getOne(new LambdaQueryWrapper<DaCollectionParamConf>().eq(DaCollectionParamConf::getCollectParameterId, daParamCollection.getParamCode()));
- if(childOne!=null){
- String operationType = childOne.getOperationType();
- if(operationType.equals("1")){
- childVO.setItemType("2");
- }else if(operationType.equals("2")){
- childVO.setItemType("1");
- }
- }else {
- childVO.setItemType("3");
- }
+// if(childOne!=null){
+// String operationType = childOne.getOperationType();
+// if(operationType.equals("1")){
+// childVO.setItemType("2");
+// }else if(operationType.equals("2")){
+// childVO.setItemType("1");
+// }
+// }else {
+// childVO.setItemType("3");
+// }
if(paramConfOne!=null){
+ childVO.setItemType(paramConfOne.getSpareField1());
childVO.setItemText(paramConfOne.getCollectParameterName());
}else {
+ childVO.setItemType("3");
childVO.setItemText("");
}
childVO.setItemValue(daParamCollection.getParamValue());
@@ -479,4 +498,18 @@
}
+ @Override
+ public AjaxResult checkRecordDataDone(DaParamCollection daParamCollection) {
+ String result = "";
+ try {
+ Object recordDataDone = miloService.readFromOpcUa("PACK" + "." + daParamCollection.getLocationCode() + ".RecordDataDone").getValue();
+ if(ObjectUtil.isNotNull(recordDataDone)){
+ result = recordDataDone.toString();
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return AjaxResult.success(result);
+ }
+
}
--
Gitblit v1.9.3