修改参数采集

cl

2024-07-16 b590231a4d4cabde1a9452e87050adb9cee227d4

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

@@ -90,139 +90,174 @@
                String device = nodes[1];//设备
                String tab = nodes[2];//标记
                String valueString = value.toString();//地址值
                if (Constants.RECORD_CHECK_CODE.equals(tab)){//电芯校验
                    if (Constants.ONE.equals(valueString)){
                        Integer scanResult = 11;
                        if (Constants.OP010.equals(device)){
                            //OP010工位电芯条码校验||OP030工位电芯条码校验
                            Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();
                            if (ObjectUtil.isNotNull(value1)){
                                String keyCode = value1.toString();
                                log.info("读取到工位{}的Scaner数据：{}",device,keyCode);
                                //仅校验长度是否合格

                CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                    subHandle(thoroughfare,device,tab,valueString);
                });

            }
        } catch (Exception e) {
            log.error(e.getMessage());
        }
    }

    public void subHandle(String thoroughfare,String device,String tab,String valueString){
        try{
            if (Constants.RECORD_CHECK_CODE.equals(tab)){//电芯校验
                if (Constants.ONE.equals(valueString)){
                    Integer scanResult = 11;
                    if (Constants.OP010.equals(device)){
                        //OP010工位电芯条码校验||OP030工位电芯条码校验
                        Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();
                        if (ObjectUtil.isNotNull(value1)){
                            String keyCode = value1.toString();
                            log.info("读取到工位{}的Scaner数据：{}",device,keyCode);
                            //仅校验长度是否合格
//                                List<KeyCodeCheck> collect = keyCodeCheckService.list().stream().filter(x -> x.getKeyCode().contains(keyCode)).collect(Collectors.toList());
//                                if (CollUtil.isNotEmpty(collect)){
//                                    scanResult = 11;
//                                }
                            }
                        }else if(Constants.OP030.equals(device)){
                            Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();
                            if (ObjectUtil.isNotNull(value1)){
                                String cellCode = value1.toString();
                                //反馈电芯ocv检测结果
                                boolean b = OCVResultFeedBack(thoroughfare, device,cellCode);
                                //四个电芯的状态
                                if (b){
                                    scanResult = 11;
                                }else {
                                    scanResult = 12;
                                }
                        }
                    }else if(Constants.OP030.equals(device)){
                        Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".Scaner").getValue();
                        if (ObjectUtil.isNotNull(value1)){
                            String cellCode = value1.toString();
                            //反馈电芯ocv检测结果
                            boolean b = OCVResultFeedBack(thoroughfare, device,cellCode);//对替换电芯校验
                            //四个电芯的状态
                            if (b){
                                scanResult = 11;
                            }else {
                                scanResult = 12;
                            }

                        }
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ScanerResult1").value(scanResult).build());
                        log.info("写入到工位{}的ScanerResult1数据：{}",device,scanResult);
                    }
                }else if (Constants.RECORD_SN.equals(tab)){//求下发模组码请9
                    if (Constants.ONE.equals(valueString)){
                        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)){
                            //反馈电芯ocv检测结果
                            boolean b = OCVResultFeedBack(thoroughfare, device);
                            //四个电芯的状态
                            if (b){
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                                log.info("写入到工位{}的RecordDataDone数据：{}",device,11);
                            }else {
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                                log.info("写入到工位{}的RecordDataDone数据：{}",device,12);
                            }
                        } else if(Constants.OP100_1.equals(device) || Constants.OP100_2.equals(device)){
                            //1、进站PLC给产品类型，MES读取产品类型
                            ReadWriteEntity productTypeRead = miloService.readFromOpcUa(thoroughfare + "." + device + ".MES_ProductType");//产品类型
                            if (ObjectUtil.isNotNull(productTypeRead.getValue())){
                                String productType = productTypeRead.getValue().toString();

                                CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                                    //调用工厂MES，保存到数据库,并且将工单传给PLC (目前临时用该方法）
                                    receivingWorkOrders(thoroughfare, device);
                                });

                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                                log.info("写入到工位{}的RecordDataDone数据：{}",device,11);

                            }else{
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                            }

                        }else {
                            scanResult = 12;
                        }
                    }
                    miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ScanerResult1").value(scanResult).build());
                    log.info("写入到工位{}的ScanerResult1数据：{}",device,scanResult);
                }
            }else if (Constants.RECORD_SN.equals(tab)){//求下发模组码请9
                if (Constants.ONE.equals(valueString)){
                    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)){
                        //反馈电芯ocv检测结果
                        boolean b = OCVResultFeedBack(thoroughfare, device);//进站对4个电芯校验
                        //四个电芯的状态
                        if (b){
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                            log.info("写入到工位{}的RecordDataDone数据：{}",device,11);
                        }else {
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                            log.info("写入到工位{}的RecordDataDone数据：{}",device,12);
                        }
                    }else if (Constants.TWO.equals(valueString)){//出站
                        //分段010-065段
                        if (Constants.OP010.equals(device)){
                            //010工位无过站记录，只给放行信号
                            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){
                                result = 23;
                            }else{
                                result = savePassingStation(thoroughfare, device,cellCodeList);//保存过站
                                if(result == 21) {
                                    result = saveParamCollection(thoroughfare, device,cellCodeList);//保存参数，发送工厂MES
                                }
                            }
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
                            log.info("写入到工位{}的RecordDataDone数据：{}",device,result);
                        } else if (Constants.OP100_1.equals(device) || Constants.OP100_2.equals(device)){
                    } else if(Constants.OP100_1.equals(device) || Constants.OP100_2.equals(device)){
                        //1、进站PLC给产品类型，MES读取产品类型
                        Object productTypeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ProductType").getValue();//产品类型
                        if (ObjectUtil.isNotNull(productTypeObjcet)){
                            String productType = productTypeObjcet.toString();//产品类型
                            String materialCode = Constants.materialMap.get(productType);
                            CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                                //调用工厂MES，保存到数据库,并且将工单传给PLC (目前临时用该方法）
                                receivingWorkOrders(thoroughfare, device,materialCode);
                            });

                            WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
                        } else {
                            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
                                }
                            }
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
                            log.info("写入到工位{}的RecordDataDone数据：{}",device,result);
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                            log.info("写入到工位{}的RecordDataDone数据：{}",device,11);
                        }else{
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                        }

                    }else if (Constants.ModuleList.contains(device)){//有模组码的工位
                        Object modulCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
                        if (ObjectUtil.isNull(modulCodeObjcet)){
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                        }else{
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                        }
                    }
                }  /*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());
                    } else if (Constants.OP100_2.equals(device)) {
                        //PET带条码校验--发送给工厂mes
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ScanerResult12").value(11).build());
                    else {
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                        log.info("写入到工位{}的RecordDataDone数据：{}",device,11);
                    }
                }*/
                }else if (Constants.TWO.equals(valueString)){//出站
                    //分段010-065段
                    if (Constants.OP010.equals(device)){
                        //010工位无过站记录，只给放行信号
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(21).build());
                        log.info("写入到工位{}的RecordDataDone数据：{}",device,21);
                    }else if (Constants.OP020_OP090.contains(device)){
                        Integer result = 21;
                        //读取电芯码
                        List<String> cellCodeList = readCellCodeList(thoroughfare, device);
                        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()){
                                result = 23;
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
                                return;
                            }

                            result = savePassingStation(thoroughfare, device,cellCodeList);//保存过站
                            if(result == 21) {
                                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)){//人工工位
                        WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
                    } else {
                        Integer result = 21;
                        //Object productTypeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ProductType").getValue();//产品类型
                        Object modulCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
                        if (ObjectUtil.isNull(modulCodeObjcet)){
                            result = 23;
                        }else{
                            String moduleCode = modulCodeObjcet.toString();
                            Object stationStatusObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".StationStatus").getValue();//站状态地址
                            if (ObjectUtil.isNotNull(stationStatusObjcet)){
                                String stationStatus = stationStatusObjcet.toString();
                                result = savePassingStation(thoroughfare, device,moduleCode,stationStatus);//保存过站
                                if(result == 21) {
                                    result = saveParamCollection(device,moduleCode,stationStatus);//保存参数，发送工厂MES
                                }
                            }else{
                                result = 23;
                                log.info("读取到工位{}StationStatus数据：{},返回RecordDataDone的值为{}",device,"IS NULL！",result);
                            }

                        }
                        miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
                        log.info("写入到工位{}的RecordDataDone数据：{}",device,result);
                    }
                }
            }
        } catch (Exception e) {
        }catch (Exception e) {
            log.error(e.getMessage());
            System.out.println(e.getMessage());
            log.info(e.getMessage());
        }
    }

    public void receivingWorkOrders(String thoroughfare ,String device)
    {
/*    public void receivingWorkOrders(String thoroughfare ,String device) {
        String paramProductNum = "";
        try {

@@ -232,9 +267,10 @@
            if (CollUtil.isNotEmpty(orderList)){
                Long id = orderList.get(0).getId();
                String productNum = orderList.get(0).getProductNum();//模组码
                String orderNum = orderList.get(0).getWorkOrderNo();
                //下发产品模组码
                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.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(productNum).build());
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(orderNum).build());
                //miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(1).build());

                //更新工单状态为执行中
@@ -246,21 +282,23 @@
                //将产品SN发送到前台
                productNum = "productNum,"+ productNum;
                WebSocketUsers.sendMessageToUserByText(map.get(device), productNum);
            }/*else{
            }*//*else{
                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(2).build());//没有要生产的工单
            }*/
            }*//*
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }
    }*/

   /* public void receivingWorkOrders(String thoroughfare ,String device)
    public void receivingWorkOrders(String thoroughfare ,String device ,String materialCode)
    {
        String paramProductNum = "";
        try {
            // 查询最新的工单信息
            OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();
            String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100");

            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");
@@ -272,10 +310,11 @@
                omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum"));
                omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
                omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
                omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
                omProductionOrdeInfo.setProductCode(dataObject.getStr("materialCode"));
                omProductionOrdeInfo.setPlanQty(Long.valueOf(dataObject.getStr("plannedQuantity")));
                omProductionOrdeInfo.setOnlineCompletionMark("0");
                omProductionOrdeInfo.setSfResult("0");
                omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
                omProductionOrdeInfo.setProductModel(dataObject.getStr("model"));
                omProductionOrdeInfo.setCreateTime(new Date());
                omProductionOrdeInfo.setCreateUser("工厂MES");
                omProductionOrdeInfoService.save(omProductionOrdeInfo);
@@ -284,14 +323,14 @@
                WebSocketUsers.sendMessageToUserByText(map.get(device), dataObject.getStr("productNum"));

                //写PLC
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MES_ModuleCode").value(dataObject.getStr("productNum")).build());
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MES_WorkOrderNumber").value(dataObject.getStr("productionOrderNum")).build());
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".ModuleCode").value(dataObject.getStr("productNum")).build());
                miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".WorkOrderNumber").value(dataObject.getStr("productionOrderNum")).build());

            }
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }*/
    }

    /**
     * 读取电芯码
@@ -312,11 +351,11 @@
        try {
            List<ReadWriteEntity> readWriteEntityList = miloService.readFromOpcUa(readList);//电芯码
            for (ReadWriteEntity readWriteEntity : readWriteEntityList) {
                if (ObjectUtil.isNotNull(readWriteEntity.getValue()) && !"".equals(readWriteEntity.getValue().toString().trim())){
                if (ObjectUtil.isNotNull(readWriteEntity.getValue()) && !readWriteEntity.getValue().toString().trim().isEmpty()){
                    cellCodeList.add(readWriteEntity.getValue().toString());//封装电芯码
                }/*else{
                }else{
                    cellCodeList.add("");//封装电芯码
                }*/
                }
            }

        } catch (Exception e) {
@@ -331,10 +370,11 @@
     * @param thoroughfare 通道
     * @param device 工位
     * @param moduleCode 模组号
     * @param stationStatus 站状态
     * @return list
     * @throws Exception e
     */
    private static Integer savePassingStation(String thoroughfare, String device,String moduleCode){
    private static Integer savePassingStation(String thoroughfare, String device,String moduleCode,String stationStatus){
        Integer result = 21;

        try {
@@ -346,20 +386,6 @@
            }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;
            }

@@ -444,13 +470,13 @@

    /**
     * 保存参数数据和发送工厂MES
     * @param thoroughfare 通道
     * @param device 工位
     * @param moduleCode 模组号
     * @param stationStatus 站状态
     * @return list
     * @throws Exception e
     */
    private static Integer saveParamCollection(String thoroughfare, String device,String moduleCode){
    private static Integer saveParamCollection(String device,String moduleCode,String stationStatus){
        Integer result = 21;//返回结果
        String sendMes = "";

@@ -476,6 +502,11 @@
                    String paramValue = "";
                    if (ObjectUtil.isNotNull(readWriteEntityList.get(i).getValue())){
                        paramValue = readWriteEntityList.get(i).getValue().toString();//参数值
                        if("DATE".equals(list.get(i).getCollectParameterType()) && !paramValue.isEmpty()){
                            paramValue = format.parse(TimeUtil.test(TimeUtil.stringProcessing(paramValue))).toString();
                        }else if("MODEL".equals(list.get(i).getCollectParameterType()) && !paramValue.isEmpty()){
                            paramValue = Constants.materialMap.get(paramValue);
                        }
                    }
                    daParamCollection.setParamValue(paramValue);//参数值
                    daParamCollection.setLocationCode(device);//工位
@@ -489,26 +520,41 @@
                    childVO.setItemValue(paramValue);//参数值
                    childVO.setItemText(list.get(i).getCollectParameterName());
                    childVO.setCheckResult("1");
                    childVO.setCheckTime(new Date().toString());
                    childVO.setCheckTime(format.format(new Date()));
                    mesList.add(childVO);
                }

                CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                    //插入参数采集表
                    daParamCollectionService.insertBatch(collectionList);

                    //如果220工位，进行报工
                    if("M1OP220".equals(device)) {
                        RestfulService.getWorkReportResultFeedback(moduleCode, "M1OP220", format.format(new Date()));
                    }

                    //上传到工厂mes
                    ParentVO parentVO = new ParentVO();
                    parentVO.setStationCode(device);//工位
                    parentVO.setSiteCode("3983");

                    parentVO.setRecordId(UUID.randomUUID().toString());
                    parentVO.setTotalResult("1");
                    if("2".equals(stationStatus)){//工站状态
                        parentVO.setTotalResult("0");
                    }else {
                        parentVO.setTotalResult("1");
                    }
                    parentVO.setProductNum(moduleCode);

                    //添加基础数据
                    List<ChildVO> basicList = getCollectParamBasicData(device);
                    mesList.addAll(basicList);

                    parentVO.setCheckList(mesList);

                    log.info("执行工厂MES方法start，传入数据：{}",parentVO);
                    HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
                    log.info("执行工厂MES方法end，返回数据：{}",execute.body());
                    log.info("执行工厂MES方法start，工位号{} 传入数据：{}",device ,parentVO);
                    HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
                    log.info("执行工厂MES方法end，工位号{} 返回数据：{}",device,execute.body());

                });
            }
@@ -520,13 +566,12 @@

    /**
     * 保存参数数据和发送工厂MES
     * @param thoroughfare 通道
     * @param device 工位
     * @param cellCodeList 电芯码集合
     * @return list
     * @throws Exception e
     */
    private static Integer saveParamCollection(String thoroughfare, String device,List<String> cellCodeList){
    private static Integer saveParamCollection(String device,List<String> cellCodeList){
        Integer result = 21;//返回结果
        List<ChildVO> mesChildList1 = new ArrayList<>();//封装给工厂MES发送的childlist1
        List<ChildVO> mesChildList2 = new ArrayList<>();//封装给工厂MES发送的childlist2
@@ -585,12 +630,12 @@

                        //发送给工厂mes参数封装
                        ChildVO childVO = new ChildVO();
                        childVO.setItemCode(confColl1.get(i).getCollectParameterName());//参数
                        childVO.setItemCode(confColl1.get(i).getCollectParameterId());//参数
                        childVO.setItemType(confColl1.get(i).getItemType());
                        childVO.setItemValue(paramValue);//参数值
                        childVO.setItemText(confColl1.get(i).getParameterSetName());
                        childVO.setItemText(confColl1.get(i).getCollectParameterName());
                        childVO.setCheckResult("1");
                        childVO.setCheckTime(new Date().toString());
                        childVO.setCheckTime(format.format(new Date()));
                        mesChildList1.add(childVO);
                    }

@@ -613,12 +658,12 @@

                        //发送给工厂mes参数封装
                        ChildVO childVO = new ChildVO();
                        childVO.setItemCode(confColl2.get(i).getCollectParameterName());//参数
                        childVO.setItemCode(confColl2.get(i).getCollectParameterId());//参数
                        childVO.setItemType(confColl2.get(i).getItemType());
                        childVO.setItemValue(paramValue);//参数值
                        childVO.setItemText(confColl2.get(i).getParameterSetName());
                        childVO.setItemText(confColl2.get(i).getCollectParameterName());
                        childVO.setCheckResult("1");
                        childVO.setCheckTime(new Date().toString());
                        childVO.setCheckTime(format.format(new Date()));
                        mesChildList2.add(childVO);
                    }
                }
@@ -639,12 +684,12 @@

                        //发送给工厂mes参数封装
                        ChildVO childVO = new ChildVO();
                        childVO.setItemCode(confColl3.get(i).getCollectParameterName());//参数
                        childVO.setItemCode(confColl3.get(i).getCollectParameterId());//参数
                        childVO.setItemType(confColl3.get(i).getItemType());
                        childVO.setItemValue(paramValue);//参数值
                        childVO.setItemText(confColl3.get(i).getParameterSetName());
                        childVO.setItemText(confColl3.get(i).getCollectParameterName());
                        childVO.setCheckResult("1");
                        childVO.setCheckTime(new Date().toString());
                        childVO.setCheckTime(format.format(new Date()));
                        mesChildList3.add(childVO);
                    }
                }
@@ -665,12 +710,12 @@

                        //发送给工厂mes参数封装
                        ChildVO childVO = new ChildVO();
                        childVO.setItemCode(confColl4.get(i).getCollectParameterName());//参数
                        childVO.setItemCode(confColl4.get(i).getCollectParameterId());//参数
                        childVO.setItemType(confColl4.get(i).getItemType());
                        childVO.setItemValue(paramValue);//参数值
                        childVO.setItemText(confColl4.get(i).getParameterSetName());
                        childVO.setItemText(confColl4.get(i).getCollectParameterName());
                        childVO.setCheckResult("1");
                        childVO.setCheckTime(new Date().toString());
                        childVO.setCheckTime(format.format(new Date()));
                        mesChildList4.add(childVO);
                    }
                }
@@ -687,9 +732,9 @@
                                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();
                                    if("DATE".equals(confColl0.get(j).getCollectParameterType()) && !paramValue.isEmpty()){
                                        paramValue = TimeUtil.test(TimeUtil.stringProcessing(paramValue));
                                    }
                                }
                                daParamCollection.setParamValue(paramValue);//参数值
                                daParamCollection.setLocationCode(device);//工位
@@ -698,12 +743,12 @@

                                //发送给工厂mes参数封装
                                ChildVO childVO = new ChildVO();
                                childVO.setItemCode(confColl0.get(j).getCollectParameterName());//参数
                                childVO.setItemCode(confColl0.get(j).getCollectParameterId());//参数
                                childVO.setItemType(confColl0.get(j).getItemType());
                                childVO.setItemValue(paramValue);//参数值
                                childVO.setItemText(confColl0.get(j).getParameterSetName());
                                childVO.setItemText(confColl0.get(j).getCollectParameterName());
                                childVO.setCheckResult("1");
                                childVO.setCheckTime(new Date().toString());
                                childVO.setCheckTime(format.format(new Date()));
                                mesChildList0.add(childVO);
                            }
                        }
@@ -744,10 +789,15 @@
                                    break;

                            }

                            //添加基础数据
                            List<ChildVO> basicList = getCollectParamBasicData(device);
                            mesChildList.addAll(basicList);

                            parentVO.setCheckList(mesChildList);//参数
                            //CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                            log.info("执行工厂MES方法start，传入数据：{}",parentVO);
                            HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
                            HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_GET_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
                            log.info("执行工厂MES方法end，返回数据：{}",execute.body());
                        }
                    }
@@ -887,5 +937,61 @@
        return flag;
    }

    /**
     * AMES报工结果回传
     * @param productNum
     * @param stationCode
     * @param confirmTime
     * @return
     */
    //{"code":"success","data":{"productNum":"LCV123456P0600036","stationCode":"1HZ01","resultCode":"S","resultText":"报工成功"},"message":"API调用成功"}
    public static String getWorkReportResultFeedback(String productNum,String stationCode,String confirmTime)
    {
        String result = "";
        try {
            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);
            result =  response.body();
        }catch (Exception e){
            throw new RuntimeException(e);
        }finally {
            return result;
        }
    }


    /**
     * 获取采集参数基础数据
     * @param stationCode
     * @return list
     */
    public static List<ChildVO> getCollectParamBasicData(String stationCode) {
        List<ChildVO> basicList = new ArrayList<>();
        try {
            //查询参数配置表
            List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
                    .eq(DaCollectionParamConf::getProcessesCode, stationCode)//工位
                    .eq(DaCollectionParamConf::getCollectParameterType, "BASIC")//采集参数类型
            );
            if (CollUtil.isNotEmpty(list)){
                for(DaCollectionParamConf conf:list){
                    ChildVO childVO = new ChildVO();
                    childVO.setItemCode(conf.getCollectParameterId());//参数
                    childVO.setItemType(conf.getItemType());
                    childVO.setItemValue(conf.getParamCentral());//参数值
                    childVO.setItemText(conf.getCollectParameterName());
                    childVO.setCheckResult("1");
                    childVO.setCheckTime(format.format(new Date()));
                    basicList.add(childVO);
                }
            }
            return basicList;
        }catch (Exception e) {
            throw new RuntimeException(e);
        }
    }



}