#1

dubin

2025-11-25 051d84a86d86fbb71e0292a09a6d03874d4fb0e5

#1

 src/main/java/com/zy/asrs/entity/BasDevp.java

@@ -231,6 +231,8 @@
                return "低库位";
            case 2:
                return "高库位";
            case 5:
                return "中库位";
            default:
                return String.valueOf(this.locType1);
        }

 src/main/java/com/zy/core/model/protocol/CrnProtocol.java

@@ -109,6 +109,8 @@
    private Short temp3;

    private Short temp4;
    /*心跳*/
    private Short heart;

    /**
     * 异常1
@@ -240,6 +242,10 @@
        this.temp1 = temp1;
    }

    public void setHeart(Short heart) {
        this.heart = heart;
    }

    /**
     * 最近一次入出库类型
     *       I:入库

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -119,7 +119,7 @@
        basDevp.setLoading(loading?"Y":"N");
        basDevp.setInEnable(inEnable?"Y":"N");
        basDevp.setOutEnable(outEnable?"Y":"N");
        basDevp.setLocType1((short) 0);  // 高低类型{0:未知,1:低库位,2:高库位,3:中库位}
        basDevp.setLocType1((short) 0);  // 高低类型{0:未知,1:低库位,2:高库位,5:中库位}
        basDevp.setLocType2((short) 0);  // 宽窄类型{0:未知,1:窄库位,2:宽库位}
        basDevp.setLocType3((short) 0);  // 轻重类型{0:未知,1:轻库位,2:重库位}
        basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);

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

@@ -169,7 +169,7 @@
                crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
                crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
                crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
                crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
                crnProtocol.setHeart(siemensNet.getByteTransform().TransInt16(result.Content, 20));
                crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
                crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
                crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));