| | |
| | | if(ObjectUtil.isNull(cellCodeList) || cellCodeList.size() != 4 ){ |
| | | result = 23; |
| | | }else{ |
| | | |
| | | String cellCode1 = cellCodeList.get(0); |
| | | String cellCode2 = cellCodeList.get(1); |
| | | String cellCode3 = cellCodeList.get(2); |
| | | String cellCode4 = cellCodeList.get(3); |
| | | |
| | | if(cellCode1.isEmpty() || cellCode2.isEmpty()){ |
| | | result = 23; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build()); |
| | | return; |
| | | } |
| | | if(!cellCode3.isEmpty() && cellCode4.isEmpty()){ |
| | | result = 23; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build()); |
| | | return; |
| | | } |
| | | if(cellCode3.isEmpty() && !cellCode4.isEmpty()){ |
| | | if ((!cellCode1.isEmpty() && cellCode2.isEmpty()) || (cellCode1.isEmpty() && !cellCode2.isEmpty()) |
| | | || (!cellCode3.isEmpty() && cellCode4.isEmpty()) || (!cellCode4.isEmpty() && cellCode3.isEmpty())) { |
| | | result = 23; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build()); |
| | | return; |
| | |
| | | |
| | | //如果220工位,进行报工 |
| | | if("M1OP220".equals(device)) { |
| | | RestfulService.getWorkReportResultFeedback(moduleCode, "M1OP220", format.format(new Date())); |
| | | getWorkReportResultFeedback(moduleCode, "M1OP220", format.format(new Date())); |
| | | } |
| | | |
| | | //上传到工厂mes |
| | |
| | | parentVO.setProductNum(moduleCode); |
| | | |
| | | //添加基础数据 |
| | | List<ChildVO> basicList = getCollectParamBasicData(device); |
| | | List<ChildVO> basicList = getCollectParamBasicData(device,moduleCode); |
| | | mesList.addAll(basicList); |
| | | |
| | | parentVO.setCheckList(mesList); |
| | |
| | | } |
| | | |
| | | //添加基础数据 |
| | | List<ChildVO> basicList = getCollectParamBasicData(device); |
| | | List<ChildVO> basicList = getCollectParamBasicData(device,cellCodeList.get(i)); |
| | | mesChildList.addAll(basicList); |
| | | |
| | | parentVO.setCheckList(mesChildList);//参数 |
| | |
| | | /** |
| | | * 获取采集参数基础数据 |
| | | * @param stationCode |
| | | * @param sfcCode |
| | | * @return list |
| | | */ |
| | | public static List<ChildVO> getCollectParamBasicData(String stationCode) { |
| | | public static List<ChildVO> getCollectParamBasicData(String stationCode,String sfcCode) { |
| | | List<ChildVO> basicList = new ArrayList<>(); |
| | | List<DaParamCollection> collectionList = new ArrayList<>(); |
| | | try { |
| | | //查询参数配置表 |
| | | List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>() |
| | |
| | | childVO.setCheckResult("1"); |
| | | childVO.setCheckTime(format.format(new Date())); |
| | | basicList.add(childVO); |
| | | |
| | | DaParamCollection daParamCollection = new DaParamCollection(); |
| | | daParamCollection.setSfcCode(sfcCode);//模组码 |
| | | daParamCollection.setParamCode(conf.getCollectParameterId());//参数编码 |
| | | daParamCollection.setParamName(conf.getCollectParameterName());//参数名称 |
| | | |
| | | daParamCollection.setParamValue(conf.getParamCentral());//参数值 |
| | | daParamCollection.setLocationCode(stationCode);//工位 |
| | | daParamCollection.setCollectionTime(new Date());//采集时间 |
| | | collectionList.add(daParamCollection);//封装参数采集list |
| | | } |
| | | daParamCollectionService.insertBatch(collectionList); |
| | | } |
| | | return basicList; |
| | | }catch (Exception e) { |