Merge remote-tracking branch 'origin/hcddwcs-gdfs' into hcddwcs-gdfs

hmpc

2024-11-18 6c85a6bd1ceaacd44c18bfb6a0dc3a9367d13d39

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

@@ -29,14 +29,15 @@
    }

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

    /**