From a320dcc8a480436f2f6b3ef81fe6b607f080a64a Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期三, 15 五月 2024 19:15:50 +0800 Subject: [PATCH] - --- jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 83 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 2 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 07f7325..7bf0853 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 @@ -6,6 +6,7 @@ import java.util.Map; import java.util.stream.Collectors; +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.extension.service.impl.ServiceImpl; @@ -14,8 +15,10 @@ import com.jcdm.framework.websocket.WebSocketUsers; 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.testDeviceInterface.service.IDaTestDeviceInterfaceService; import com.kangaroohy.milo.model.ReadWriteEntity; import com.kangaroohy.milo.service.MiloService; import org.aspectj.weaver.loadtime.Aj; @@ -50,6 +53,12 @@ @Autowired private DaPassingStationCollectionMapper daPassingStationCollectionMapper; + + @Autowired + private IDaTestDeviceInterfaceService daTestDeviceInterfaceService; + + @Autowired + private IDaParamCollectionService daParamCollectionService; Map<String, Session> map = WebSocketUsers.getUsers(); @@ -214,7 +223,7 @@ Integer stepNumber = Integer.valueOf(bsFormulaChildInfos.get(0).getStepSort()); try { - miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".StepNumber").value(stepNumber).build()); + miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".MStepNumber").value(stepNumber+1).build()); } catch (Exception e) { throw new RuntimeException(e); } @@ -232,6 +241,53 @@ } } + } + return AjaxResult.success(result); + } + + @Override + public AjaxResult jrmUpdateResults(BsFormulaChildInfo bsFormulaChildInfo) { + String result = ""; + List<BsFormulaChildInfo> bsFormulaChildInfos = new ArrayList<>(); + List<BsFormulaChildInfo> infos = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>() + .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode()) + .eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode()) + .eq(BsFormulaChildInfo::getOperationType, "2") + ).stream().filter(x -> StrUtil.isBlank(x.getCollectData())).collect(Collectors.toList()); + + + for (BsFormulaChildInfo formulaChildInfo : infos) { + if(bsFormulaChildInfo.getScanBarcode().contains(formulaChildInfo.getMaterialCode())){ + bsFormulaChildInfos.add(formulaChildInfo); + break; + } + } + if(bsFormulaChildInfos.size()>0){ + String spareField4 = bsFormulaChildInfos.get(0).getSpareField4(); + bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getScanBarcode()); + bsFormulaChildInfos.get(0).setResults("OK"); + bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0)); + bsFormulaChildInfo.setParamValue(bsFormulaChildInfo.getScanBarcode()); + bsFormulaChildInfo.setParamCode(bsFormulaChildInfos.get(0).getParamCode()); + bsFormulaChildInfo.setSfcBarcode(bsFormulaChildInfo.getSfcBarcode()); + jrmAddParameterCollection(bsFormulaChildInfo); + + if (spareField4 != null && !spareField4.isEmpty()) { + // 鎵ц鎿嶄綔 + if(bsFormulaChildInfos.get(0).getSpareField4().equals("1")){ + try { + result = "3"; + String strA = bsFormulaChildInfo.getLocationCode() + "A"; + String strB = bsFormulaChildInfo.getLocationCode() + "B"; + miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strA+".RecordDataDone").value(21).build()); + miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+strB+".RecordDataDone").value(21).build()); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } + }else { + result = "1"; } return AjaxResult.success(result); } @@ -303,8 +359,31 @@ daParamCollectionMapper.insertDaParamCollection(daParamCollection); } + 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); +// } + + } + @Override public AjaxResult workpieceRelease(BsFormulaChildInfo bsFormulaChildInfo) { + daParamCollectionService.pushGeelycvMesFeedback(bsFormulaChildInfo.getProductBarcode(), bsFormulaChildInfo.getLocationCode()); List<BsFormulaChildInfo> list = bsFormulaChildInfoService.list(new LambdaQueryWrapper<BsFormulaChildInfo>() .eq(BsFormulaChildInfo::getProcessesCode, bsFormulaChildInfo.getLocationCode()) .eq(BsFormulaChildInfo::getProductCode, bsFormulaChildInfo.getProductCode())); @@ -345,7 +424,7 @@ Integer stepNumber = Integer.valueOf(bsFormulaChildInfos.get(0).getStepSort()); try { - miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".StepNumber").value(stepNumber).build()); + miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".MStepNumber").value(stepNumber+1).build()); } catch (Exception e) { throw new RuntimeException(e); } -- Gitblit v1.9.3