修改参数采集

cl

2024-07-11 35c489d86b027462dca8bdd06e5fb6dc066fa428

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

@@ -6,8 +6,10 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.jcdm.common.core.domain.AjaxResult;
import com.jcdm.framework.websocket.WebSocketUsers;
import com.jcdm.main.constant.Constants;
import com.jcdm.main.da.collectionParamConf.domain.DaCollectionParamConf;
@@ -16,9 +18,12 @@
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
import com.jcdm.main.da.testDeviceInterfaceTemp.domain.DaTestDeviceInterfaceTemp;
import com.jcdm.main.da.testDeviceInterfaceTemp.service.IDaTestDeviceInterfaceTempService;
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.plcserver.util.TimeUtil;
import com.jcdm.main.restful.factoryMes.service.RestfulService;
import com.jcdm.main.restful.qingYan.doman.ChildVO;
import com.jcdm.main.restful.qingYan.doman.ParentVO;
import com.kangaroohy.milo.model.ReadWriteEntity;
@@ -27,6 +32,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;

import javax.websocket.Session;
import java.text.SimpleDateFormat;
@@ -54,19 +60,23 @@

    public static IOmProductionOrdeInfoService omProductionOrdeInfoService;

    @Value("${orderLineUrl}")
    private static String orderLineUrl;
    public static IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService;

/*    @Value("${orderLineUrl}")
    private static String orderLineUrl;*/

    public OPCUaSubscription(MiloService miloService,
                             IDaPassingStationCollectionService daPassingStationCollectionService,
                             IDaCollectionParamConfService collectionParamConfService,
                             IDaParamCollectionService daParamCollectionService,
                             IOmProductionOrdeInfoService omProductionOrdeInfoService) {
                             IOmProductionOrdeInfoService omProductionOrdeInfoService,
                             IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService) {
        OPCUaSubscription.miloService = miloService;
        OPCUaSubscription.daPassingStationCollectionService = daPassingStationCollectionService;
        OPCUaSubscription.collectionParamConfService = collectionParamConfService;
        OPCUaSubscription.daParamCollectionService = daParamCollectionService;
        OPCUaSubscription.omProductionOrdeInfoService = omProductionOrdeInfoService;
        OPCUaSubscription.daTestDeviceInterfaceTempService = daTestDeviceInterfaceTempService;
    }


@@ -80,131 +90,215 @@
                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) || Constants.OP030.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;
//                                }
                            }
                        }
                        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)){
                        if (Constants.OP100_1.equals(device) || Constants.OP100_2.equals(device) ){
                            //查询要生产的工单
                            List<OmProductionOrdeInfo> orderList = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>()
                                    .eq(OmProductionOrdeInfo::getOrderStatus, Constants.ONE));//工单状态

                            if (CollUtil.isNotEmpty(orderList)){
                                Long id = orderList.get(0).getId();
                                String productNum = orderList.get(0).getProductNum();//模组码
                                //下发产品模组码
                                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.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".MES_ProductType").value(productNum).build());
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(1).build());

                                //更新工单状态为执行中
                                OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
                                omProductionOrdeInfo.setId(id);
                                omProductionOrdeInfo.setOrderStatus("3");
                                omProductionOrdeInfoService.updateOmProductionOrdeInfo(omProductionOrdeInfo);

                                //将产品SN发送到前台
                                productNum = "productNum,"+ productNum;
                                WebSocketUsers.sendMessageToUserByText(map.get(device), productNum);
                            }else{
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordSNDone").value(2).build());//没有要生产的工单
                            }
                        }
                    }
                }else if (Constants.RECORD_DATA.equals(tab)){//出入站
                    if (Constants.ONE.equals(valueString)){//入站
                        //1:告知MES托盘已到站，请求下发进站状态
                        if (Constants.OP030.equals(device)){
                    }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 = true;//OCVResultFeedBack(thoroughfare, device);

                            boolean b = OCVResultFeedBack(thoroughfare, device,cellCode);
                            //四个电芯的状态
                            if (b){
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                                log.info("写入到工位{}的RecordDataDone数据：{}",device,11);
                                scanResult = 11;
                            }else {
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                                log.info("写入到工位{}的RecordDataDone数据：{}",device,12);
                                scanResult = 12;
                            }
                        } else {
                        }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.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{
                            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_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();
                            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);
                    }
                }
            }
        } 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) {
        String paramProductNum = "";
        try {

            List<OmProductionOrdeInfo> orderList = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>()
                    .eq(OmProductionOrdeInfo::getOrderStatus, Constants.ONE));//工单状态

            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 + ".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());

                //更新工单状态为执行中
                OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
                omProductionOrdeInfo.setId(id);
                omProductionOrdeInfo.setOrderStatus("3");
                omProductionOrdeInfoService.updateOmProductionOrdeInfo(omProductionOrdeInfo);

                //将产品SN发送到前台
                productNum = "productNum,"+ productNum;
                WebSocketUsers.sendMessageToUserByText(map.get(device), productNum);
            }*//*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 ,String materialCode)
    {
        String paramProductNum = "";
        try {
            // 查询最新的工单信息
            OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();
            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.setMaterialCode(dataObject.getStr("materialCode"));
                omProductionOrdeInfo.setOnlineCompletionMark("0");
                omProductionOrdeInfo.setSfResult("0");
                omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
                omProductionOrdeInfo.setCreateTime(new Date());
                omProductionOrdeInfo.setCreateUser("工厂MES");
                omProductionOrdeInfoService.save(omProductionOrdeInfo);

                //发送给前台
                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());

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

    /**
     * 读取电芯码
@@ -227,9 +321,9 @@
            for (ReadWriteEntity readWriteEntity : readWriteEntityList) {
                if (ObjectUtil.isNotNull(readWriteEntity.getValue()) && !"".equals(readWriteEntity.getValue().toString().trim())){
                    cellCodeList.add(readWriteEntity.getValue().toString());//封装电芯码
                }else{
                }/*else{
                    cellCodeList.add("");//封装电芯码
                }
                }*/
            }

        } catch (Exception e) {
@@ -389,6 +483,9 @@
                    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();
                        }
                    }
                    daParamCollection.setParamValue(paramValue);//参数值
                    daParamCollection.setLocationCode(device);//工位
@@ -402,7 +499,7 @@
                    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);
                }

@@ -419,9 +516,9 @@
                    parentVO.setProductNum(moduleCode);
                    parentVO.setCheckList(mesList);

                    log.info("执行工厂MES方法start，传入数据：{}",parentVO);
                    HttpResponse execute = HttpRequest.post(orderLineUrl).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_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
                    log.info("执行工厂MES方法end，工位号{} 返回数据：{}",device,execute.body());

                });
            }
@@ -441,8 +538,11 @@
     */
    private static Integer saveParamCollection(String thoroughfare, String device,List<String> cellCodeList){
        Integer result = 21;//返回结果
        List<List<ChildVO>> mesList = new ArrayList<>();//存储4个电芯的发送给MES的值

        List<ChildVO> mesChildList1 = new ArrayList<>();//封装给工厂MES发送的childlist1
        List<ChildVO> mesChildList2 = new ArrayList<>();//封装给工厂MES发送的childlist2
        List<ChildVO> mesChildList3 = new ArrayList<>();//封装给工厂MES发送的childlist3
        List<ChildVO> mesChildList4 = new ArrayList<>();//封装给工厂MES发送的childlist4
        List<ChildVO> mesChildList0 = new ArrayList<>();//封装给工厂MES发送的childlist4
        try {
            //查询参数配置表
            List<DaCollectionParamConf> list = collectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>()
@@ -479,7 +579,6 @@

                //第一个电芯的数据
                if (CollUtil.isNotEmpty(paramCollectionList1) && !cellCodeList.get(0).isEmpty()) {
                    List<ChildVO> mesChildList1 = new ArrayList<>();//封装给工厂MES发送的childlist1
                    for (int i = 0; i < paramCollectionList1.size(); i++) {
                        DaParamCollection daParamCollection = new DaParamCollection();
                        daParamCollection.setSfcCode(cellCodeList.get(0));//电芯码
@@ -496,18 +595,17 @@

                        //发送给工厂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);
                    }
                    mesList.add(0, mesChildList1);

                }
                if (CollUtil.isNotEmpty(paramCollectionList2) && !cellCodeList.get(1).isEmpty()) {
                    List<ChildVO> mesChildList2 = new ArrayList<>();//封装给工厂MES发送的childlist2

                    for (int i = 0; i < paramCollectionList2.size(); i++) {
                        DaParamCollection daParamCollection = new DaParamCollection();
@@ -525,18 +623,16 @@

                        //发送给工厂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);
                    }
                    mesList.add(1, mesChildList2);
                }
                if (CollUtil.isNotEmpty(paramCollectionList3) && !cellCodeList.get(2).isEmpty()) {
                    List<ChildVO> mesChildList3 = new ArrayList<>();//封装给工厂MES发送的childlist3
                    for (int i = 0; i < paramCollectionList3.size(); i++) {
                        DaParamCollection daParamCollection = new DaParamCollection();
                        daParamCollection.setSfcCode(cellCodeList.get(2));//电芯码
@@ -553,18 +649,16 @@

                        //发送给工厂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);
                    }
                    mesList.add(2, mesChildList3);
                }
                if (CollUtil.isNotEmpty(paramCollectionList4)&& !cellCodeList.get(3).isEmpty()) {
                    List<ChildVO> mesChildList4 = new ArrayList<>();//封装给工厂MES发送的childlist4
                    for (int i = 0; i < paramCollectionList4.size(); i++) {
                        DaParamCollection daParamCollection = new DaParamCollection();
                        daParamCollection.setSfcCode(cellCodeList.get(3));//电芯码
@@ -581,22 +675,20 @@

                        //发送给工厂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);
                    }
                    mesList.add(3, mesChildList4);
                }

                //公共参数
                if (CollUtil.isNotEmpty(paramCollectionList0)) {
                    for (int i = 0; i < cellCodeList.size(); i++) {//循环4个电芯
                        if(!cellCodeList.get(i).isEmpty()){
                            List<ChildVO> mesChildList0 = new ArrayList<>();//封装给工厂MES发送的childlist0
                            for (int j = 0; j < paramCollectionList0.size(); j++) {
                                DaParamCollection daParamCollection = new DaParamCollection();
                                daParamCollection.setSfcCode(cellCodeList.get(i));//电芯码
@@ -605,9 +697,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);//工位
@@ -616,15 +708,14 @@

                                //发送给工厂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);
                            }
                            mesList.add(i, mesChildList0);
                        }

                        //mesList.get(i).addAll(mesChildList0);
@@ -646,16 +737,34 @@
                    for (int i = 0; i < cellCodeList.size(); i++) {//循环4个电芯
                        if(!cellCodeList.get(i).isEmpty()){
                            parentVO.setProductNum(cellCodeList.get(i));//电芯码
                            parentVO.setCheckList(mesList.get(i));//参数
                            //封装给工厂MES发送的childlist4
                            List<ChildVO> mesChildList = new ArrayList<>(mesChildList0);
                            switch (i) {
                                case 0 :
                                    mesChildList.addAll(mesChildList1);
                                    break;
                                case 1 :
                                    mesChildList.addAll(mesChildList2);
                                    break;
                                case 2 :
                                    mesChildList.addAll(mesChildList3);
                                    break;
                                case 3 :
                                    mesChildList.addAll(mesChildList4);
                                    break;

                            }
                            parentVO.setCheckList(mesChildList);//参数
                            //CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                            log.info("执行工厂MES方法start，传入数据：{}",parentVO);
                            HttpResponse execute = HttpRequest.post(orderLineUrl).body(JSONUtil.toJsonStr(parentVO)).execute();
                            HttpResponse execute = HttpRequest.post(Constants.FACTORY_EMS_UAT_RUL+"deviceResultFeedback").body(JSONUtil.toJsonStr(parentVO)).execute();
                            log.info("执行工厂MES方法end，返回数据：{}",execute.body());
                        }
                    }
                });
            }
        }catch (Exception e) {
            log.error(e.getMessage());
            throw new RuntimeException(e);
        }
        return result;
@@ -665,70 +774,126 @@
     * 030工位返回ocv测试结果
     * @param thoroughfare
     * @param device
     * @param cellCode
     * @throws Exception
     */
    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, device)
                .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
        if (CollUtil.isNotEmpty(list)){
            DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1);
            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);
        }else {
            flag = false;
            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(2).build());
            log.info("读取到工位{},测试设备返回的数据查询不到，电芯码为：{}",device,cellCode);
        }
        return flag;
    }
    /**
     * 030工位返回ocv测试结果
     * @param thoroughfare
     * @param device
     * @throws Exception
     */
    private boolean OCVResultFeedBack(String thoroughfare, String device) throws Exception {
        boolean flag = true;
        Object value1 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_1").getValue();
        /*if (ObjectUtil.isNotNull(value1)){
            String string = value1.toString();
            List<QingYanTestInfo> list = qingYanTestInfoService.list(new LambdaQueryWrapper<QingYanTestInfo>()
                    .eq(QingYanTestInfo::getKeyCode, string));
        if (ObjectUtil.isNotNull(value1)){
            String cellCode = value1.toString();
            List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
                    .eq(DaTestDeviceInterfaceTemp::getStationCode, device)
                    .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
            if (CollUtil.isNotEmpty(list)){
                QingYanTestInfo qingYanTestInfo = list.get(0);
                if (Constants.ONE.equals(qingYanTestInfo.getStatus())){
                DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1);
                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);
            }
        }*/
        }else {
            flag = false;
            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_1").value(2).build());
            log.info("读取到工位{},PLC没有给电芯码",device);
        }
        Object value2 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_2").getValue();
        /*if (ObjectUtil.isNotNull(value2)){
            String string = value2.toString();
            List<QingYanTestInfo> list = qingYanTestInfoService.list(new LambdaQueryWrapper<QingYanTestInfo>()
                    .eq(QingYanTestInfo::getKeyCode, string));
        if (ObjectUtil.isNotNull(value2)){
            String cellCode = value2.toString();
            List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
                    .eq(DaTestDeviceInterfaceTemp::getStationCode, device)
                    .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
            if (CollUtil.isNotEmpty(list)){
                QingYanTestInfo qingYanTestInfo = list.get(0);
                if (Constants.ONE.equals(qingYanTestInfo.getStatus())){
                DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1);
                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);
            }
        }*/
        }else {
            flag = false;
            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_2").value(2).build());
            log.info("读取到工位{},PLC没有给电芯码",device);
        }

        Object value3 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_3").getValue();
        /*if (ObjectUtil.isNotNull(value3)){
            String string = value3.toString();
            List<QingYanTestInfo> list = qingYanTestInfoService.list(new LambdaQueryWrapper<QingYanTestInfo>()
                    .eq(QingYanTestInfo::getKeyCode, string));
        if (ObjectUtil.isNotNull(value3)){
            String cellCode = value3.toString();
            List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
                    .eq(DaTestDeviceInterfaceTemp::getStationCode, device)
                    .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
            if (CollUtil.isNotEmpty(list)){
                QingYanTestInfo qingYanTestInfo = list.get(0);
                if (Constants.ONE.equals(qingYanTestInfo.getStatus())){
                DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1);
                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);
            }
        }*/
        }else {
            flag = false;
            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_3").value(2).build());
            log.info("读取到工位{},PLC没有给电芯码",device);
        }

        Object value4 = miloService.readFromOpcUa(thoroughfare + "." + device + ".CellCode_4").getValue();
        /*if (ObjectUtil.isNotNull(value4)){
            String string = value4.toString();
            List<QingYanTestInfo> list = qingYanTestInfoService.list(new LambdaQueryWrapper<QingYanTestInfo>()
                    .eq(QingYanTestInfo::getKeyCode, string));
        if (ObjectUtil.isNotNull(value4)){
            String cellCode = value4.toString();
            List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
                    .eq(DaTestDeviceInterfaceTemp::getStationCode, device)
                    .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode));
            if (CollUtil.isNotEmpty(list)){
                QingYanTestInfo qingYanTestInfo = list.get(0);
                if (Constants.ONE.equals(qingYanTestInfo.getStatus())){
                DaTestDeviceInterfaceTemp daTestDeviceInterfaceTemp = list.get(list.size()-1);
                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);
            }
        }*/
        }else {
            flag = false;
            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_4").value(2).build());
            log.info("读取到工位{},PLC没有给电芯码",device);
        }

        return flag;
    }