米多泉泉州wcs功能完善

pjb

2025-06-23 d8060afba15f67e443bb2f89410313905bdc7ebe

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -63,7 +63,7 @@
    }};

    public static final ArrayList<Integer> rgvSiteBackWrkNo2= new ArrayList<Integer>() {{
        add(1044);
        add(1044);add(1090);
    }};

    public static final ArrayList<Integer> rgvSiteBackWrkNo3= new ArrayList<Integer>() {{
@@ -224,7 +224,7 @@
        // 读罐装线反馈信息
        if (slave.getId() > 3) {
//            log.info("读取{}号罐装线plc信息成功",slave.getId());
            OperateResultExOne<byte[]> read = siemensS7Net.Read("DB101.0", (short) 60);
            OperateResultExOne<byte[]> read = siemensS7Net.Read("DB101.0", (short) 64);
            if (read.IsSuccess) {
                // 15秒打印一下日志
                if (System.currentTimeMillis() - lastLogTime >= 15000) {
@@ -253,6 +253,7 @@
                    staProtocol.setBatch(siemensS7Net.getByteTransform().TransString(read.Content, 40,10,"UTF-8"));
                    staProtocol.setManuDate(siemensS7Net.getByteTransform().TransString(read.Content, 50,8,"UTF-8"));
                    staProtocol.setReinspection(siemensS7Net.getByteTransform().TransInt16(read.Content, 58) == 1);
                    staProtocol.setCannedVolume(siemensS7Net.getByteTransform().TransSingle(read.Content, 60));
                }
                return;
            }
@@ -504,15 +505,17 @@
        do {
            write = siemensS7Net.Write("DB100.0", common);
            Thread.sleep(200);
            OperateResultExOne<byte[]> read = siemensS7Net.Read("DB100.4", (short) 2);
            OperateResultExOne<byte[]> read = siemensS7Net.Read("DB100.0", (short) 6);
            if(write.IsSuccess && read.IsSuccess){
                short i = siemensS7Net.getByteTransform().TransInt16(read.Content, 0);
                if ( i != staProtocol.getWorkNo().shortValue()) {
                short bucketType = siemensS7Net.getByteTransform().TransInt16(read.Content, 0);
                short bucketCount = siemensS7Net.getByteTransform().TransInt16(read.Content, 2);
                short workNo = siemensS7Net.getByteTransform().TransInt16(read.Content, 4);
                if ( workNo != common[2] || bucketCount != common[1] || bucketType != common[0]) {
                    writeCount++;
                    log.error("给罐装线写入桶型信息成功，但回读失败：写入任务号：{},回读任务号：{}，输送线plc编号={}，写入次数={}",staProtocol.getWorkNo().shortValue(), i, slave.getId(), writeCount);
                    log.error("给罐装线写入桶型信息成功，但回读失败：写入任务号：{},回读任务号：{}，输送线plc编号={}，写入次数={}", Arrays.toString(common), bucketType +"-" + bucketCount + "-" + workNo, slave.getId(), writeCount);
                    continue;
                }
                log.info("给罐装线写入桶型信息成功，回读成功：任务号：{},回读任务号：{}，输送线plc编号={}，写入次数={}",staProtocol.getWorkNo().shortValue(), i, slave.getId(), writeCount);
                log.info("给罐装线写入桶型信息成功，回读成功：任务号：{},回读任务号：{}，输送线plc编号={}，写入次数={}",staProtocol.getWorkNo().shortValue(), Arrays.toString(common), slave.getId(), writeCount);
                break;
            }
            else {