大理片测试地址修改

ZengTao

2025-06-16 50363ebc3219e7be3515acb716a96e5003e11ae2

大理片测试地址修改

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java

@@ -498,7 +498,7 @@
            log.info("完成任务已执行，结束本次完成进片任务");
            return;
        }
        for (int i = 1; i <= 6; i++) {
        for (int i = 0; i < 6; i++) {
//            ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
//            ReadWriteEntity statetWord = miloService.readFromOpcUa("DLP1A.DLP1A.STATE" + i);
//            ReadWriteEntity toOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.TO" + i);
@@ -509,37 +509,37 @@
            String fromOpcUa = "";
            switch (i) {
                case 0:
                    requestWord = s7DataDLPOne.getId1().toString();
                    requestWord = s7DataDLPOne.getId1();
                    statetWord = s7DataDLPOne.getState1().toString();
                    toOpcUa = s7DataDLPOne.getTo1().toString();
                    fromOpcUa = s7DataDLPOne.getFrom1().toString();
                    break;
                case 1:
                    requestWord = s7DataDLPOne.getId2().toString();
                    requestWord = s7DataDLPOne.getId2();
                    statetWord = s7DataDLPOne.getState2().toString();
                    toOpcUa = s7DataDLPOne.getTo2().toString();
                    fromOpcUa = s7DataDLPOne.getFrom2().toString();
                    break;
                case 2:
                    requestWord = s7DataDLPOne.getId3().toString();
                    requestWord = s7DataDLPOne.getId3();
                    statetWord = s7DataDLPOne.getState3().toString();
                    toOpcUa = s7DataDLPOne.getTo3().toString();
                    fromOpcUa = s7DataDLPOne.getFrom3().toString();
                    break;
                case 3:
                    requestWord = s7DataDLPOne.getId4().toString();
                    requestWord = s7DataDLPOne.getId4();
                    statetWord = s7DataDLPOne.getState4().toString();
                    toOpcUa = s7DataDLPOne.getTo4().toString();
                    fromOpcUa = s7DataDLPOne.getFrom4().toString();
                    break;
                case 4:
                    requestWord = s7DataDLPOne.getId5().toString();
                    requestWord = s7DataDLPOne.getId5();
                    statetWord = s7DataDLPOne.getState5().toString();
                    toOpcUa = s7DataDLPOne.getTo5().toString();
                    fromOpcUa = s7DataDLPOne.getFrom5().toString();
                    break;
                case 5:
                    requestWord = s7DataDLPOne.getId6().toString();
                    requestWord = s7DataDLPOne.getId6();
                    statetWord = s7DataDLPOne.getState6().toString();
                    toOpcUa = s7DataDLPOne.getTo6().toString();
                    fromOpcUa = s7DataDLPOne.getFrom6().toString();

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/s7/entity/S7DataDLPOne.java

@@ -19,85 +19,85 @@
    @S7Variable(address = "DB3.3118.0", type = EDataType.BOOL)
    private Boolean mesControl;

    @S7Variable(address = "DB8.0", type = EDataType.UINT16)
    @S7Variable(address = "DB7.0", type = EDataType.UINT16)
    private Integer requestMes;

    @S7Variable(address = "DB8.2", type = EDataType.UINT16)
    @S7Variable(address = "DB7.2", type = EDataType.UINT16)
    private Integer mesReply;

    @S7Variable(address = "DB8.140", type = EDataType.UINT16)
    @S7Variable(address = "DB7.140", type = EDataType.UINT16)
    private Integer from1;

    @S7Variable(address = "DB8.142", type = EDataType.UINT16)
    @S7Variable(address = "DB7.142", type = EDataType.UINT16)
    private Integer from2;

    @S7Variable(address = "DB8.144", type = EDataType.UINT16)
    @S7Variable(address = "DB7.144", type = EDataType.UINT16)
    private Integer from3;

    @S7Variable(address = "DB8.146", type = EDataType.UINT16)
    @S7Variable(address = "DB7.146", type = EDataType.UINT16)
    private Integer from4;

    @S7Variable(address = "DB8.148", type = EDataType.UINT16)
    @S7Variable(address = "DB7.148", type = EDataType.UINT16)
    private Integer from5;

    @S7Variable(address = "DB8.150", type = EDataType.UINT16)
    @S7Variable(address = "DB7.150", type = EDataType.UINT16)
    private Integer from6;

    @S7Variable(address = "DB8.152", type = EDataType.UINT16)
    @S7Variable(address = "DB7.152", type = EDataType.UINT16)
    private Integer to1;

    @S7Variable(address = "DB8.154", type = EDataType.UINT16)
    @S7Variable(address = "DB7.154", type = EDataType.UINT16)
    private Integer to2;

    @S7Variable(address = "DB8.156", type = EDataType.UINT16)
    @S7Variable(address = "DB7.156", type = EDataType.UINT16)
    private Integer to3;

    @S7Variable(address = "DB8.158", type = EDataType.UINT16)
    @S7Variable(address = "DB7.158", type = EDataType.UINT16)
    private Integer to4;

    @S7Variable(address = "DB8.160", type = EDataType.UINT16)
    @S7Variable(address = "DB7.160", type = EDataType.UINT16)
    private Integer to5;

    @S7Variable(address = "DB8.162", type = EDataType.UINT16)
    @S7Variable(address = "DB7.162", type = EDataType.UINT16)
    private Integer to6;

    @S7Variable(address = "DB8.164", type = EDataType.UINT16)
    @S7Variable(address = "DB7.164", type = EDataType.UINT16)
    private Integer state1;

    @S7Variable(address = "DB8.166", type = EDataType.UINT16)
    @S7Variable(address = "DB7.166", type = EDataType.UINT16)
    private Integer state2;

    @S7Variable(address = "DB8.168", type = EDataType.UINT16)
    @S7Variable(address = "DB7.168", type = EDataType.UINT16)
    private Integer state3;

    @S7Variable(address = "DB8.170", type = EDataType.UINT16)
    @S7Variable(address = "DB7.170", type = EDataType.UINT16)
    private Integer state4;

    @S7Variable(address = "DB8.172", type = EDataType.UINT16)
    @S7Variable(address = "DB7.172", type = EDataType.UINT16)
    private Integer state5;

    @S7Variable(address = "DB8.174", type = EDataType.UINT16)
    @S7Variable(address = "DB7.174", type = EDataType.UINT16)
    private Integer state6;

    @S7Variable(address = "DB8.1246", type = EDataType.UINT16)
    @S7Variable(address = "DB7.1246", type = EDataType.UINT16)
    private Integer glassCount;

    @S7Variable(address = "DB8.8", type = EDataType.STRING, count = 14)
    @S7Variable(address = "DB7.8", type = EDataType.STRING, count = 14)
    private String id1;

    @S7Variable(address = "DB8.30", type = EDataType.STRING, count = 14)
    @S7Variable(address = "DB7.30", type = EDataType.STRING, count = 14)
    private String id2;

    @S7Variable(address = "DB8.52", type = EDataType.STRING, count = 14)
    @S7Variable(address = "DB7.52", type = EDataType.STRING, count = 14)
    private String id3;

    @S7Variable(address = "DB8.74", type = EDataType.STRING, count = 14)
    @S7Variable(address = "DB7.74", type = EDataType.STRING, count = 14)
    private String id4;

    @S7Variable(address = "DB8.96", type = EDataType.STRING, count = 14)
    @S7Variable(address = "DB7.96", type = EDataType.STRING, count = 14)
    private String id5;

    @S7Variable(address = "DB8.118", type = EDataType.STRING, count = 14)
    @S7Variable(address = "DB7.118", type = EDataType.STRING, count = 14)
    private String id6;

    @S7Variable(address = "MW1002", type = EDataType.UINT16)

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/s7/entity/S7DataDLPTwo.java

@@ -20,82 +20,82 @@
    @S7Variable(address = "DB3.3118.0", type = EDataType.BOOL)
    private Boolean mesControl;

    @S7Variable(address = "DB8.4", type = EDataType.UINT16)
    @S7Variable(address = "DB7.4", type = EDataType.UINT16)
    private Integer requestMes;

    @S7Variable(address = "DB8.6", type = EDataType.UINT16)
    @S7Variable(address = "DB7.6", type = EDataType.UINT16)
    private Integer mesReply;

    @S7Variable(address = "DB8.308", type = EDataType.UINT16)
    @S7Variable(address = "DB7.308", type = EDataType.UINT16)
    private Integer from1;

    @S7Variable(address = "DB8.310", type = EDataType.UINT16)
    @S7Variable(address = "DB7.310", type = EDataType.UINT16)
    private Integer from2;

    @S7Variable(address = "DB8.312", type = EDataType.UINT16)
    @S7Variable(address = "DB7.312", type = EDataType.UINT16)
    private Integer from3;

    @S7Variable(address = "DB8.314", type = EDataType.UINT16)
    @S7Variable(address = "DB7.314", type = EDataType.UINT16)
    private Integer from4;

    @S7Variable(address = "DB8.316", type = EDataType.UINT16)
    @S7Variable(address = "DB7.316", type = EDataType.UINT16)
    private Integer from5;

    @S7Variable(address = "DB8.318", type = EDataType.UINT16)
    @S7Variable(address = "DB7.318", type = EDataType.UINT16)
    private Integer from6;

    @S7Variable(address = "DB8.320", type = EDataType.UINT16)
    @S7Variable(address = "DB7.320", type = EDataType.UINT16)
    private Integer to1;

    @S7Variable(address = "DB8.322", type = EDataType.UINT16)
    @S7Variable(address = "DB7.322", type = EDataType.UINT16)
    private Integer to2;

    @S7Variable(address = "DB8.324", type = EDataType.UINT16)
    @S7Variable(address = "DB7.324", type = EDataType.UINT16)
    private Integer to3;

    @S7Variable(address = "DB8.326", type = EDataType.UINT16)
    @S7Variable(address = "DB7.326", type = EDataType.UINT16)
    private Integer to4;

    @S7Variable(address = "DB8.328", type = EDataType.UINT16)
    @S7Variable(address = "DB7.328", type = EDataType.UINT16)
    private Integer to5;

    @S7Variable(address = "DB8.330", type = EDataType.UINT16)
    @S7Variable(address = "DB7.330", type = EDataType.UINT16)
    private Integer to6;

    @S7Variable(address = "DB8.332", type = EDataType.UINT16)
    @S7Variable(address = "DB7.332", type = EDataType.UINT16)
    private Integer state1;

    @S7Variable(address = "DB8.334", type = EDataType.UINT16)
    @S7Variable(address = "DB7.334", type = EDataType.UINT16)
    private Integer state2;

    @S7Variable(address = "DB8.336", type = EDataType.UINT16)
    @S7Variable(address = "DB7.336", type = EDataType.UINT16)
    private Integer state3;

    @S7Variable(address = "DB8.338", type = EDataType.UINT16)
    @S7Variable(address = "DB7.338", type = EDataType.UINT16)
    private Integer state4;

    @S7Variable(address = "DB8.340", type = EDataType.UINT16)
    @S7Variable(address = "DB7.340", type = EDataType.UINT16)
    private Integer state5;

    @S7Variable(address = "DB8.342", type = EDataType.UINT16)
    @S7Variable(address = "DB7.342", type = EDataType.UINT16)
    private Integer state6;

    @S7Variable(address = "DB8.176", type = EDataType.STRING, count = 14)
    @S7Variable(address = "DB7.176", type = EDataType.STRING, count = 14)
    private String id1;

    @S7Variable(address = "DB8.198", type = EDataType.STRING, count = 14)
    @S7Variable(address = "DB7.198", type = EDataType.STRING, count = 14)
    private String id2;

    @S7Variable(address = "DB8.220", type = EDataType.STRING, count = 14)
    @S7Variable(address = "DB7.220", type = EDataType.STRING, count = 14)
    private String id3;

    @S7Variable(address = "DB8.242", type = EDataType.STRING, count = 14)
    @S7Variable(address = "DB7.242", type = EDataType.STRING, count = 14)
    private String id4;

    @S7Variable(address = "DB8.264", type = EDataType.STRING, count = 14)
    @S7Variable(address = "DB7.264", type = EDataType.STRING, count = 14)
    private String id5;

    @S7Variable(address = "DB8.286", type = EDataType.STRING, count = 14)
    @S7Variable(address = "DB7.286", type = EDataType.STRING, count = 14)
    private String id6;

    public List<Integer> getStates() {