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

野心家

2025-04-01 66942458f7753fe4ddee7c5ed3386d61cff28b24

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

@@ -50,7 +50,7 @@
    /**
     * 任务状态 1: 接收  2: 派发  3: 完结  4: 取消
     */
    @ApiModelProperty(value= "任务状态 1: 接收  2: 派发  3: 完结  4: 取消  ")
    @ApiModelProperty(value= "任务状态 1: 接收  2: 派发  5: 完结  4: 取消  ")
    private Integer status;

    /**
@@ -174,7 +174,7 @@
     */
    @ApiModelProperty(value= "指令执行步序")
    @TableField("command_step")
    private Integer commandStep;
    private Integer commandStep = 0;

    @ApiModelProperty(value = "移库标记")
    @TableField("transfer_mark")
@@ -187,6 +187,10 @@
    @ApiModelProperty(value = "原始起点")
    @TableField("origin_target_point")
    private String originTargetPoint;

    @ApiModelProperty(value = "开始任务标记")
    @TableField("mark_start")
    private Integer markStart;

    public TaskWrk() {}

@@ -238,9 +242,11 @@
            case 2:
                return "派发";
            case 3:
                return "完结";
                return "步序完成";
            case 4:
                return "取消";
            case 5:
                return "完结";
            default:
                return String.valueOf(this.status);
        }