Merge remote-tracking branch 'origin/jxtlfwcs-yclk' into jxtlfwcs-yclk

zwl

2025-09-17 cdc7ddd76879ec47166b51947754ba946260267b

 src/main/java/com/zy/common/model/LocTypeDto.java

@@ -23,14 +23,15 @@
    }

    public LocTypeDto(StaProtocol staProtocol) {
        if (staProtocol.isHigh() == staProtocol.isLow()) {
            throw new CoolException("plc高低检测异常");
        }
        if (staProtocol.isLow()) {
//        if (staProtocol.isHigh() == staProtocol.isLow()) {
//            throw new CoolException("plc高低检测异常");
//        }
        if (!staProtocol.isHigh()) {
            this.locType1 = 1; // 低库位
        } else {
            this.locType1 = 2; // 高库位
        }
//        this.locType1 = 1;
    }

    /**