#

lsh

2024-06-22 cfc245ddc4c3678dde29011e7d2a6350a8a9e449

#

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

@@ -67,28 +67,28 @@
    /**
     * 左门(checkBox)
     */
    @ApiModelProperty(value= "左门(checkBox)")
    @ApiModelProperty(value= "进料门(checkBox)")
    @TableField("left_door")
    private String leftDoor;

    /**
     * 右门(checkBox)
     */
    @ApiModelProperty(value= "右门(checkBox)")
    @ApiModelProperty(value= "出料门(checkBox)")
    @TableField("right_door")
    private String rightDoor;

    /**
     * 左门可开(checkBox)
     */
    @ApiModelProperty(value= "左门可开(checkBox)")
    @ApiModelProperty(value= "进料门可开(checkBox)")
    @TableField("left_in_enable")
    private String leftInEnable;

    /**
     * 左门可关(checkBox)
     */
    @ApiModelProperty(value= "左门可关(checkBox)")
    @ApiModelProperty(value= "进料门可关(checkBox)")
    @TableField("left_out_enable")
    private String leftOutEnable;

@@ -108,14 +108,14 @@
    /**
     * 右门可开(checkBox)
     */
    @ApiModelProperty(value= "右门可开(checkBox)")
    @ApiModelProperty(value= "出料门可开(checkBox)")
    @TableField("right_in_enable")
    private String rightInEnable;

    /**
     * 右门可关(checkBox)
     */
    @ApiModelProperty(value= "右门可关(checkBox)")
    @ApiModelProperty(value= "出料门可关(checkBox)")
    @TableField("right_out_enable")
    private String rightOutEnable;

@@ -179,9 +179,9 @@
            case 0:
                return "无异常";
            case 1:
                return "运行时左门未关好";
                return "运行时进料门未关好";
            case 2:
                return "运行时右门未关好";
                return "运行时出料门未关好";
            case 3:
                return "运行时未选择工艺";
            case 4:
@@ -191,9 +191,9 @@
            case 6:
                return "急停被按下";
            case 7:
                return "左门关门超时";
                return "进料门关门超时";
            case 8:
                return "右门关门超时";
                return "出料门关门超时";
            default:
                return String.valueOf(this.jarErr);
        }

 src/main/java/com/zy/common/model/enums/JarStatusType.java

@@ -7,10 +7,10 @@
    SOS(2, "硫化中"),
    WAITING1(3, "出料中"),
    WAITING2(4, "停止"),
    WAITING3(5, "左门打开中"),
    WAITING4(6, "右门打开中"),
    WAITING5(7, "左门关闭中"),
    OFF_LINE(8, "右门关闭中"),
    WAITING3(5, "进料门打开中"),
    WAITING4(6, "出料门打开中"),
    WAITING5(7, "进料门关闭中"),
    OFF_LINE(8, "出料门关闭中"),
    OTHER(100, "其它"),
    ;