修改参数采集

cl

2024-07-07 eda15ed46a021ae8ea988c9438b23b6a14359819

修改参数采集

 jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java

@@ -13,6 +13,8 @@

    public static final List<String> OP100_OP150 = new ArrayList<>();//人工工位

    public static final List<String> ModuleList = new ArrayList<>();//模组工位，用于校验是否传入模组码

    public static final String NG = "2";
    public static final String UN_PASS= "不合格";
    public static final String PASS= "合格";
@@ -27,7 +29,6 @@
    public static final String ZERO= "0";
    public static final String TWO= "2";
    public static final String OP070= "M1OP070";
    public static final String OP110= "M1OP110";
    public static final String OP010= "M1OP010";
    public static final String OP020= "M1OP020";
    public static final String OP030= "M1OP030";
@@ -37,7 +38,17 @@
    public static final String OP090= "M1OP090";
    public static final String OP100_1= "M1OP100-1";
    public static final String OP100_2= "M1OP100-2";

    public static final String OP110= "M1OP110";
    public static final String OP120= "M1OP120";
    public static final String OP130= "M1OP130";
    public static final String OP140= "M1OP140";
    public static final String OP150= "M1OP150";
    public static final String OP160= "M1OP160";
    public static final String OP170= "M1OP170";
    public static final String OP180= "M1OP180";
    public static final String OP210= "M1OP210";
    public static final String OP220= "M1OP220";

    public static final Integer INT_ONE= 1;
    public static final Integer INT_TWO= 2;

 jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java

@@ -61,6 +61,18 @@
        Constants.OP100_OP150.add(Constants.OP100_2);
        //Constants.OP100_OP150.add(Constants.OP150);

        //模组工位List
        Constants.ModuleList.add(Constants.OP110);
        Constants.ModuleList.add(Constants.OP120);
        Constants.ModuleList.add(Constants.OP130);
        Constants.ModuleList.add(Constants.OP140);
        Constants.ModuleList.add(Constants.OP150);
        Constants.ModuleList.add(Constants.OP160);
        Constants.ModuleList.add(Constants.OP170);
        Constants.ModuleList.add(Constants.OP180);
        Constants.ModuleList.add(Constants.OP210);
        Constants.ModuleList.add(Constants.OP220);

        OPCUaSubscription opcUaSubscription = new OPCUaSubscription(
                miloService,
                daPassingStationCollectionService,

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

@@ -159,7 +159,15 @@
                                miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
                            }

                        }else {
                        }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 {
                            miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(11).build());
                            log.info("写入到工位{}的RecordDataDone数据：{}",device,11);
                        }
@@ -189,7 +197,7 @@
                            Integer result = 21;
                            Object productTypeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ProductType").getValue();//产品类型
                            Object modulCodeObjcet = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue();
                            if (ObjectUtil.isNull(modulCodeObjcet) && modulCodeObjcet.toString().trim().isEmpty()){
                            if (ObjectUtil.isNull(modulCodeObjcet)){
                                result = 23;
                            }else{
                                String moduleCode = modulCodeObjcet.toString();