From bdb4046a1ed5358a94cc9ce846f2a1ec88e5d5ec Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期二, 18 六月 2024 10:51:57 +0800 Subject: [PATCH] - --- jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 100 insertions(+), 15 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 8b053a4..a83227a 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 @@ -18,6 +18,8 @@ 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.paramCollectionTemp.domain.DaParamCollectionTemp; +import com.jcdm.main.da.paramCollectionTemp.service.IDaParamCollectionTempService; import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection; import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper; import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService; @@ -71,6 +73,9 @@ @Autowired private IDaPassingStationCollectionService daPassingStationCollectionService; + + @Autowired + private IDaParamCollectionTempService daParamCollectionTempService; Map<String, Session> map = WebSocketUsers.getUsers(); @@ -209,19 +214,19 @@ public AjaxResult yzUpdateTighteningFormula(BsFormulaChildInfo bsFormulaChildInfo) { Boolean b = true; String result = "1"; - BsFormulaChildInfo getMaterTwo = new BsFormulaChildInfo(); - getMaterTwo.setProcessesCode(bsFormulaChildInfo.getLocationCode()); - getMaterTwo.setOperationType("2"); - List<BsFormulaChildInfo> operationType = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(getMaterTwo); - List<String> collect = operationType.stream().map(BsFormulaChildInfo::getResults).collect(Collectors.toList()); - for (String s : collect) { - if(s.equals("")){ -// return AjaxResult.success("鎵弿鏈畬鎴愶紝绂佹鎷х揣鎿嶄綔锛�"); - } - } +// BsFormulaChildInfo getMaterTwo = new BsFormulaChildInfo(); +// getMaterTwo.setProcessesCode(bsFormulaChildInfo.getLocationCode()); +// getMaterTwo.setOperationType("2"); +// List<BsFormulaChildInfo> operationType = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(getMaterTwo); +// List<String> collect = operationType.stream().map(BsFormulaChildInfo::getResults).collect(Collectors.toList()); +// for (String s : collect) { +// if(s.equals("")){ +//// return AjaxResult.success("鎵弿鏈畬鎴愶紝绂佹鎷х揣鎿嶄綔锛�"); +// } +// } BsFormulaChildInfo listQuery = new BsFormulaChildInfo(); listQuery.setParamCode(bsFormulaChildInfo.getParamCode()); - listQuery.setLocationCode(bsFormulaChildInfo.getLocationCode()); + listQuery.setProcessesCode(bsFormulaChildInfo.getLocationCode()); String paramCode = bsFormulaChildInfo.getTightenTheArray(); if(paramCode.contains("N")){ result = "3"; @@ -314,7 +319,7 @@ // 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(); - miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+locationCode+".RecordDataDone").value(21).build()); +// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+locationCode+".RecordDataDone").value(21).build()); } catch (Exception e) { throw new RuntimeException(e); } @@ -322,6 +327,63 @@ } }else { result = "1"; + } + return AjaxResult.success(result); + } + + @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){ + } + 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); + } + return AjaxResult.success(); + } + + @Override + public AjaxResult checkMaterialCode(BsFormulaChildInfo bsFormulaChildInfo) { + String result = "1"; + BsFormulaChildInfo getMaterTwo = new BsFormulaChildInfo(); + getMaterTwo.setProcessesCode(bsFormulaChildInfo.getLocationCode()); + getMaterTwo.setOperationType("2"); + List<BsFormulaChildInfo> operationType = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(getMaterTwo); + List<String> collect = operationType.stream().map(BsFormulaChildInfo::getResults).collect(Collectors.toList()); + for (String s : collect) { + if(s.equals("")){ + result = "2"; + } } return AjaxResult.success(result); } @@ -369,7 +431,7 @@ if(bsFormulaChildInfos.get(0).getSpareField4().equals("1")){ try { result = "3"; - miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".RecordDataDone").value(21).build()); +// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("PACK."+bsFormulaChildInfo.getLocationCode()+".RecordDataDone").value(21).build()); } catch (Exception e) { throw new RuntimeException(e); } @@ -391,6 +453,16 @@ daParamCollection.setCollectionTime(new Date()); daParamCollection.setSfcCode(bsFormulaChildInfo.getSfcBarcode()); 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()); + daParamCollectionTemp.setSfcCode(bsFormulaChildInfo.getSfcBarcode()); + daParamCollectionTempService.save(daParamCollectionTemp); } public void jrmAddParameterCollection(BsFormulaChildInfo bsFormulaChildInfo){ @@ -413,6 +485,19 @@ 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); } @Override @@ -455,7 +540,7 @@ } BsFormulaChildInfo listQuery = new BsFormulaChildInfo(); listQuery.setParamCode(bsFormulaChildInfo.getParamCode()); - listQuery.setLocationCode(bsFormulaChildInfo.getLocationCode()); + listQuery.setProcessesCode(bsFormulaChildInfo.getLocationCode()); String paramCode = bsFormulaChildInfo.getTightenTheArray(); if(paramCode.contains("N")){ List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery); @@ -494,7 +579,7 @@ // 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()); +// 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); -- Gitblit v1.9.3