From 4e83fa344f6cba81412fb354e7f32a88a8f34fde Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 09 七月 2024 09:39:11 +0800
Subject: [PATCH] -切换大模组代码更改
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 267 ++++++++++++++++++++++++++---------------------------
1 files changed, 132 insertions(+), 135 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 a83227a..38654eb 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
@@ -11,9 +11,11 @@
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.core.conditions.update.LambdaUpdateWrapper;
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.framework.websocket.WebSocketUsers;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper;
@@ -179,10 +181,13 @@
.eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode())
.eq(BsFormulaChildInfo::getOperationType, "2")
);
- for (BsFormulaChildInfo formulaChildInfo : infos) {
- if(bsFormulaChildInfo.getScanBarcode().contains(formulaChildInfo.getMaterialCode())){
- bsFormulaChildInfos.add(formulaChildInfo);
- break;
+ List<String> newResultsList = infos.stream().map(s -> s.getCollectData()).collect(Collectors.toList());
+ if(newResultsList.stream().noneMatch(results -> results.equals(bsFormulaChildInfo.getScanBarcode()))){
+ for (BsFormulaChildInfo formulaChildInfo : infos) {
+ if(bsFormulaChildInfo.getScanBarcode().contains(formulaChildInfo.getMaterialCode())) {
+ bsFormulaChildInfos.add(formulaChildInfo);
+ break;
+ }
}
}
if(bsFormulaChildInfos.size()>0){
@@ -224,42 +229,44 @@
//// return AjaxResult.success("鎵弿鏈畬鎴愶紝绂佹鎷х揣鎿嶄綔锛�");
// }
// }
- BsFormulaChildInfo listQuery = new BsFormulaChildInfo();
- listQuery.setParamCode(bsFormulaChildInfo.getParamCode());
- listQuery.setProcessesCode(bsFormulaChildInfo.getLocationCode());
- String paramCode = bsFormulaChildInfo.getTightenTheArray();
- if(paramCode.contains("N")){
+// BsFormulaChildInfo listQuery = new BsFormulaChildInfo();
+// listQuery.setParamCode(bsFormulaChildInfo.getParamCode());
+// listQuery.setProcessesCode(bsFormulaChildInfo.getLocationCode());
+ String paramData = bsFormulaChildInfo.getTightenTheArray();
+ if(paramData.contains("N")){
result = "3";
- List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
- bsFormulaChildInfos.get(0).setResults("NG");
- bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray());
- bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
+// List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
+// bsFormulaChildInfos.get(0).setResults("NG");
+// bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray());
+// bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
+ this.updateTighteningData(bsFormulaChildInfo,"NG",paramData);
// return AjaxResult.success("鎵弿缁撴灉NG,璇烽噸鏂版壂鎻忥紒");
}else {
- List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
- if(bsFormulaChildInfos.get(0).getSpareField2()!=null&&bsFormulaChildInfos.get(0).getSpareField3()!=null){
+// List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
+ if(bsFormulaChildInfo.getSpareField2()!=null&&bsFormulaChildInfo.getSpareField3()!=null){
String tightenArray = bsFormulaChildInfo.getTightenTheArray().replace("[", "").replace("]", "").replace(" ", "");
String[] tightenDataParts = tightenArray.split(",");
- b = TimeUtil.isNumberInRange(Double.parseDouble(tightenDataParts[0]),Double.parseDouble(bsFormulaChildInfos.get(0).getSpareField2()),Double.parseDouble(bsFormulaChildInfos.get(0).getSpareField3()));
+ b = TimeUtil.isNumberInRange(Double.parseDouble(tightenDataParts[0]),Double.parseDouble(bsFormulaChildInfo.getSpareField2()),Double.parseDouble(bsFormulaChildInfo.getSpareField3()));
}
if(b){
result = "3";
- bsFormulaChildInfos.get(0).setResults("OK");
- bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray());
- bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
- logger.info("yzUpdateTighteningFormula--鏌ヨ鏉′欢鍙傛暟锛�"+listQuery);
- logger.info("yzUpdateTighteningFormula--鏌ヨ缁撴灉锛�"+bsFormulaChildInfos.get(0));
- Integer stepNumber = Integer.valueOf(bsFormulaChildInfos.get(0).getStepSort());
+// bsFormulaChildInfos.get(0).setResults("OK");
+// bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray());
+// bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
+ this.updateTighteningData(bsFormulaChildInfo,"OK",paramData);
+// logger.info("yzUpdateTighteningFormula--鏌ヨ鏉′欢鍙傛暟锛�"+listQuery);
+// logger.info("yzUpdateTighteningFormula--鏌ヨ缁撴灉锛�"+bsFormulaChildInfos.get(0));
+ Integer stepNumber = Integer.valueOf(bsFormulaChildInfo.getStepSort());
try {
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".MStepNumber").value(stepNumber+1).build());
} catch (Exception e) {
throw new RuntimeException(e);
}
- String spareField4 = bsFormulaChildInfos.get(0).getSpareField4();
+ String spareField4 = bsFormulaChildInfo.getSpareField4();
if (spareField4 != null && !spareField4.isEmpty()) {
// 鎵ц鎿嶄綔
- if(bsFormulaChildInfos.get(0).getSpareField4().equals("1")){
+ if(bsFormulaChildInfo.getSpareField4().equals("1")){
try {
// WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "OUT");
result = "2";
@@ -270,16 +277,28 @@
}
}else {
result = "3";
- List<BsFormulaChildInfo> bsFormulaChildInfos1 = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
- bsFormulaChildInfos1.get(0).setResults("NG");
- String originalString = bsFormulaChildInfo.getTightenTheArray();
- String modifiedString = originalString.replaceFirst("OK", "NG");
- bsFormulaChildInfos1.get(0).setCollectData(modifiedString);
- bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos1.get(0));
+// List<BsFormulaChildInfo> bsFormulaChildInfos1 = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
+// bsFormulaChildInfos1.get(0).setResults("NG");
+// String originalString = bsFormulaChildInfo.getTightenTheArray();
+ String modifiedString = paramData.replaceFirst("OK", "NG");
+// bsFormulaChildInfos1.get(0).setCollectData(modifiedString);
+// bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos1.get(0));
+ this.updateTighteningData(bsFormulaChildInfo,"NG",modifiedString);
// return AjaxResult.success("鎵弿缁撴灉NG,璇烽噸鏂版壂鎻忥紒");
}
}
return AjaxResult.success(result);
+ }
+
+ @Override
+ public AjaxResult updateTighteningData(BsFormulaChildInfo bsFormulaChildInfo,String result,String data) {
+ LambdaUpdateWrapper<BsFormulaChildInfo> updateWrapper = new LambdaUpdateWrapper();
+ updateWrapper.set(BsFormulaChildInfo::getCollectData, data);
+ updateWrapper.set(BsFormulaChildInfo::getResults, result);
+ updateWrapper.eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode());
+ updateWrapper.eq(BsFormulaChildInfo::getParamCode, bsFormulaChildInfo.getParamCode());
+ boolean update = bsFormulaChildInfoService.update(new BsFormulaChildInfo(), updateWrapper);
+ return AjaxResult.success(update);
}
@Override
@@ -319,6 +338,8 @@
// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strA+".RecordDataDone").value(21).build());
// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strB+".RecordDataDone").value(21).build());
String locationCode = bsFormulaChildInfo.getLocationCode();
+ WebSocketUsers.sendMessageToUserByText(map.get(locationCode), "OUT");
+
// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+locationCode+".RecordDataDone").value(21).build());
} catch (Exception e) {
throw new RuntimeException(e);
@@ -333,42 +354,14 @@
@Override
public AjaxResult jrmWorkpieceRelease(BsFormulaChildInfo bsFormulaChildInfo) {
- List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
- .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode())
- .eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode()));
- for (BsFormulaChildInfo info : list) {
- info.setCollectData("");
- info.setResults("");
- bsFormulaChildInfoService.saveOrUpdate(info);
- }
- String[] split = bsFormulaChildInfo.getProductBarcode().split(",");
- try {
- for (int i = 0; i < split.length; i++) {
- daParamCollectionService.pushGeelycvMesFeedback(split[i], bsFormulaChildInfo.getLocationCode());
- String barCode = bsFormulaChildInfo.getProductBarcode();
- String locationCode = bsFormulaChildInfo.getLocationCode();
- DaPassingStationCollection passingStationCollectionOne = daPassingStationCollectionService.getOne(new LambdaQueryWrapper<DaPassingStationCollection>().eq(DaPassingStationCollection::getSfcCode, barCode).eq(DaPassingStationCollection::getLocationCode, locationCode));
- if (passingStationCollectionOne != null) {
- passingStationCollectionOne.setOutRsSign("1");
- passingStationCollectionOne.setOutboundTime(new Date());
- daPassingStationCollectionService.saveOrUpdate(passingStationCollectionOne);
- }
- }
- }catch (Exception e){
- }
+ this.clearCollectDataAndResultsByProcessesCode(bsFormulaChildInfo);
+ daParamCollectionService.pushGeelycvMesFeedback(bsFormulaChildInfo.getProductBarcode(), bsFormulaChildInfo.getLocationCode());
return AjaxResult.success();
}
@Override
public AjaxResult clearWorkpieceRelease(BsFormulaChildInfo bsFormulaChildInfo) {
- List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
- .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode())
- .eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode()));
- for (BsFormulaChildInfo info : list) {
- info.setCollectData("");
- info.setResults("");
- bsFormulaChildInfoService.saveOrUpdate(info);
- }
+ this.clearCollectDataAndResultsByProcessesCode(bsFormulaChildInfo);
return AjaxResult.success();
}
@@ -389,6 +382,17 @@
}
@Override
+ public AjaxResult clearCollectDataAndResultsByProcessesCode(BsFormulaChildInfo bsFormulaChildInfo) {
+ LambdaUpdateWrapper<BsFormulaChildInfo> updateWrapper = new LambdaUpdateWrapper();
+ updateWrapper.set(BsFormulaChildInfo::getCollectData, "");
+ updateWrapper.set(BsFormulaChildInfo::getResults,"");
+ updateWrapper.eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode());
+ BsFormulaChildInfo info = new BsFormulaChildInfo();
+ boolean update = this.update(info,updateWrapper);
+ return AjaxResult.success(update);
+ }
+
+ @Override
public BsFormulaChildInfo releaseCheck(BsFormulaChildInfo bsFormulaChildInfo) {
return bsFormulaChildInfoMapper.releaseCheck(bsFormulaChildInfo);
}
@@ -405,7 +409,16 @@
);
for (BsFormulaChildInfo formulaChildInfo : infos) {
if(bsFormulaChildInfo.getScanBarcode().contains(formulaChildInfo.getMaterialCode())){
- bsFormulaChildInfos.add(formulaChildInfo);
+ if(null != formulaChildInfo.getCollectData()){
+ if(!formulaChildInfo.getCollectData().equals(bsFormulaChildInfo.getScanBarcode())){
+ bsFormulaChildInfos.add(formulaChildInfo);
+ }else{
+ result = "2";
+ return AjaxResult.success(result);
+ }
+ }else{
+ bsFormulaChildInfos.add(formulaChildInfo);
+ }
break;
}
}
@@ -437,8 +450,6 @@
}
}
}
- }else {
- result = "1";
}
return AjaxResult.success(result);
}
@@ -467,59 +478,33 @@
public void jrmAddParameterCollection(BsFormulaChildInfo bsFormulaChildInfo){
String scanBarCode = bsFormulaChildInfo.getSfcBarcode();
- String[] modeleSplit = scanBarCode.split(",");
-// for (String modele : modeleSplit) {
- DaParamCollection daParamCollection = new DaParamCollection();
- daParamCollection.setParamCode(bsFormulaChildInfo.getParamCode());
- daParamCollection.setWorkOrderNo(bsFormulaChildInfo.getWorkOrderNo());
- daParamCollection.setLocationCode(bsFormulaChildInfo.getLocationCode());
- daParamCollection.setParamValue(bsFormulaChildInfo.getParamValue());
- daParamCollection.setProductCode(bsFormulaChildInfo.getProductCode());
- daParamCollection.setCollectionTime(new Date());
- if(bsFormulaChildInfo.getParamCode().contains("B")){
- daParamCollection.setSfcCode(modeleSplit[1]);
- }else {
- daParamCollection.setSfcCode(modeleSplit[0]);
- }
-// daParamCollection.setSfcCode(modele);
- daParamCollectionMapper.insertDaParamCollection(daParamCollection);
-// }
+ DaParamCollection daParamCollection = new DaParamCollection();
+ daParamCollection.setParamCode(bsFormulaChildInfo.getParamCode());
+ daParamCollection.setWorkOrderNo(bsFormulaChildInfo.getWorkOrderNo());
+ daParamCollection.setLocationCode(bsFormulaChildInfo.getLocationCode());
+ daParamCollection.setParamValue(bsFormulaChildInfo.getParamValue());
+ daParamCollection.setProductCode(bsFormulaChildInfo.getProductCode());
+ daParamCollection.setCollectionTime(new Date());
+ daParamCollection.setSfcCode(scanBarCode);
+ daParamCollectionMapper.insertDaParamCollection(daParamCollection);
- DaParamCollectionTemp daParamCollectionTemp = new DaParamCollectionTemp();
- daParamCollectionTemp.setParamCode(bsFormulaChildInfo.getParamCode());
- daParamCollectionTemp.setWorkOrderNo(bsFormulaChildInfo.getWorkOrderNo());
- daParamCollectionTemp.setLocationCode(bsFormulaChildInfo.getLocationCode());
- daParamCollectionTemp.setParamValue(bsFormulaChildInfo.getParamValue());
- daParamCollectionTemp.setProductCode(bsFormulaChildInfo.getProductCode());
- daParamCollectionTemp.setCollectionTime(new Date());
- if(bsFormulaChildInfo.getParamCode().contains("B")){
- daParamCollectionTemp.setSfcCode(modeleSplit[1]);
- }else {
- daParamCollectionTemp.setSfcCode(modeleSplit[0]);
- }
- daParamCollectionTempService.save(daParamCollectionTemp);
+ DaParamCollectionTemp daParamCollectionTemp = new DaParamCollectionTemp();
+ daParamCollectionTemp.setParamCode(bsFormulaChildInfo.getParamCode());
+ daParamCollectionTemp.setWorkOrderNo(bsFormulaChildInfo.getWorkOrderNo());
+ daParamCollectionTemp.setLocationCode(bsFormulaChildInfo.getLocationCode());
+ daParamCollectionTemp.setParamValue(bsFormulaChildInfo.getParamValue());
+ daParamCollectionTemp.setProductCode(bsFormulaChildInfo.getProductCode());
+ daParamCollectionTemp.setCollectionTime(new Date());
+ daParamCollection.setSfcCode(scanBarCode);
+
+ daParamCollectionTempService.save(daParamCollectionTemp);
}
@Override
public AjaxResult workpieceRelease(BsFormulaChildInfo bsFormulaChildInfo) {
- List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>()
- .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode())
- .eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode()));
- for (BsFormulaChildInfo info : list) {
- info.setCollectData("");
- info.setResults("");
- bsFormulaChildInfoService.saveOrUpdate(info);
- }
+ this.clearCollectDataAndResultsByProcessesCode(bsFormulaChildInfo);
try {
daParamCollectionService.pushGeelycvMesFeedback(bsFormulaChildInfo.getProductBarcode(), bsFormulaChildInfo.getLocationCode());
- String barCode = bsFormulaChildInfo.getProductBarcode();
- String locationCode = bsFormulaChildInfo.getLocationCode();
- DaPassingStationCollection passingStationCollectionOne = daPassingStationCollectionService.getOne(new LambdaQueryWrapper<DaPassingStationCollection>().eq(DaPassingStationCollection::getSfcCode, barCode).eq(DaPassingStationCollection::getLocationCode, locationCode));
- if (passingStationCollectionOne != null) {
- passingStationCollectionOne.setOutRsSign("1");
- passingStationCollectionOne.setOutboundTime(new Date());
- daPassingStationCollectionService.saveOrUpdate(passingStationCollectionOne);
- }
}catch (Exception e){
}
return AjaxResult.success();
@@ -535,43 +520,53 @@
List<String> collect = operationType.stream().map(BsFormulaChildInfo::getResults).collect(Collectors.toList());
for (String s : collect) {
if(s.equals("")){
- return AjaxResult.error("鎵弿鏈畬鎴愶紝绂佹鎷х揣鎿嶄綔锛�");
+ return AjaxResult.error("鎵爜鏈畬鎴愶紝绂佹鎷х揣鎿嶄綔锛�");
}
}
- BsFormulaChildInfo listQuery = new BsFormulaChildInfo();
- listQuery.setParamCode(bsFormulaChildInfo.getParamCode());
- listQuery.setProcessesCode(bsFormulaChildInfo.getLocationCode());
+
+ //娣诲姞鎷х揣鍙傛暟-鍙傛暟閲囬泦琛�
+ DaParamCollection daParamCollection = new DaParamCollection();
+ daParamCollection.setParamCode(bsFormulaChildInfo.getParamCode());
+ daParamCollection.setTightenTheArray(bsFormulaChildInfo.getTightenTheArray());
+ daParamCollection.setProductBarcode(bsFormulaChildInfo.getProductBarcode());
+ daParamCollection.setWorkOrderNo(bsFormulaChildInfo.getWorkOrderNo());
+ daParamCollection.setLocationCode(bsFormulaChildInfo.getLocationCode());
+ daParamCollection.setProductCode(bsFormulaChildInfo.getProductCode());
+ daParamCollectionService.addTighteningParameters(daParamCollection);
+
String paramCode = bsFormulaChildInfo.getTightenTheArray();
- if(paramCode.contains("N")){
- List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
+ if(paramCode.contains("NG")){
+ /* List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
bsFormulaChildInfos.get(0).setResults("NG");
bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray());
- bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
- return AjaxResult.error("鎵弿缁撴灉NG,璇烽噸鏂版壂鎻忥紒");
+*/
+ bsFormulaChildInfo.setResults("NG");
+ bsFormulaChildInfo.setCollectData(bsFormulaChildInfo.getTightenTheArray());
+ bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
+ return AjaxResult.error("鎷х揣缁撴灉NG,璇烽噸鏂版嫥绱э紒");
}else {
- List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
- if(bsFormulaChildInfos.get(0).getSpareField2()!=null&&bsFormulaChildInfos.get(0).getSpareField3()!=null){
+ //List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
+ if(bsFormulaChildInfo.getSpareField2()!=null&&bsFormulaChildInfo.getSpareField3()!=null){
String tightenArray = bsFormulaChildInfo.getTightenTheArray().replace("[", "").replace("]", "").replace(" ", "");
String[] tightenDataParts = tightenArray.split(",");
- b = TimeUtil.isNumberInRange(Double.parseDouble(tightenDataParts[0]),Double.parseDouble(bsFormulaChildInfos.get(0).getSpareField2()),Double.parseDouble(bsFormulaChildInfos.get(0).getSpareField3()));
+ b = TimeUtil.isNumberInRange(Double.parseDouble(tightenDataParts[0]),Double.parseDouble(bsFormulaChildInfo.getSpareField2()),Double.parseDouble(bsFormulaChildInfo.getSpareField3()));
}
if(b){
- bsFormulaChildInfos.get(0).setResults("OK");
- bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray());
- bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
- logger.info("鏌ヨ鏉′欢鍙傛暟锛�"+listQuery);
- logger.info("鏌ヨ缁撴灉锛�"+bsFormulaChildInfos.get(0));
- Integer stepNumber = Integer.valueOf(bsFormulaChildInfos.get(0).getStepSort());
+ bsFormulaChildInfo.setResults("OK");
+ bsFormulaChildInfo.setCollectData(bsFormulaChildInfo.getTightenTheArray());
+ bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
+
+ Integer stepNumber = Integer.valueOf(bsFormulaChildInfo.getStepSort());
try {
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".MStepNumber").value(stepNumber+1).build());
} catch (Exception e) {
throw new RuntimeException(e);
}
- String spareField4 = bsFormulaChildInfos.get(0).getSpareField4();
+ String spareField4 = bsFormulaChildInfo.getSpareField4();
if (spareField4 != null && !spareField4.isEmpty()) {
// 鎵ц鎿嶄綔
- if(bsFormulaChildInfos.get(0).getSpareField4().equals("1")){
+ if(spareField4.equals("1")){
try {
// //鏇存柊杩囩珯璁板綍琛ㄥ嚭绔欐椂闂�
// DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
@@ -587,17 +582,19 @@
}
}
}else {
- List<BsFormulaChildInfo> bsFormulaChildInfos1 = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
- bsFormulaChildInfos1.get(0).setResults("NG");
+ //List<BsFormulaChildInfo> bsFormulaChildInfos1 = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
+ bsFormulaChildInfo.setResults("NG");
String originalString = bsFormulaChildInfo.getTightenTheArray();
String modifiedString = originalString.replaceFirst("OK", "NG");
- bsFormulaChildInfos1.get(0).setCollectData(modifiedString);
- bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos1.get(0));
- return AjaxResult.error("鎵弿缁撴灉NG,璇烽噸鏂版壂鎻忥紒");
+ bsFormulaChildInfo.setCollectData(modifiedString);
+ bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfo);
+ return AjaxResult.error("鎷х揣缁撴灉NG,璇烽噸鏂版嫥绱э紒");
}
}
- return AjaxResult.success("鎵弿鎴愬姛锛�");
+
+
+ return AjaxResult.success("鎷х揣鎴愬姛锛�");
}
--
Gitblit v1.9.3