Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

LSH

2023-11-21 0cb523849fa0461f09353b062b70fb6fcf5e697b

Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

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

@@ -314,7 +314,7 @@
     * wms任务号
     */
    @ApiModelProperty(value= "wms任务号")
    @TableField("task_no")
    @TableField("wms_wrk_no")
    private String taskNo;

    /**

 src/main/java/com/zy/core/enums/CrnModeType.java

@@ -2,10 +2,10 @@

public enum CrnModeType {

    NONE(0, "未选择"),
    AUTO(1, "自动"),
    NONE(0, "关机"),
    AUTO(3, "自动"),
    HALF_AUTO(2, "半自动"),
    HAND(3, "手动"),
    HAND(1, "手动"),
    STOP(4, "维修"),
    ;


 src/main/java/com/zy/core/enums/CrnStatusType.java

@@ -20,10 +20,16 @@

    IDLE(0, "空闲，无任务"),
    NONE_MOVING(1, "无货行走"),
    FETCHING(2, "取货"),
    MOVING(3, "有货行走"),
    PUTTING(4, "放货"),
    PUT_COMPLETE(5, "放货完成"),
    FETCHING(2, "检查任务数据"),
    MOVING(3, "定位到取货位"),
    //PUTTING(4, "放货"),
    PUT_COMPLETE(7, "取货完成"),
    MOVE_THE_SHIPPING_LOCATION(8, "移动到放货位置"),
    PUTTING(9, "放货中"),
    HANDLING_COMPLETED(10, "搬运完成"),
    EMPTY_AVOIDANCE(11, "空载避让"),
    SOS(99, "报警"),
    OTHER(100, "其他"),
    ;

    public Integer id;

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

@@ -141,21 +141,33 @@
     * 读取状态
     */
    private void readStatus(){
        OperateResultExOne<byte[]> result = siemensNet.Read("DB11.2", (short) 104);

        OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
        if (result.IsSuccess) {
            if (null == crnProtocol) {
                crnProtocol = new CrnProtocol();
            }
            crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));   // 2
            crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 2)); // 4
            crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 4)); // 6
            crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 6)); // 8
            crnProtocol.setValid(siemensNet.getByteTransform().TransInt16(result.Content, 8));  // 10

            crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 14)); // 16
            crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 16));   // 18
            crnProtocol.setRow(siemensNet.getByteTransform().TransInt16(result.Content, 18));   // 20
            crnProtocol.setLane(siemensNet.getByteTransform().TransInt16(result.Content, 20));  // 22
            crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
            crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
            crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
            crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6));
            crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
            crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
            crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
            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.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
//            crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
//            crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
            crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
            crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
            crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
            crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
            crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
            crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
            crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));

            // 异常
            crnProtocol.setAlarm1(0);
@@ -400,7 +412,7 @@
        array[8] = command.getDestinationStaNo();

        // 作业信息
        OperateResult result = siemensNet.Write("DB10.0", array);
        OperateResult result = siemensNet.Write("DB100.0", array);
        // 任务号 + 完成位
        short[] array2 = new short[2];
        array2[0] = command.getTaskNo();

 src/main/webapp/views/deviceOperate/crnOperate.html

@@ -22,7 +22,7 @@
                </el-table-column>
                <el-table-column property="statusType" label="模式">
                </el-table-column>
                <el-table-column property="wrkStatus" label="任务状态">
                <el-table-column property="wrkStatus$" label="任务状态">
                </el-table-column>
                <el-table-column property="deviceStatus" label="设备状态">
                </el-table-column>