From 982c840def83ad765529635258599b5924499548 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期四, 23 五月 2024 18:20:24 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 66 +++++++++++++++++++++------------
1 files changed, 42 insertions(+), 24 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 a69367e..5d0670a 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
@@ -4,6 +4,8 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
import cn.hutool.core.util.StrUtil;
@@ -19,6 +21,7 @@
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper;
import com.jcdm.main.da.testDeviceInterface.service.IDaTestDeviceInterfaceService;
+import com.jcdm.main.plcserver.util.TimeUtil;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import org.aspectj.weaver.loadtime.Aj;
@@ -399,6 +402,7 @@
@Override
public AjaxResult updateTighteningFormula(BsFormulaChildInfo bsFormulaChildInfo) {
+ Boolean b = true;
BsFormulaChildInfo getMaterTwo = new BsFormulaChildInfo();
getMaterTwo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
getMaterTwo.setOperationType("2");
@@ -420,34 +424,48 @@
return AjaxResult.error("鎵弿缁撴灉NG,璇烽噸鏂版壂鎻忥紒");
}else {
List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery);
- bsFormulaChildInfos.get(0).setResults("OK");
- bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray());
- bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
-
- Integer stepNumber = Integer.valueOf(bsFormulaChildInfos.get(0).getStepSort());
- try {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".MStepNumber").value(stepNumber+1).build());
- } catch (Exception e) {
- throw new RuntimeException(e);
+ if(bsFormulaChildInfos.get(0).getSpareField2()!=null&&bsFormulaChildInfos.get(0).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()));
}
+ if(b){
+ bsFormulaChildInfos.get(0).setResults("OK");
+ bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray());
+ bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0));
+ Integer stepNumber = Integer.valueOf(bsFormulaChildInfos.get(0).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();
- if (spareField4 != null && !spareField4.isEmpty()) {
- // 鎵ц鎿嶄綔
- if(bsFormulaChildInfos.get(0).getSpareField4().equals("1")){
- try {
-// //鏇存柊杩囩珯璁板綍琛ㄥ嚭绔欐椂闂�
-// DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
-// daPassingStationCollection.setWorkOrderNo(bsFormulaChildInfo.getWorkOrderNo());
-// List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
-// daPassingStationCollections.get(0).setOutboundTime(new Date());
-// daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".RecordDataDone").value(21).build());
- WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "OUT");
- } catch (Exception e) {
- throw new RuntimeException(e);
+ String spareField4 = bsFormulaChildInfos.get(0).getSpareField4();
+ if (spareField4 != null && !spareField4.isEmpty()) {
+ // 鎵ц鎿嶄綔
+ if(bsFormulaChildInfos.get(0).getSpareField4().equals("1")){
+ try {
+ // //鏇存柊杩囩珯璁板綍琛ㄥ嚭绔欐椂闂�
+ // DaPassingStationCollection daPassingStationCollection = new DaPassingStationCollection();
+ // daPassingStationCollection.setWorkOrderNo(bsFormulaChildInfo.getWorkOrderNo());
+ // List<DaPassingStationCollection> daPassingStationCollections = daPassingStationCollectionMapper.selectDaPassingStationCollectionList(daPassingStationCollection);
+ // daPassingStationCollections.get(0).setOutboundTime(new Date());
+ // daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0));
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".RecordDataDone").value(21).build());
+ WebSocketUsers.sendMessageToUserByText(map.get(bsFormulaChildInfo.getLocationCode()), "OUT");
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
}
+ }else {
+ 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));
+ return AjaxResult.error("鎵弿缁撴灉NG,璇烽噸鏂版壂鎻忥紒");
}
}
--
Gitblit v1.9.3