From b77c7b1843b5c8e0dc7079de00a4e3592806c236 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期五, 15 三月 2024 10:52:07 +0800
Subject: [PATCH] 操作看板
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 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..973d339 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,8 @@
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;
@@ -26,6 +28,9 @@
@Autowired
private DaCollectionParamConfMapper daCollectionParamConfMapper;
+
+ @Autowired
+ private BsFormulaChildInfoMapper bsFormulaChildInfoMapper;
/**
* 鏌ヨ璁惧浜у搧杩囩▼鍙傛暟閲囬泦
@@ -118,11 +123,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.getSfcCode());
saveData.setParamCode(daCollectionParamConfs.get(0).getCollectParameterId());
saveData.setParamName(daCollectionParamConfs.get(0).getCollectParameterName());
saveData.setCollectionTime(new Date());
@@ -133,19 +138,17 @@
@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];
-
- System.out.println("value1: " + value1);
- System.out.println("value2: " + value2);
-
-// DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf();
-// daCollectionParamConf.setProductCode(daParamCollection.getProductCode());
-// daCollectionParamConf.setProcessesCode(daParamCollection.getLocationCode());
-// daCollectionParamConfMapper.selectDaCollectionParamConfList(daCollectionParamConf);
- daParamCollectionMapper.insertDaParamCollection(daParamCollection);
+ 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);
+ }
}
}
--
Gitblit v1.9.3