优化

admin

2025-04-09 9a0334b6e46d9503246d99be0a3a79945dee7919

 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java

@@ -109,11 +109,11 @@
            if (Constants.RECORD_DATA.equals(tab)) {  //出入站
                if (Constants.ONE.equals(valueString)) {//入站
                    if(Constants.OP040_OP160.contains(device)){//人工工位
                        Object snCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".SNCode").getValue();
                        if (ObjectUtil.isNull(snCodeObjcet)){
                        Object snCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".SNCode").getValue();
                        if (ObjectUtil.isNull(snCodeObject)){
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                        }else{
                            String productNum = snCodeObjcet.toString();
                            String productNum = snCodeObject.toString().trim();
                            if(productNum.length()<10){
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                            }else{
@@ -121,37 +121,47 @@
                                productNum = "productNum,"+ productNum;
                                WebSocketUsers.sendMessageToUserByText(map.get(device), productNum);
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                                String str = thoroughfare + "." + device + ".MESScrew";
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(str).value(1).build());//拧紧步骤
                            }

                        }
                    }else {//自动工位
                        //所有进站将进站时间写给PLC
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        String currentDate = dateFormat.format(new Date());
                        miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".StartTime").value(currentDate).build());
                        Object snCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".SNCode").getValue();
                        if (ObjectUtil.isNull(snCodeObject)){
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                        }else{
                            //所有进站将进站时间写给PLC
                            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                            String currentDate = dateFormat.format(new Date());
                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".StartTime").value(currentDate).build());

                        Integer recordDataDone = 11;
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(recordDataDone).build());
                            Integer recordDataDone = 11;
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(recordDataDone).build());
                        }

                    }

                } else if(Constants.TWO.equals(valueString)){//出站
                        if(Constants.OP040_OP160.contains(device)){//人工工位
                            WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
                        } else if (Constants.OP165.equals(device)) {
                            WebSocketUsers.sendMessageToUserByText(map.get(device), "print");//打印
                        } else if (Constants.OP0170_OP230.contains(device)) {
                            if(Constants.OP165.equals(device)){
                                WebSocketUsers.sendMessageToUserByText(map.get(device), "print");//打印
                            }else {
                                WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
                            }
                        }  else if (Constants.OP0170_OP220.contains(device)) {
                            WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
                        } else{//自动工位
                            //先判断是否有产品SN
                            Object snCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".SNCode").getValue();
                            Object snCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".SNCode").getValue();
                            Object orderObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".WorkOrderNumber").getValue();
                            if (ObjectUtil.isNull(snCodeObjcet)){
                            if (ObjectUtil.isNull(snCodeObject)){
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(25).build());
                            }else {

                                Integer result = 21;
                                String snCode = snCodeObjcet.toString();//产品SN
                                String orderNumber = orderObjcet.toString();//工单号
                                String snCode = snCodeObject.toString().trim();//产品SN
                                String orderNumber = orderObjcet.toString().trim();//工单号
                                if(snCode.length()<10){
                                    result = 22;
                                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
@@ -165,12 +175,32 @@
                                    if (ObjectUtil.isNotNull(stationStatusObjcet)) {
                                        String stationStatus = stationStatusObjcet.toString();
                                        if (Constants.OP010.equals(device)) {
                                            CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                                                updateOrderStatus(snCode, "3");//OP010工位更新工单状态为执行中
                                                reportFactoryMes(snCode, device, format.format(new Date()));//工厂MES报工
                                            });
                                            Object housingCodeObject = miloService.readFromOpcUa(thoroughfare + "." + device + ".HousingCode").getValue();//壳体条码，存到工单，返修用
                                            if (ObjectUtil.isNull(housingCodeObject)){
                                                result = 25;
                                            }else{
                                                String housingCode = housingCodeObject.toString();//壳体条码，存到工单，返修用
                                                if(housingCode.length()<10){
                                                    result = 25;
                                                }else{
                                                    CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                                                        updateOrderStatus(snCode, "3",housingCode);//OP010工位更新工单状态为执行中,并更新主物料壳体条码
                                                        reportFactoryMes(snCode, device, format.format(new Date()));//工厂MES报工
                                                     });
                                                }
                                            }
                                        }
                                        result = savePassingStation(thoroughfare, device, snCode, orderNumber, stationStatus);//保存过站
                                        if(Constants.OP230.equals(device)){
                                            WebSocketUsers.sendMessageToUserByText(map.get(device), "twoHundredAndThirtyEND");
                                            CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                                                updateOrderStatus(snCode, "5","");//OP230工位更新工单状态为已完成
                                                reportFactoryMes(snCode, "OP240", format.format(new Date()));//工厂MES报工   //暂时 OP240工位还没有好，在230报240的工
                                            });
                                            miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SNCode").value("").build());
                                        }
                                        if(result == 21){
                                            result = savePassingStation(thoroughfare, device, snCode, orderNumber, stationStatus);//保存过站
                                        }
                                        if (result == 21) {
                                            result = saveParamCollection(device, snCode, orderNumber, stationStatus);//保存参数，发送工厂MES
                                        }
@@ -324,6 +354,8 @@
                    parentVO.setRecordId(UUID.randomUUID().toString());
                    if("2".equals(stationStatus)){//工站状态
                        parentVO.setTotalResult("0");
                    }else{
                        parentVO.setTotalResult("1");
                    }
                    parentVO.setProductNum(snCode);
                    parentVO.setCheckList(mesList);
@@ -356,7 +388,8 @@
            List<OmProductionOrdeInfo> orderList = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>()
                    .eq(OmProductionOrdeInfo::getOrderStatus, Constants.ONE)
                    .eq(OmProductionOrdeInfo::getStationCode,device)//工位
                    .eq(OmProductionOrdeInfo::getProductCode,materialCode));//产品类型
                    //.eq(OmProductionOrdeInfo::getProductCode,materialCode)
            );//产品类型
            if (CollUtil.isNotEmpty(orderList)){
                Long id = orderList.get(0).getId();
                productNum = orderList.get(0).getProductNum();//产品码
@@ -364,9 +397,9 @@
            }else{
                // 查询最新的工单信息
                OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();

                log.info("请求工厂MES工单：入参device{},materialCode：{}", device, materialCode);
                String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "OP010",materialCode);
                //String facMaterialCode = Constants.facMaterialMap.get(materialCode);
                log.info("请求工厂MES工单：入参device{},请求工厂物料编码,产品物料编码MaterialCode{}", device,materialCode);
                String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), device,"");
                log.info("请求工厂MES工单：出参pack：{}", orderJsonString);

                JSONObject jsonObject = new JSONObject(orderJsonString);
@@ -374,12 +407,13 @@
                JSONObject dataObject = jsonObject.getJSONObject("data");
                String code = jsonObject.getStr("code");
                // 判断接单是否成功
                if(code.equals("success")) {
                if("success".equals(code)) {
                    OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
                    omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum"));
                    omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
                    omProductionOrdeInfo.setStationCode(device);
                    omProductionOrdeInfo.setProductCode(dataObject.getStr("materialCode"));
                    omProductionOrdeInfo.setProductCode(materialCode);
                    omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
                    omProductionOrdeInfo.setPlanQty(Long.valueOf(dataObject.getStr("plannedQuantity")));
                    omProductionOrdeInfo.setOnlineCompletionMark("0");
                    omProductionOrdeInfo.setSfResult("0");
@@ -397,6 +431,8 @@
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".SNCode").value(productNum).build());
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(orderNum).build());
                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(11).build());
            }else{
                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(12).build());
            }

        } catch (Exception e) {
@@ -408,13 +444,20 @@
     * 更新工单
     * @param snCode 产品sn
     * @param orderStatus 工单状态
     * @param materialCode 壳体条码
     * @throws Exception e
     */
    private static void updateOrderStatus(String snCode,String orderStatus){
    private static void updateOrderStatus(String snCode,String orderStatus,String materialCode){
        try {
            //更新工单状态为已执行
            LambdaUpdateWrapper<OmProductionOrdeInfo> updateWrapper = new LambdaUpdateWrapper<>();
            updateWrapper.set(OmProductionOrdeInfo::getOrderStatus,orderStatus);
            if(!materialCode.isEmpty()){//上线
                updateWrapper.set(OmProductionOrdeInfo::getTrolleyYard,materialCode);//壳体条码
                updateWrapper.set(OmProductionOrdeInfo::getActualStartTime,new Date());//开始时间
            }else{//下线
                updateWrapper.set(OmProductionOrdeInfo::getActualEndTime,new Date());//结束时间
            }
            updateWrapper.eq(OmProductionOrdeInfo::getProductNum,snCode);
            omProductionOrdeInfoService.update(new OmProductionOrdeInfo(),updateWrapper);
        } catch (Exception e) {
@@ -427,27 +470,30 @@
     * 工厂MES报工
     * @param productNum  通道
     * @param stationCode 工位
     * @param confirmTime 物料号
     * @param confirmTime 时间
     * @throws Exception e
     */
    //{"code":"success","data":{"productNum":"LCV123456P0600036","stationCode":"1HZ01","resultCode":"S","resultText":"报工成功"},"message":"API调用成功"}
    public static void reportFactoryMes(String productNum, String stationCode, String confirmTime)
    public static void reportFactoryMes(String productNum,String stationCode,String confirmTime)
    {
        String result = "";
        String url = Constants.FACTORY_EMS_UAT_GET_RUL + "workReportResultFeedback?siteCode="+Constants.FACTORY_EMS_SITE_CODE+"&stationCode="+stationCode+"&productNum="+productNum+"&confirmTime="+confirmTime;
        try {
            CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                log.info("请求工厂MES报工：入参device{},productNum：{}", stationCode, productNum);
                String url = Constants.FACTORY_EMS_UAT_GET_RUL + "workReportResultFeedback?siteCode="+Constants.FACTORY_EMS_SITE_CODE+"&stationCode="+stationCode+"&productNum="+productNum+"&confirmTime="+confirmTime;
                HttpResponse response = HttpRequest.get(url).execute();
                /*HttpRequest httpRequest = HttpRequest.get(url);*/
                String result =  response.body();
                log.info("请求工厂MES报工：出参：{}", result);
            });

            log.info("执行工厂MES报工方法start，序列号{}工位号{}url{}",productNum,stationCode ,url);
            HttpResponse response = HttpRequest.get(url).execute();
            //HttpRequest httpRequest = HttpRequest.get(url);
            result =  response.body();
            log.info("执行工厂MES报工方法第一次end，序列号{}工位号{}返回数据{}",productNum,stationCode ,result);
        }catch (Exception e){
            throw new RuntimeException(e);
        }finally {
            if(result.isEmpty()){
                HttpResponse response = HttpRequest.get(url).execute();
                result =  response.body();
                log.info("执行工厂MES报工方法第二次end，序列号{}工位号{}返回数据{}",productNum,stationCode ,result);
            }
        }
    }

    public static String TightenTheConversionOkNg(String param){
        // 去除首尾的方括号，然后按照逗号分割字符串
        String[] parts = param.substring(1, param.length() - 1).split(",");