| | |
| | | import com.jcdm.common.core.domain.AjaxResult; |
| | | import com.jcdm.framework.websocket.WebSocketUsers; |
| | | import com.jcdm.main.constant.Constants; |
| | | import com.jcdm.main.da.cellData.domain.DaCellData; |
| | | import com.jcdm.main.da.cellData.service.IDaCellDataService; |
| | | import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf; |
| | | import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService; |
| | | import com.jcdm.main.da.paramCollection.domain.DaParamCollection; |
| | |
| | | |
| | | public static IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService; |
| | | |
| | | public static IDaCellDataService daCellDataService; |
| | | |
| | | /* @Value("${orderLineUrl}") |
| | | private static String orderLineUrl;*/ |
| | | |
| | |
| | | IDaCollectionParamConfService collectionParamConfService, |
| | | IDaParamCollectionService daParamCollectionService, |
| | | IOmProductionOrdeInfoService omProductionOrdeInfoService, |
| | | IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService) { |
| | | IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService, |
| | | IDaCellDataService daCellDataService) { |
| | | OPCUaSubscription.miloService = miloService; |
| | | OPCUaSubscription.daPassingStationCollectionService = daPassingStationCollectionService; |
| | | OPCUaSubscription.collectionParamConfService = collectionParamConfService; |
| | | OPCUaSubscription.daParamCollectionService = daParamCollectionService; |
| | | OPCUaSubscription.omProductionOrdeInfoService = omProductionOrdeInfoService; |
| | | OPCUaSubscription.daTestDeviceInterfaceTempService = daTestDeviceInterfaceTempService; |
| | | OPCUaSubscription.daCellDataService = daCellDataService; |
| | | } |
| | | |
| | | |
| | |
| | | Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();//电芯码 |
| | | if (ObjectUtil.isNotNull(value1)){ |
| | | String cellCode = value1.toString(); |
| | | //反馈电芯ocv检测结果 |
| | | scanResult = 11; |
| | | //反馈电芯ocv检测结果,这里不用再进行检测,只要码没问题就可以了 |
| | | boolean b = OCVResultFeedBack(thoroughfare, device,cellCode);//对替换电芯校验 |
| | | //四个电芯的状态 |
| | | if (b){ |
| | |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(1).build());//没有要生产的工单 |
| | | } |
| | | }else if (Constants.RECORD_DATA.equals(tab)){//出入站 |
| | | if (Constants.ONE.equals(valueString)){//入站 |
| | | //1:告知MES托盘已到站,请求下发进站状态 |
| | | if (Constants.OP030.equals(device)){ |
| | | if (Constants.ONE.equals(valueString)){//入站 //1:告知MES托盘已到站,请求下发进站状态 |
| | | |
| | | //OP020 电芯挡位校验 |
| | | if (Constants.OP020.equals(device)){ |
| | | Integer result = 11; |
| | | Object cellGearObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellGear").getValue(); |
| | | if (ObjectUtil.isNull(cellGearObjcet)){ |
| | | result = 16;//电芯挡位为空 |
| | | }else{ |
| | | String cellGear = cellGearObjcet.toString(); |
| | | List<String> cellCodeList = readCellCodeList(thoroughfare, device); |
| | | result = checkCellGear(thoroughfare, device,cellCodeList,cellGear);//校验电芯挡位和组别 |
| | | } |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build()); |
| | | |
| | | }else if (Constants.OP030.equals(device)){ |
| | | //反馈电芯ocv检测结果 |
| | | boolean b = OCVResultFeedBack(thoroughfare, device);//进站对4个电芯校验 |
| | | //四个电芯的状态 |
| | |
| | | if (ObjectUtil.isNotNull(productTypeObjcet)){ |
| | | String productType = productTypeObjcet.toString();//产品类型 |
| | | String materialCode = Constants.materialMap.get(productType); |
| | | //调用工厂MES,保存到数据库,并且将工单传给PLC |
| | | receivingWorkOrders(thoroughfare, device,materialCode); |
| | | //接收工单,保存到数据库,并且将工单传给PLC |
| | | CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> { |
| | | receivingWorkOrders(thoroughfare, device,materialCode); |
| | | }); |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build()); |
| | | log.info("写入到工位{}的RecordDataDone数据:{}",device,11); |
| | | }else{ |
| | |
| | | |
| | | result = savePassingStation(thoroughfare, device,cellCodeList);//保存过站 |
| | | if(result == 21) { |
| | | if(Constants.OP020.contains(device)){ |
| | | if(!cellCode1.isEmpty()){ |
| | | daCellDataService.deleteDaCellDataByGbCellCode(cellCode1); |
| | | } |
| | | if(!cellCode2.isEmpty()){ |
| | | daCellDataService.deleteDaCellDataByGbCellCode(cellCode2); |
| | | } |
| | | if(!cellCode3.isEmpty()){ |
| | | daCellDataService.deleteDaCellDataByGbCellCode(cellCode3); |
| | | } |
| | | if(!cellCode4.isEmpty()){ |
| | | daCellDataService.deleteDaCellDataByGbCellCode(cellCode4); |
| | | } |
| | | }else if(Constants.OP030.contains(device)){ |
| | | if(!cellCode1.isEmpty()){ |
| | | daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode1); |
| | | } |
| | | if(!cellCode2.isEmpty()){ |
| | | daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode2); |
| | | } |
| | | if(!cellCode3.isEmpty()){ |
| | | daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode3); |
| | | } |
| | | if(!cellCode4.isEmpty()) { |
| | | daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode4); |
| | | } |
| | | } |
| | | result = saveParamCollection(device,cellCodeList);//保存参数,发送工厂MES |
| | | } |
| | | |
| | | } |
| | | |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build()); |
| | | log.info("写入到工位{}的RecordDataDone数据:{}",device,result); |
| | | } else if (Constants.OP100_OP150.contains(device)){//人工工位 |
| | |
| | | } |
| | | } |
| | | |
| | | public void receivingWorkOrders(String thoroughfare ,String device ,String materialCode) |
| | | public synchronized void receivingWorkOrders(String thoroughfare ,String device ,String materialCode) |
| | | { |
| | | String paramProductNum = ""; |
| | | try { |
| | | // 查询最新的工单信息 |
| | | OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder(); |
| | | |
| | | log.info("请求工厂MES工单:入参device{},materialCode:{}", device, materialCode); |
| | | String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100",materialCode); |
| | | JSONObject jsonObject = new JSONObject(orderJsonString); |
| | | // 从JSONObject中获取data对象 |
| | | JSONObject dataObject = jsonObject.getJSONObject("data"); |
| | | String code = jsonObject.getStr("code"); |
| | | // 判断接单是否成功 |
| | | if(code.equals("success")) { |
| | | log.info("请求工厂MES工单:入参pack{}出参pack:{}", paramProductNum, dataObject.getStr("productNum")); |
| | | OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo(); |
| | | omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum")); |
| | | omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum")); |
| | | omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode")); |
| | | omProductionOrdeInfo.setProductCode(dataObject.getStr("materialCode")); |
| | | omProductionOrdeInfo.setPlanQty(Long.valueOf(dataObject.getStr("plannedQuantity"))); |
| | | omProductionOrdeInfo.setOnlineCompletionMark("0"); |
| | | omProductionOrdeInfo.setSfResult("0"); |
| | | omProductionOrdeInfo.setProductModel(dataObject.getStr("model")); |
| | | omProductionOrdeInfo.setCreateTime(new Date()); |
| | | omProductionOrdeInfo.setCreateUser("工厂MES"); |
| | | omProductionOrdeInfoService.save(omProductionOrdeInfo); |
| | | //先查询表中是否有剩余工单 |
| | | List<OmProductionOrdeInfo> orderList = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>() |
| | | .eq(OmProductionOrdeInfo::getOrderStatus, Constants.ONE) |
| | | .eq(OmProductionOrdeInfo::getStationCode,device)//工位 |
| | | .eq(OmProductionOrdeInfo::getProductCode,materialCode));//产品类型 |
| | | if (CollUtil.isNotEmpty(orderList)){ |
| | | Long id = orderList.get(0).getId(); |
| | | String productNum = orderList.get(0).getProductNum();//模组码 |
| | | String orderNum = orderList.get(0).getWorkOrderNo(); |
| | | |
| | | String productNum = dataObject.getStr("productNum"); |
| | | String orderNum = dataObject.getStr("productionOrderNum"); |
| | | paramProductNum = productNum; |
| | | |
| | | //下发产品模组码 |
| | | miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(productNum).build()); |
| | | miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(orderNum).build()); |
| | |
| | | //将产品SN发送到前台 |
| | | productNum = "productNum,"+ productNum; |
| | | WebSocketUsers.sendMessageToUserByText(map.get(device), productNum); |
| | | }else{ |
| | | // 查询最新的工单信息 |
| | | OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder(); |
| | | |
| | | log.info("请求工厂MES工单:入参device{},materialCode:{}", device, materialCode); |
| | | String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100",materialCode); |
| | | JSONObject jsonObject = new JSONObject(orderJsonString); |
| | | // 从JSONObject中获取data对象 |
| | | JSONObject dataObject = jsonObject.getJSONObject("data"); |
| | | String code = jsonObject.getStr("code"); |
| | | // 判断接单是否成功 |
| | | if(code.equals("success")) { |
| | | log.info("请求工厂MES工单:入参pack{}出参pack:{}", paramProductNum, dataObject.getStr("productNum")); |
| | | OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo(); |
| | | omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum")); |
| | | omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum")); |
| | | omProductionOrdeInfo.setStationCode(device); |
| | | omProductionOrdeInfo.setProductCode(dataObject.getStr("materialCode")); |
| | | omProductionOrdeInfo.setPlanQty(Long.valueOf(dataObject.getStr("plannedQuantity"))); |
| | | omProductionOrdeInfo.setOnlineCompletionMark("0"); |
| | | omProductionOrdeInfo.setSfResult("0"); |
| | | omProductionOrdeInfo.setProductModel(dataObject.getStr("model")); |
| | | omProductionOrdeInfo.setCreateTime(new Date()); |
| | | omProductionOrdeInfo.setCreateUser("工厂MES"); |
| | | omProductionOrdeInfoService.save(omProductionOrdeInfo); |
| | | |
| | | String productNum = dataObject.getStr("productNum"); |
| | | String orderNum = dataObject.getStr("productionOrderNum"); |
| | | //下发产品模组码 |
| | | miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(productNum).build()); |
| | | miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(orderNum).build()); |
| | | |
| | | //将产品SN发送到前台 |
| | | productNum = "productNum,"+ productNum; |
| | | WebSocketUsers.sendMessageToUserByText(map.get(device), productNum); |
| | | } |
| | | } |
| | | |
| | | } catch (Exception e) { |
| | | throw new RuntimeException(e); |
| | | } |
| | |
| | | //插入参数采集表 |
| | | daParamCollectionService.insertBatch(collectionList); |
| | | |
| | | //如果220工位,进行报工 |
| | | if("M1OP220".equals(device)) { |
| | | getWorkReportResultFeedback(moduleCode, "M1OP220", format.format(new Date())); |
| | | //如果220工位,进行报工,因为上层系统只支持6位,所有报工工位修改为M1P220 |
| | | if(Constants.OP220.equals(device)) { |
| | | getWorkReportResultFeedback(moduleCode, "M1P220", format.format(new Date())); |
| | | } |
| | | |
| | | //上传到工厂mes |
| | |
| | | ParentVO parentVO = new ParentVO(); |
| | | parentVO.setStationCode(device);//工位 |
| | | parentVO.setSiteCode("3983"); |
| | | |
| | | parentVO.setRecordId(UUID.randomUUID().toString()); |
| | | parentVO.setTotalResult("1"); |
| | | for (int i = 0; i < cellCodeList.size(); i++) {//循环4个电芯 |
| | | if(!cellCodeList.get(i).isEmpty()){ |
| | | parentVO.setRecordId(UUID.randomUUID().toString()); |
| | | parentVO.setTotalResult("1"); |
| | | parentVO.setProductNum(cellCodeList.get(i));//电芯码 |
| | | //封装给工厂MES发送的childlist4 |
| | | List<ChildVO> mesChildList = new ArrayList<>(mesChildList0); |
| | |
| | | } |
| | | |
| | | /** |
| | | * OP020校验电芯挡位 |
| | | * @param thoroughfare |
| | | * @param device |
| | | * @throws Exception |
| | | */ |
| | | private Integer checkCellGear(String thoroughfare, String device,List<String> cellCodeList,String cellGear) throws Exception { |
| | | Integer result = 11; |
| | | |
| | | for(int i = 0; i < cellCodeList.size(); i ++){ |
| | | Integer cellStatus = 1; |
| | | String cellCode = cellCodeList.get(i); |
| | | if(!cellCode.isEmpty()){ |
| | | List<DaCellData> list = daCellDataService.list(new LambdaQueryWrapper<DaCellData>() |
| | | .eq(DaCellData::getGbCellCode,cellCode)); |
| | | if(CollUtil.isNotEmpty(list)){ |
| | | DaCellData daCellData = list.get(0); |
| | | String cellValue = daCellData.getCellValue();//数据库中电芯挡位 |
| | | String cellSerial = daCellData.getCellSerial();//数据库中电芯组别 |
| | | if(!cellValue.isEmpty() && cellValue.equals(cellGear)){ |
| | | cellStatus = 1; |
| | | }else { |
| | | cellStatus = 2; |
| | | result = 17;//挡位校验不合格 |
| | | } |
| | | }else { |
| | | cellStatus = 2; |
| | | result = 17;//查不到要校验的挡位 |
| | | } |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_"+(i+1)).value(cellStatus).build()); |
| | | } |
| | | } |
| | | return result; |
| | | } |
| | | |
| | | /** |
| | | * 030工位返回ocv测试结果 |
| | | * @param thoroughfare |
| | | * @param device |
| | |
| | | */ |
| | | private boolean OCVResultFeedBack(String thoroughfare, String device,String cellCode) throws Exception { |
| | | boolean flag = true; |
| | | |
| | | List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>() |
| | | .eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020") |
| | | .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)); |
| | | .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode) |
| | | .orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime) |
| | | ); |
| | | if (CollUtil.isNotEmpty(list)){ |
| | | DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1); |
| | | DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(0); |
| | | if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){ |
| | | flag = true; |
| | | }else { |
| | | flag = false; |
| | | } |
| | | daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode); |
| | | //daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode); |
| | | }else { |
| | | flag = false; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(2).build()); |
| | | log.info("读取到工位{},测试设备返回的数据查询不到,电芯码为:{}",device,cellCode); |
| | | } |
| | | return flag; |
| | |
| | | if (ObjectUtil.isNotNull(value1)){ |
| | | String cellCode = value1.toString(); |
| | | List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>() |
| | | .eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020") |
| | | .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)); |
| | | .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode) |
| | | .orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime) |
| | | ); |
| | | if (CollUtil.isNotEmpty(list)){ |
| | | DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1); |
| | | DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(0); |
| | | if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){ |
| | | 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()); |
| | | } |
| | | daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode); |
| | | //daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode); |
| | | }else { |
| | | flag = false; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(5).build()); |
| | | log.info("读取到工位{},OP020工位没有给测试结果",device); |
| | | } |
| | | }else { |
| | | flag = false; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(2).build()); |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(5).build()); |
| | | log.info("读取到工位{},PLC没有给电芯码",device); |
| | | } |
| | | Object value2 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_2").getValue(); |
| | | if (ObjectUtil.isNotNull(value2)){ |
| | | String cellCode = value2.toString(); |
| | | List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>() |
| | | .eq(DaTestDeviceInterfaceTemp::getStationCode, device) |
| | | .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)); |
| | | .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode) |
| | | .orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime) |
| | | ); |
| | | if (CollUtil.isNotEmpty(list)){ |
| | | DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1); |
| | | DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(0); |
| | | if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){ |
| | | 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()); |
| | | } |
| | | daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode); |
| | | //daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode); |
| | | }else { |
| | | flag = false; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_2").value(5).build()); |
| | | log.info("读取到工位{},OP020工位没有给测试结果",device); |
| | | } |
| | | }else { |
| | | flag = false; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_2").value(2).build()); |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_2").value(5).build()); |
| | | log.info("读取到工位{},PLC没有给电芯码",device); |
| | | } |
| | | |
| | |
| | | if (ObjectUtil.isNotNull(value3)){ |
| | | String cellCode = value3.toString(); |
| | | List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>() |
| | | .eq(DaTestDeviceInterfaceTemp::getStationCode, device) |
| | | .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)); |
| | | .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode) |
| | | .orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime) |
| | | ); |
| | | if (CollUtil.isNotEmpty(list)){ |
| | | DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1); |
| | | DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(0); |
| | | if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){ |
| | | 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()); |
| | | } |
| | | daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode); |
| | | //daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode); |
| | | }else { |
| | | flag = false; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_3").value(5).build()); |
| | | log.info("读取到工位{},OP020工位没有给测试结果",device); |
| | | } |
| | | }else { |
| | | flag = false; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_3").value(2).build()); |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_3").value(5).build()); |
| | | log.info("读取到工位{},PLC没有给电芯码",device); |
| | | } |
| | | |
| | |
| | | if (ObjectUtil.isNotNull(value4)){ |
| | | String cellCode = value4.toString(); |
| | | List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>() |
| | | .eq(DaTestDeviceInterfaceTemp::getStationCode, device) |
| | | .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)); |
| | | .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode) |
| | | .orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime) |
| | | ); |
| | | if (CollUtil.isNotEmpty(list)){ |
| | | DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1); |
| | | DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(0); |
| | | if (Constants.ONE.equals(daTestDeviceInterfaceTemp.getTotalResult())){ |
| | | 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()); |
| | | } |
| | | daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode); |
| | | //daTestDeviceInterfaceTempService.deleteDaTestDeviceInterfaceTempByProductNum(cellCode); |
| | | }else { |
| | | flag = false; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_4").value(5).build()); |
| | | log.info("读取到工位{},OP020工位没有给测试结果",device); |
| | | } |
| | | }else { |
| | | flag = false; |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_4").value(2).build()); |
| | | miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_4").value(5).build()); |
| | | log.info("读取到工位{},PLC没有给电芯码",device); |
| | | } |
| | | |