| | |
| | | }else if(Constants.OP030.equals(device)){ |
| | | Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();//电芯码 |
| | | if (ObjectUtil.isNotNull(value1)){ |
| | | String cellCode = value1.toString(); |
| | | /*String cellCode = value1.toString();*/ |
| | | scanResult = 11; |
| | | //反馈电芯ocv检测结果,这里不用再进行检测,只要码没问题就可以了 |
| | | /* //反馈电芯ocv检测结果,这里不用再进行检测,只要码没问题就可以了 |
| | | boolean b = OCVResultFeedBack(thoroughfare, device,cellCode);//对替换电芯校验 |
| | | //四个电芯的状态 |
| | | if (b){ |
| | | scanResult = 11; |
| | | }else { |
| | | scanResult = 12; |
| | | } |
| | | }*/ |
| | | }else { |
| | | scanResult = 12; |
| | | } |
| | |
| | | |
| | | public synchronized void receivingWorkOrders(String thoroughfare ,String device ,String materialCode) |
| | | { |
| | | String paramProductNum = ""; |
| | | try { |
| | | // 查询最新的工单信息 |
| | | OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder(); |
| | | //先查询表中是否有剩余工单 |
| | | 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(); |
| | | |
| | | log.info("请求工厂MES工单:入参device{},materialCode:{}", device, materialCode); |
| | | String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M2OP100",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); |
| | | }else { |
| | | // 查询最新的工单信息 |
| | | OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder(); |
| | | |
| | | log.info("请求工厂MES工单:入参device{},materialCode:{}", device, materialCode); |
| | | String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M2OP100", materialCode); |
| | | log.info("请求工厂MES工单:出参pack:{}", orderJsonString); |
| | | JSONObject jsonObject = new JSONObject(orderJsonString); |
| | | // 从JSONObject中获取data对象 |
| | | JSONObject dataObject = jsonObject.getJSONObject("data"); |
| | | String code = jsonObject.getStr("code"); |
| | | // 判断接单是否成功 |
| | | if (code.equals("success")) { |
| | | |
| | | 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); |