| | |
| | | import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService; |
| | | import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection; |
| | | import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService; |
| | | import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo; |
| | | import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService; |
| | | import com.jcdm.main.plcserver.util.TimeUtil; |
| | | import com.jcdm.main.restful.qingYan.doman.ChildVO; |
| | | import com.jcdm.main.restful.qingYan.doman.ParentVO; |
| | | import com.kangaroohy.milo.model.ReadWriteEntity; |
| | |
| | | @Component |
| | | public class OPCUaSubscription implements SubscriptionCallback { |
| | | |
| | | public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| | | public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| | | |
| | | |
| | | |
| | | Map<String, Session> map = WebSocketUsers.getUsers(); |
| | | public static MiloService miloService; |
| | | |
| | | |
| | |
| | | }else if (Constants.RECORD_SN.equals(tab)){//求下发模组码请9 |
| | | if (Constants.ONE.equals(valueString)){ |
| | | if (Constants.OP100_1.equals(device) || Constants.OP100_2.equals(device) ){ |
| | | /*List<WorkOrder> orderList = workOrderService.list().stream() |
| | | .sorted(Comparator.comparing(WorkOrder::getCreateTime).reversed()) |
| | | .collect(Collectors.toList()); |
| | | //查询要生产的工单 |
| | | List<OmProductionOrdeInfo> orderList = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>() |
| | | .eq(OmProductionOrdeInfo::getOrderStatus, Constants.ONE));//工单状态 |
| | | |
| | | if (CollUtil.isNotEmpty(orderList)){ |
| | | Long id = orderList.get(0).getId(); |
| | | String productNum = orderList.get(0).getProductNum();//模组码 |
| | | //OP070下发产品模组码 |
| | | miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(productNum).build()); |
| | | //下发产品模组码 |
| | | miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MES_ModuleCode").value(productNum).build()); |
| | | miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MES_WorkOrderNumber").value(productNum).build()); |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MES_ProductType").value(productNum).build()); |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(1).build()); |
| | | |
| | | //更新工单状态为执行中 |
| | | OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo(); |
| | | omProductionOrdeInfo.setId(id); |
| | | omProductionOrdeInfo.setOrderStatus("3"); |
| | | omProductionOrdeInfoService.updateOmProductionOrdeInfo(omProductionOrdeInfo); |
| | | |
| | | //将产品SN发送到前台 |
| | | productNum = "productNum,"+ productNum; |
| | | WebSocketUsers.sendMessageToUserByText(map.get(device), productNum); |
| | | }else{ |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(2).build());//没有要生产的工单 |
| | | }*/ |
| | | } |
| | | } |
| | | } |
| | | }else if (Constants.RECORD_DATA.equals(tab)){//出入站 |
| | |
| | | if (Constants.OP030.equals(device)){ |
| | | //反馈电芯ocv检测结果 |
| | | boolean b = true;//OCVResultFeedBack(thoroughfare, device); |
| | | |
| | | //四个电芯的状态 |
| | | if (b){ |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build()); |
| | | log.info("写入到工位{}的RecordDataDone数据:{}",device,11); |
| | |
| | | //分段010-065段 |
| | | if (Constants.OP010.equals(device)){ |
| | | //010工位无过站记录,只给放行信号 |
| | | /*List<SendFactoryMes> collect = sendFactoryMesList.stream().filter(x -> device.equals(x.getLocationCode())).collect(Collectors.toList()); |
| | | if (CollUtil.isNotEmpty(collect)){ |
| | | for (SendFactoryMes sendFactoryMes : collect) { |
| | | ChildVO childVO = new ChildVO(); |
| | | childVO.setItemCode(sendFactoryMes.getItemCode()); |
| | | childVO.setItemText(sendFactoryMes.getItemText()); |
| | | childVO.setItemType(sendFactoryMes.getItemType()); |
| | | } |
| | | }*/ |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(21).build()); |
| | | log.info("写入到工位{}的RecordDataDone数据:{}",device,21); |
| | | }else if (Constants.OP020_OP065.contains(device)){ |
| | | Integer result = 21; |
| | | //读取电芯码 |
| | | List<String> cellCodeList = readCellCodeList(thoroughfare, device); |
| | | if(ObjectUtil.isNull(cellCodeList) && cellCodeList.size() != 4){ |
| | | if(ObjectUtil.isNull(cellCodeList) || cellCodeList.size() != 4){ |
| | | result = 23; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(23).build()); |
| | | }else{ |
| | | result = savePassingStation(thoroughfare, device,cellCodeList);//保存过站 |
| | | if(result==21) { |
| | | if(result == 21) { |
| | | result = saveParamCollection(thoroughfare, device,cellCodeList);//保存参数,发送工厂MES |
| | | } |
| | | } |
| | |
| | | log.info("写入到工位{}的RecordDataDone数据:{}",device,result); |
| | | } else if (Constants.OP100_1.equals(device) || Constants.OP100_2.equals(device)){ |
| | | |
| | | WebSocketUsers.sendMessageToUserByText(map.get(device), "END"); |
| | | } else { |
| | | //2:告知MES工位工作完成,请求记录工位数据 |
| | | //保存参数采集记录 |
| | | saveParamPassingData(device,thoroughfare); |
| | | //保存过站记录 |
| | | DaPassingStationCollection passingStationCollection = new DaPassingStationCollection(); |
| | | Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue(); |
| | | String moduleCode = null; |
| | | if (ObjectUtil.isNotNull(value1)){ |
| | | moduleCode = value1.toString(); |
| | | log.info("读取工位{}的ModuleCode数据:{}",device,moduleCode); |
| | | } |
| | | passingStationCollection.setSfcCode(moduleCode); |
| | | passingStationCollection.setLocationCode(device); |
| | | passingStationCollection.setInboundTime(new Date()); |
| | | String stationStatus = Constants.PASS; |
| | | ReadWriteEntity stationStatusRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StationStatus"); |
| | | if (ObjectUtil.isNotNull(stationStatusRead.getValue())){ |
| | | String string = stationStatusRead.getValue().toString(); |
| | | if (Constants.TWO.equals(string)){ |
| | | stationStatus = Constants.UN_PASS; |
| | | Integer result = 21; |
| | | Object modulCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue(); |
| | | if (ObjectUtil.isNull(modulCodeObjcet) && modulCodeObjcet.toString().trim().isEmpty()){ |
| | | result = 23; |
| | | }else{ |
| | | String moduleCode = modulCodeObjcet.toString(); |
| | | result = savePassingStation(thoroughfare, device,moduleCode);//保存过站 |
| | | if(result == 21) { |
| | | result = saveParamCollection(thoroughfare, device,moduleCode);//保存参数,发送工厂MES |
| | | } |
| | | } |
| | | passingStationCollection.setOutRsSign(stationStatus); |
| | | passingStationCollection.setCreateTime(new Date()); |
| | | daPassingStationCollectionService.save(passingStationCollection); |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(21).build()); |
| | | log.info("写入到工位{}的RecordDataDone数据:{}",device,21); |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build()); |
| | | log.info("写入到工位{}的RecordDataDone数据:{}",device,result); |
| | | } |
| | | } |
| | | } else if (Constants.RECORD_CHECK_CODE_1.equals(tab)) { |
| | | } /*else if (Constants.RECORD_CHECK_CODE_1.equals(tab)) { |
| | | if (Constants.OP100_1.equals(device)){ |
| | | //钢带条码校验--发送给工厂mes |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ScanerResult11").value(11).build()); |
| | |
| | | //PET带条码校验--发送给工厂mes |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ScanerResult12").value(11).build()); |
| | | } |
| | | } |
| | | }*/ |
| | | } |
| | | } catch (Exception e) { |
| | | log.error(e.getMessage()); |
| | | System.out.println(e.getMessage()); |
| | | log.info(e.getMessage()); |
| | | } |
| | |
| | | */ |
| | | private static List<String> readCellCodeList(String thoroughfare, String device){ |
| | | List<String> cellCodeList = new ArrayList<>(); |
| | | Map map = new HashMap(); |
| | | //电芯码地址 |
| | | List<String> readList = new ArrayList<>(); |
| | | readList.add(thoroughfare + "." + device +".CellCode_1"); |
| | |
| | | try { |
| | | List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(readList);//电芯码 |
| | | for (ReadWriteEntity readWriteEntity : readWriteEntityList) { |
| | | if (ObjectUtil.isNotNull(readWriteEntity.getValue())){ |
| | | if (ObjectUtil.isNotNull(readWriteEntity.getValue()) && !"".equals(readWriteEntity.getValue().toString().trim())){ |
| | | cellCodeList.add(readWriteEntity.getValue().toString());//封装电芯码 |
| | | }else{ |
| | | cellCodeList.add("");//封装电芯码 |
| | | } |
| | | } |
| | | |
| | | } catch (Exception e) { |
| | | throw new RuntimeException(e); |
| | | } |
| | | return cellCodeList; |
| | | } |
| | | |
| | | |
| | | /** |
| | | * 保存过站数据 |
| | | * @param thoroughfare 通道 |
| | | * @param device 工位 |
| | | * @param moduleCode 模组号 |
| | | * @return list |
| | | * @throws Exception e |
| | | */ |
| | | private static Integer savePassingStation(String thoroughfare, String device,String moduleCode){ |
| | | Integer result = 21; |
| | | |
| | | try { |
| | | //读进站时间 |
| | | Date startTime = new Date(); |
| | | ReadWriteEntity startTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StartTime");//进站时间 |
| | | if (ObjectUtil.isNotNull(startTimeRead.getValue())){ |
| | | startTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(startTimeRead.getValue().toString()))); |
| | | }else{ |
| | | result = 23; |
| | | log.info("读取到工位{}的StartTime数据:{},返回RecordDataDone的值为{}",device,"IS NULL!",result); |
| | | return result; |
| | | } |
| | | |
| | | //读工站状态 |
| | | String stationStatus = Constants.PASS; |
| | | ReadWriteEntity stationStatusRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StationStatus");//站状态地址 |
| | | if (ObjectUtil.isNotNull(stationStatusRead.getValue())){ |
| | | String string = stationStatusRead.getValue().toString(); |
| | | if (Constants.TWO.equals(string)){ |
| | | stationStatus = Constants.UN_PASS; |
| | | } |
| | | }else{ |
| | | result = 23; |
| | | log.info("读取到工位{}StationStatus数据:{},返回RecordDataDone的值为{}",device,"IS NULL!",result); |
| | | return result; |
| | | } |
| | | |
| | | DaPassingStationCollection passingStationCollection = new DaPassingStationCollection(); |
| | | passingStationCollection.setSfcCode(moduleCode);//电芯码 |
| | | passingStationCollection.setLocationCode(device);//工位 |
| | | passingStationCollection.setInboundTime(startTime);//进站时间 |
| | | passingStationCollection.setOutboundTime(new Date());//出站时间 |
| | | passingStationCollection.setOutRsSign(stationStatus);//站状态值 |
| | | passingStationCollection.setCollectionTime(new Date());//采集时间 |
| | | daPassingStationCollectionService.save(passingStationCollection); |
| | | |
| | | } catch (Exception e) { |
| | | throw new RuntimeException(e); |
| | | } |
| | | |
| | | return result; |
| | | } |
| | | |
| | | /** |
| | |
| | | Date startTime = new Date(); |
| | | ReadWriteEntity startTimeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".StartTime");//进站时间 |
| | | if (ObjectUtil.isNotNull(startTimeRead.getValue())){ |
| | | String stringStartTime = startTimeRead.getValue().toString(); |
| | | SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); |
| | | startTime = sdf.parse(stringStartTime); |
| | | startTime = format.parse(TimeUtil.test(TimeUtil.stringProcessing(startTimeRead.getValue().toString()))); |
| | | }else{ |
| | | result = 23; |
| | | log.info("读取到工位{}的StartTime数据:{},返回RecordDataDone的值为{}",device,"IS NULL!",result); |
| | | return result; |
| | | } |
| | | |
| | | //读工站状态 |
| | |
| | | } |
| | | }else{ |
| | | result = 23; |
| | | log.info("读取到工位{}StationStatuss数据:{},返回RecordDataDone的值为{}",device,"IS NULL!",result); |
| | | log.info("读取到工位{}StationStatus数据:{},返回RecordDataDone的值为{}",device,"IS NULL!",result); |
| | | return result; |
| | | } |
| | | |
| | | List<DaPassingStationCollection> passingList = new ArrayList<>(); |
| | | for (String cellCode : cellCodeList) { |
| | | DaPassingStationCollection passingStationCollection = new DaPassingStationCollection(); |
| | | if (ObjectUtil.isNotNull(cellCode)){ |
| | | if (ObjectUtil.isNotNull(cellCode) && !cellCode.isEmpty()){ |
| | | passingStationCollection.setSfcCode(cellCode);//电芯码 |
| | | passingStationCollection.setLocationCode(device);//工位 |
| | | passingStationCollection.setInboundTime(startTime);//进站时间 |
| | |
| | | passingStationCollection.setOutRsSign(stationStatus);//站状态值 |
| | | passingStationCollection.setCollectionTime(new Date());//采集时间 |
| | | passingList.add(passingStationCollection); |
| | | }else{ |
| | | result = 23; |
| | | log.info("读取到工位{}CellCode数据:{},返回RecordDataDone的值为{}",device,"IS NULL!",result); |
| | | } |
| | | } |
| | | |
| | |
| | | return result; |
| | | } |
| | | |
| | | |
| | | /** |
| | | * 保存电芯过站记录 |
| | | * 保存参数数据和发送工厂MES |
| | | * @param thoroughfare 通道 |
| | | * @param device 工位 |
| | | * @param moduleCode 模组号 |
| | | * @return list |
| | | * @throws Exception e |
| | | */ |
| | | private static Integer saveParamCollection(String thoroughfare, String device,String moduleCode){ |
| | | Integer result = 21;//返回结果 |
| | | String sendMes = ""; |
| | | |
| | | try { |
| | | //查询参数配置表 |
| | | List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>() |
| | | .eq(DaCollectionParamConf::getProcessesCode, device)//工位 |
| | | .eq(DaCollectionParamConf::getWhetherToCollect, Constants.ONE)//是否采集 |
| | | ); |
| | | if (CollUtil.isNotEmpty(list)){ |
| | | |
| | | List<String> collect = list.stream() |
| | | .map(DaCollectionParamConf::getGatherAddress).collect(Collectors.toList()); |
| | | List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(collect); |
| | | |
| | | List<DaParamCollection> collectionList = new ArrayList<>(); |
| | | List<ChildVO> mesList = new ArrayList<>(); |
| | | for (int i = 0; i < readWriteEntityList.size(); i++) { |
| | | DaParamCollection daParamCollection = new DaParamCollection(); |
| | | daParamCollection.setSfcCode(moduleCode);//模组码 |
| | | daParamCollection.setParamCode(list.get(i).getCollectParameterId());//参数编码 |
| | | daParamCollection.setParamName(list.get(i).getCollectParameterName());//参数名称 |
| | | String paramValue = ""; |
| | | if (ObjectUtil.isNotNull(readWriteEntityList.get(i).getValue())){ |
| | | paramValue = readWriteEntityList.get(i).getValue().toString();//参数值 |
| | | } |
| | | daParamCollection.setParamValue(paramValue);//参数值 |
| | | daParamCollection.setLocationCode(device);//工位 |
| | | daParamCollection.setCollectionTime(new Date());//采集时间 |
| | | collectionList.add(daParamCollection);//封装参数采集list |
| | | |
| | | //发送给工厂mes参数封装 |
| | | ChildVO childVO = new ChildVO(); |
| | | childVO.setItemCode(list.get(i).getCollectParameterId());//参数编码 |
| | | childVO.setItemType(list.get(i).getItemType()); |
| | | childVO.setItemValue(paramValue);//参数值 |
| | | childVO.setItemText(list.get(i).getCollectParameterName()); |
| | | childVO.setCheckResult("1"); |
| | | childVO.setCheckTime(new Date().toString()); |
| | | mesList.add(childVO); |
| | | } |
| | | |
| | | CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> { |
| | | //插入参数采集表 |
| | | daParamCollectionService.insertBatch(collectionList); |
| | | //上传到工厂mes |
| | | ParentVO parentVO = new ParentVO(); |
| | | parentVO.setStationCode(device);//工位 |
| | | parentVO.setSiteCode("3983"); |
| | | |
| | | parentVO.setRecordId(UUID.randomUUID().toString()); |
| | | parentVO.setTotalResult("1"); |
| | | parentVO.setProductNum(moduleCode); |
| | | parentVO.setCheckList(mesList); |
| | | |
| | | log.info("执行工厂MES方法start,传入数据:{}",parentVO); |
| | | HttpResponse execute = HttpRequest.post(orderLineUrl).body(JSONUtil.toJsonStr(parentVO)).execute(); |
| | | log.info("执行工厂MES方法end,返回数据:{}",execute.body()); |
| | | |
| | | }); |
| | | } |
| | | }catch (Exception e) { |
| | | throw new RuntimeException(e); |
| | | } |
| | | return result; |
| | | } |
| | | |
| | | /** |
| | | * 保存参数数据和发送工厂MES |
| | | * @param thoroughfare 通道 |
| | | * @param device 工位 |
| | | * @param cellCodeList 电芯码集合 |
| | |
| | | //查询参数配置表 |
| | | List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>() |
| | | .eq(DaCollectionParamConf::getProcessesCode, device)//工位 |
| | | .eq(DaCollectionParamConf::getRemarks, Constants.ONE));//类型 |
| | | .eq(DaCollectionParamConf::getWhetherToCollect, Constants.ONE)//是否采集 |
| | | );//类型 |
| | | if (CollUtil.isNotEmpty(list)) { |
| | | List<DaParamCollection> saveParamList = new ArrayList<>();//封装参数采集list |
| | | List<DaCollectionParamConf> confColl1 = list.stream().filter(x -> Constants.INT_ONE.equals(x.getKeyNum())).collect(Collectors.toList()); |
| | |
| | | List<ReadWriteEntity> paramCollectionList0 = miloService.readFromOpcUa(collect0);//电芯 参数值 |
| | | |
| | | //第一个电芯的数据 |
| | | if (CollUtil.isNotEmpty(paramCollectionList1)) { |
| | | if (CollUtil.isNotEmpty(paramCollectionList1) && !cellCodeList.get(0).isEmpty()) { |
| | | List<ChildVO> mesChildList1 = new ArrayList<>();//封装给工厂MES发送的childlist1 |
| | | for (int i = 0; i < paramCollectionList1.size(); i++) { |
| | | DaParamCollection daParamCollection = new DaParamCollection(); |
| | |
| | | childVO.setCheckResult("1"); |
| | | childVO.setCheckTime(new Date().toString()); |
| | | mesChildList1.add(childVO); |
| | | mesList.add(0, mesChildList1); |
| | | } |
| | | mesList.add(0, mesChildList1); |
| | | } |
| | | if (CollUtil.isNotEmpty(paramCollectionList2)) { |
| | | if (CollUtil.isNotEmpty(paramCollectionList2) && !cellCodeList.get(1).isEmpty()) { |
| | | List<ChildVO> mesChildList2 = new ArrayList<>();//封装给工厂MES发送的childlist2 |
| | | |
| | | for (int i = 0; i < paramCollectionList2.size(); i++) { |
| | |
| | | childVO.setCheckResult("1"); |
| | | childVO.setCheckTime(new Date().toString()); |
| | | mesChildList2.add(childVO); |
| | | mesList.add(1, mesChildList2); |
| | | } |
| | | mesList.add(1, mesChildList2); |
| | | } |
| | | if (CollUtil.isNotEmpty(paramCollectionList3)) { |
| | | if (CollUtil.isNotEmpty(paramCollectionList3) && !cellCodeList.get(2).isEmpty()) { |
| | | List<ChildVO> mesChildList3 = new ArrayList<>();//封装给工厂MES发送的childlist3 |
| | | for (int i = 0; i < paramCollectionList3.size(); i++) { |
| | | DaParamCollection daParamCollection = new DaParamCollection(); |
| | |
| | | childVO.setCheckResult("1"); |
| | | childVO.setCheckTime(new Date().toString()); |
| | | mesChildList3.add(childVO); |
| | | mesList.add(2, mesChildList3); |
| | | } |
| | | mesList.add(2, mesChildList3); |
| | | } |
| | | if (CollUtil.isNotEmpty(paramCollectionList4)) { |
| | | if (CollUtil.isNotEmpty(paramCollectionList4)&& !cellCodeList.get(3).isEmpty()) { |
| | | List<ChildVO> mesChildList4 = new ArrayList<>();//封装给工厂MES发送的childlist4 |
| | | for (int i = 0; i < paramCollectionList4.size(); i++) { |
| | | DaParamCollection daParamCollection = new DaParamCollection(); |
| | |
| | | childVO.setCheckResult("1"); |
| | | childVO.setCheckTime(new Date().toString()); |
| | | mesChildList4.add(childVO); |
| | | mesList.add(3, mesChildList4); |
| | | } |
| | | mesList.add(3, mesChildList4); |
| | | } |
| | | |
| | | //公共参数 |
| | | if (CollUtil.isNotEmpty(paramCollectionList0)) { |
| | | for (int i = 0; i < cellCodeList.size(); i++) {//循环4个电芯 |
| | | List<ChildVO> mesChildList0 = new ArrayList<>();//封装给工厂MES发送的childlist0 |
| | | for (int j = 0; j < paramCollectionList0.size(); j++) { |
| | | DaParamCollection daParamCollection = new DaParamCollection(); |
| | | daParamCollection.setSfcCode(cellCodeList.get(i));//电芯码 |
| | | daParamCollection.setParamCode(confColl0.get(j).getCollectParameterId());//参数编码 |
| | | daParamCollection.setParamName(confColl0.get(j).getCollectParameterName());//参数名称 |
| | | String paramValue = ""; |
| | | if (ObjectUtil.isNotNull(paramCollectionList0.get(j).getValue())) { |
| | | paramValue = paramCollectionList0.get(j).getValue().toString();//参数值 |
| | | } |
| | | daParamCollection.setParamValue(paramValue);//参数值 |
| | | daParamCollection.setLocationCode(device);//工位 |
| | | daParamCollection.setCollectionTime(new Date());//采集时间 |
| | | saveParamList.add(daParamCollection); |
| | | if(!cellCodeList.get(i).isEmpty()){ |
| | | List<ChildVO> mesChildList0 = new ArrayList<>();//封装给工厂MES发送的childlist0 |
| | | for (int j = 0; j < paramCollectionList0.size(); j++) { |
| | | DaParamCollection daParamCollection = new DaParamCollection(); |
| | | daParamCollection.setSfcCode(cellCodeList.get(i));//电芯码 |
| | | daParamCollection.setParamCode(confColl0.get(j).getCollectParameterId());//参数编码 |
| | | daParamCollection.setParamName(confColl0.get(j).getCollectParameterName());//参数名称 |
| | | String paramValue = ""; |
| | | if (ObjectUtil.isNotNull(paramCollectionList0.get(j).getValue())) { |
| | | paramValue = paramCollectionList0.get(j).getValue().toString();//参数值 |
| | | } |
| | | if(confColl0.get(j).getCollectParameterName().contains("时间") && !"".equals(paramValue)){ |
| | | paramValue = format.parse(TimeUtil.test(TimeUtil.stringProcessing(paramValue))).toString(); |
| | | } |
| | | daParamCollection.setParamValue(paramValue);//参数值 |
| | | daParamCollection.setLocationCode(device);//工位 |
| | | daParamCollection.setCollectionTime(new Date());//采集时间 |
| | | saveParamList.add(daParamCollection); |
| | | |
| | | //发送给工厂mes参数封装 |
| | | ChildVO childVO = new ChildVO(); |
| | | childVO.setItemCode(confColl0.get(j).getCollectParameterName());//参数 |
| | | childVO.setItemType(confColl0.get(j).getItemType()); |
| | | childVO.setItemValue(paramValue);//参数值 |
| | | childVO.setItemText(confColl0.get(j).getParameterSetName()); |
| | | childVO.setCheckResult("1"); |
| | | childVO.setCheckTime(new Date().toString()); |
| | | mesChildList0.add(childVO); |
| | | //发送给工厂mes参数封装 |
| | | ChildVO childVO = new ChildVO(); |
| | | childVO.setItemCode(confColl0.get(j).getCollectParameterName());//参数 |
| | | childVO.setItemType(confColl0.get(j).getItemType()); |
| | | childVO.setItemValue(paramValue);//参数值 |
| | | childVO.setItemText(confColl0.get(j).getParameterSetName()); |
| | | childVO.setCheckResult("1"); |
| | | childVO.setCheckTime(new Date().toString()); |
| | | mesChildList0.add(childVO); |
| | | } |
| | | mesList.add(i, mesChildList0); |
| | | } |
| | | mesList.get(i).addAll(mesChildList0); |
| | | /* mesList.add(mesChildList0);*/ |
| | | |
| | | //mesList.get(i).addAll(mesChildList0); |
| | | |
| | | } |
| | | |
| | | } |
| | |
| | | parentVO.setRecordId(UUID.randomUUID().toString()); |
| | | parentVO.setTotalResult("1"); |
| | | for (int i = 0; i < cellCodeList.size(); i++) {//循环4个电芯 |
| | | parentVO.setProductNum(cellCodeList.get(i));//电芯码 |
| | | parentVO.setCheckList(mesList.get(i));//参数 |
| | | //CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> { |
| | | log.info("执行工厂MES方法start,传入数据:{}",parentVO); |
| | | HttpResponse execute = HttpRequest.post(orderLineUrl).body(JSONUtil.toJsonStr(parentVO)).execute(); |
| | | log.info("执行工厂MES方法end,返回数据:{}",execute.body()); |
| | | //}); |
| | | if(!cellCodeList.get(i).isEmpty()){ |
| | | parentVO.setProductNum(cellCodeList.get(i));//电芯码 |
| | | parentVO.setCheckList(mesList.get(i));//参数 |
| | | //CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> { |
| | | log.info("执行工厂MES方法start,传入数据:{}",parentVO); |
| | | HttpResponse execute = HttpRequest.post(orderLineUrl).body(JSONUtil.toJsonStr(parentVO)).execute(); |
| | | log.info("执行工厂MES方法end,返回数据:{}",execute.body()); |
| | | } |
| | | } |
| | | }); |
| | | } |
| | |
| | | } |
| | | |
| | | /** |
| | | * 保存过站数据和参数保存数据 |
| | | * @param device 工位号 |
| | | * 030工位返回ocv测试结果 |
| | | * @param thoroughfare |
| | | * @param device |
| | | * @throws Exception |
| | | */ |
| | | private void saveParamPassingData(String device,String thoroughfare) throws Exception { |
| | | |
| | | //保存参数采集数据 |
| | | List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>() |
| | | .eq(DaCollectionParamConf::getProcessesCode, device) |
| | | .eq(DaCollectionParamConf::getRemarks, Constants.ONE)); |
| | | if (CollUtil.isNotEmpty(list)){ |
| | | List<String> collect = list.stream().map(DaCollectionParamConf::getGatherAddress) |
| | | .filter(Objects::nonNull).distinct() |
| | | .collect(Collectors.toList()); |
| | | QueryPLCData(device,thoroughfare,collect); |
| | | |
| | | } |
| | | private boolean OCVResultFeedBack(String thoroughfare, String device) throws Exception { |
| | | boolean flag = true; |
| | | Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_1").getValue(); |
| | | /*if (ObjectUtil.isNotNull(value1)){ |
| | | String string = value1.toString(); |
| | | List<QingYanTestInfo> list = qingYanTestInfoService.list(new LambdaQueryWrapper<QingYanTestInfo>() |
| | | .eq(QingYanTestInfo::getKeyCode, string)); |
| | | if (CollUtil.isNotEmpty(list)){ |
| | | QingYanTestInfo qingYanTestInfo = list.get(0); |
| | | if (Constants.ONE.equals(qingYanTestInfo.getStatus())){ |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(1).build()); |
| | | }else { |
| | | flag = false; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(2).build()); |
| | | } |
| | | } |
| | | }*/ |
| | | Object value2 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_2").getValue(); |
| | | /*if (ObjectUtil.isNotNull(value2)){ |
| | | String string = value2.toString(); |
| | | List<QingYanTestInfo> list = qingYanTestInfoService.list(new LambdaQueryWrapper<QingYanTestInfo>() |
| | | .eq(QingYanTestInfo::getKeyCode, string)); |
| | | if (CollUtil.isNotEmpty(list)){ |
| | | QingYanTestInfo qingYanTestInfo = list.get(0); |
| | | if (Constants.ONE.equals(qingYanTestInfo.getStatus())){ |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_2").value(1).build()); |
| | | }else { |
| | | flag = false; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_2").value(2).build()); |
| | | } |
| | | } |
| | | }*/ |
| | | Object value3 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_3").getValue(); |
| | | /*if (ObjectUtil.isNotNull(value3)){ |
| | | String string = value3.toString(); |
| | | List<QingYanTestInfo> list = qingYanTestInfoService.list(new LambdaQueryWrapper<QingYanTestInfo>() |
| | | .eq(QingYanTestInfo::getKeyCode, string)); |
| | | if (CollUtil.isNotEmpty(list)){ |
| | | QingYanTestInfo qingYanTestInfo = list.get(0); |
| | | if (Constants.ONE.equals(qingYanTestInfo.getStatus())){ |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_3").value(1).build()); |
| | | }else { |
| | | flag = false; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_3").value(2).build()); |
| | | } |
| | | } |
| | | }*/ |
| | | Object value4 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_4").getValue(); |
| | | /*if (ObjectUtil.isNotNull(value4)){ |
| | | String string = value4.toString(); |
| | | List<QingYanTestInfo> list = qingYanTestInfoService.list(new LambdaQueryWrapper<QingYanTestInfo>() |
| | | .eq(QingYanTestInfo::getKeyCode, string)); |
| | | if (CollUtil.isNotEmpty(list)){ |
| | | QingYanTestInfo qingYanTestInfo = list.get(0); |
| | | if (Constants.ONE.equals(qingYanTestInfo.getStatus())){ |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_4").value(1).build()); |
| | | }else { |
| | | flag = false; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_4").value(2).build()); |
| | | } |
| | | } |
| | | }*/ |
| | | return flag; |
| | | } |
| | | |
| | | /** |
| | | * 批量查询plc站点数据 |
| | | * @param device 站点 |
| | | * @param collect 点位 |
| | | * @throws Exception |
| | | */ |
| | | private static void QueryPLCData(String device,String thoroughfare,List<String> collect) throws Exception { |
| | | List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(collect); |
| | | |
| | | if (CollUtil.isNotEmpty(readWriteEntityList)){ |
| | | List<DaParamCollection> collectionList = new ArrayList<>(); |
| | | Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue(); |
| | | String moduleCode = null; |
| | | if (ObjectUtil.isNotNull(value1)){ |
| | | moduleCode = value1.toString(); |
| | | } |
| | | for (int i = 0; i < readWriteEntityList.size(); i++) { |
| | | DaParamCollection daParamCollection = new DaParamCollection(); |
| | | if (StrUtil.isNotBlank(moduleCode)){ |
| | | daParamCollection.setModuleCode(moduleCode); |
| | | } |
| | | daParamCollection.setParamCode(collect.get(i)); |
| | | String paramValue = ""; |
| | | if (ObjectUtil.isNotNull(readWriteEntityList.get(i).getValue())){ |
| | | paramValue = readWriteEntityList.get(i).getValue().toString(); |
| | | } |
| | | daParamCollection.setParamValue(paramValue); |
| | | daParamCollection.setLocationCode(device); |
| | | daParamCollection.setCollectionTime(new Date()); |
| | | collectionList.add(daParamCollection); |
| | | } |
| | | daParamCollectionService.insertBatch(collectionList); |
| | | } |
| | | } |
| | | } |