修改参数采集

cl

2024-07-15 5fbc7a423b6d51716695ff8317337fc40719e2a6

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

@@ -524,6 +524,11 @@
                        parentVO.setTotalResult("1");
                    }
                    parentVO.setProductNum(moduleCode);

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

                    parentVO.setCheckList(mesList);

                    log.info("执行工厂MES方法start，工位号{} 传入数据：{}",device ,parentVO);
@@ -763,6 +768,11 @@
                                    break;

                            }

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

                            parentVO.setCheckList(mesChildList);//参数
                            //CompletableFuture<Void> cp1 = CompletableFuture.runAsync(() -> {
                            log.info("执行工厂MES方法start，传入数据：{}",parentVO);
@@ -932,11 +942,10 @@

    /**
     * 获取采集参数基础数据
     * @param productCode
     * @param stationCode
     * @return list
     */
    public List<ChildVO> getCollectParamBasicData(String productCode , String stationCode) {
    public static List<ChildVO> getCollectParamBasicData(String stationCode) {
        List<ChildVO> basicList = new ArrayList<>();
        try {
            //查询参数配置表