修改采集

cl

2024-07-28 05181bde55a539a7ee8b307d28fad7a0c68ef639

修改采集

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

@@ -549,7 +549,7 @@
                    daParamCollectionService.insertBatch(collectionList);

                    //如果220工位，进行报工,因为上层系统只支持6位，所有报工工位修改为M1P220
                    if("M1OP220".equals(device)) {
                    if(Constants.OP220.equals(device)) {
                        getWorkReportResultFeedback(moduleCode, "M1P220", format.format(new Date()));
                    }

@@ -874,7 +874,6 @@
    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, "M1OP020")
                .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
                .orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
        );
@@ -904,7 +903,6 @@
        if (ObjectUtil.isNotNull(value1)){
            String cellCode = value1.toString();
            List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
                    //.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
                    .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
                    .orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
            );
@@ -931,7 +929,6 @@
        if (ObjectUtil.isNotNull(value2)){
            String cellCode = value2.toString();
            List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
                    //.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
                    .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
                    .orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
            );
@@ -959,7 +956,6 @@
        if (ObjectUtil.isNotNull(value3)){
            String cellCode = value3.toString();
            List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
                    //.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
                    .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
                    .orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
            );
@@ -987,7 +983,6 @@
        if (ObjectUtil.isNotNull(value4)){
            String cellCode = value4.toString();
            List<DaTestDeviceInterfaceTemp> list = daTestDeviceInterfaceTempService.list(new LambdaQueryWrapper<DaTestDeviceInterfaceTemp>()
                    //.eq(DaTestDeviceInterfaceTemp::getStationCode, "M1OP020")
                    .eq(DaTestDeviceInterfaceTemp::getProductNum,cellCode)
                    .orderByDesc(DaTestDeviceInterfaceTemp::getCreateTime)
            );