From 9988c29bf4682179f8591afc89cc4bdd02313a8e Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期五, 22 三月 2024 10:01:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 68 insertions(+), 13 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 6be9b13..2b00023 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,11 +2,18 @@
import cn.hutool.core.date.DateUtil;
import com.jcdm.common.utils.DateUtils;
+import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo;
+import com.jcdm.main.bs.formulaChild.mapper.BsFormulaChildInfoMapper;
import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf;
import com.jcdm.main.da.collectionParamConf.mapper.DaCollectionParamConfMapper;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
+import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
+import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper;
+import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
+import com.kangaroohy.milo.model.ReadWriteEntity;
+import com.kangaroohy.milo.service.MiloService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,6 +33,15 @@
@Autowired
private DaCollectionParamConfMapper daCollectionParamConfMapper;
+
+ @Autowired
+ private BsFormulaChildInfoMapper bsFormulaChildInfoMapper;
+
+ @Autowired
+ private MiloService miloService;
+
+ @Autowired
+ private DaPassingStationCollectionMapper daPassingStationCollectionMapper;
/**
* 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦
@@ -118,11 +134,11 @@
daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
daCollectionParamConf.setCollectParameterId(key);
List<DaCollectionParamConf> daCollectionParamConfs = daCollectionParamConfMapper.selectDaCollectionParamConfList(daCollectionParamConf);
-
DaParamCollection saveData = new DaParamCollection();
saveData.setWorkOrderNo(daParamCollection.getWorkOrderNo());
saveData.setProductCode(daParamCollection.getProductCode());
saveData.setLocationCode(daParamCollection.getLocationCode());
+ saveData.setSfcCode(daParamCollection.getProductBarcode());
saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId());
saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName());
saveData.setCollectionTime(new Date());
@@ -133,19 +149,58 @@
@Override
public void addTighteningParameters(DaParamCollection daParamCollection) {
- String str = daParamCollection.getTightenTheArray();
- str = str.replace("[", "").replace("]", "").replace(" ", "");
- String[] parts = str.split(",");
- String value1 = parts[0];
- String value2 = parts[2];
+ String tightenData = daParamCollection.getTightenTheArray();
+ tightenData = tightenData.replace("[", "").replace("]", "").replace(" ", "");
+ String[] tightenDataParts = tightenData.split(",");
+ String paramCode = daParamCollection.getParamCode();
+ String[] paramCodeParts = paramCode.split(",");
+ for (int i = 0; i < paramCodeParts.length; i++) {
+ daParamCollection.setParamValue(tightenDataParts[i]);
+ daParamCollection.setParamCode(paramCodeParts[i]);
+ daParamCollection.setCollectionTime(new Date());
+ daParamCollection.setSfcCode(daParamCollection.getProductBarcode());
+ daParamCollectionMapper.insertDaParamCollection(daParamCollection);
+ }
+ }
- System.out.println("value1: " + value1);
- System.out.println("value2: " + value2);
+ @Override
+ public void saveCampaignTimeParameters(DaParamCollection daParamCollection) {
+ BsFormulaChildInfo bsFormulaChildInfo = new BsFormulaChildInfo();
+ bsFormulaChildInfo.setProcessesCode(daParamCollection.getLocationCode());
+ bsFormulaChildInfo.setProductCode(daParamCollection.getProductCode());
+ bsFormulaChildInfo.setSpareField4("1");
+ List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(bsFormulaChildInfo);
+ String result = bsFormulaChildInfos.get(0).getResults();
+ if(result != null && !result.isEmpty()){
+ try {
+ //杩囩珯鍙傛暟閲囬泦璁板綍鍑虹珯鏃堕棿
+ DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
+ daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
+ daCollectionParamConf.setCollectParameterId("OUTT");
+ List<DaCollectionParamConf> daCollectionParamConfs = daCollectionParamConfMapper.selectDaCollectionParamConfList(daCollectionParamConf);
+ DaParamCollection saveData = new DaParamCollection();
+ saveData.setWorkOrderNo(daParamCollection.getWorkOrderNo());
+ saveData.setProductCode(daParamCollection.getProductCode());
+ saveData.setLocationCode(daParamCollection.getLocationCode());
+ saveData.setSfcCode(daParamCollection.getProductBarcode());
+ saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId());
+ saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName());
+ saveData.setCollectionTime(new Date());
+ saveData.setParamValue(DateUtil.formatDateTime(new Date()));
+ daParamCollectionMapper.insertDaParamCollection(saveData);
-// DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
-// daCollectionParamConf.setProductCode(daParamCollection.getProductCode());
-// daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
-// daCollectionParamConfMapper.selectDaCollectionParamConfList(daCollectionParamConf);
- daParamCollectionMapper.insertDaParamCollection(daParamCollection);
+ //鏇存柊杩囩珯璁板綍琛ㄥ嚭绔欐椂闂�
+ DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
+ daPassingStationCollection.setWorkOrderNo(daParamCollection.getWorkOrderNo());
+ List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
+ daPassingStationCollections.get(0).setOutboundTime(new Date());
+ int i = daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
+
+ //缁檕pc鍙�21
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("OP."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
}
}
--
Gitblit v1.9.3