Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs

zyx

2023-09-09 1596ce91095ad30f781006a2cfa5d856d3ac9416

Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs

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

@@ -71,152 +71,120 @@
    private Integer pakMk;

    /**
     * 提升机锁定
     * 提升机坐标
     */
    @ApiModelProperty(value= "提升机锁定")
    @TableField("lift_lock")
    private Integer liftLock;
    @ApiModelProperty(value= "提升机坐标")
    @TableField("point")
    private String point;

    /**
     * 位置到达反馈
     * 模式
     */
    @ApiModelProperty(value= "位置到达反馈")
    @TableField("position_arrival_feedback")
    private Integer positionArrivalFeedback;
    @ApiModelProperty(value= "模式")
    @TableField("model")
    private Boolean model;

    /**
     * 准备就绪
     * 忙闲
     */
    @ApiModelProperty(value= "准备就绪")
    private Integer ready;
    @ApiModelProperty(value= "忙闲")
    @TableField("busy")
    private Boolean busy;

    /**
     * 运行中
     * 前超限
     */
    @ApiModelProperty(value= "运行中")
    private Integer running;
    @ApiModelProperty(value= "前超限")
    @TableField("front_overrun")
    private Boolean frontOverrun;

    /**
     * 联机/单机
     * 后超限
     */
    @ApiModelProperty(value= "联机/单机")
    private Integer mode;
    @ApiModelProperty(value= "后超限")
    @TableField("back_overrun")
    private Boolean backOverrun;

    /**
     * 输送线前端光电有货
     * 左超限
     */
    @ApiModelProperty(value= "输送线前端光电有货")
    @TableField("line_front_has_stock")
    private Integer lineFrontHasStock;
    @ApiModelProperty(value= "左超限")
    @TableField("left_overrun")
    private Boolean leftOverrun;

    /**
     * 输送线正转反馈
     * 右超限
     */
    @ApiModelProperty(value= "输送线正转反馈")
    @TableField("forward_rotation_feedback")
    private Integer forwardRotationFeedback;
    @ApiModelProperty(value= "右超限")
    @TableField("right_overrun")
    private Boolean rightOverrun;

    /**
     * 输送线反转反馈
     * 超高
     */
    @ApiModelProperty(value= "输送线反转反馈")
    @TableField("reverse_feedback")
    private Integer reverseFeedback;
    @ApiModelProperty(value= "超高")
    @TableField("over_height")
    private Boolean overHeight;

    /**
     * 输送线电机过载
     * 超重
     */
    @ApiModelProperty(value= "输送线电机过载")
    @TableField("motor_overload")
    private Integer motorOverload;
    @ApiModelProperty(value= "超重")
    @TableField("over_weight")
    private Boolean overWeight;

    /**
     * 输送线末端光电有货
     * 有托盘
     */
    @ApiModelProperty(value= "输送线末端光电有货")
    @TableField("line_end_has_stock")
    private Integer lineEndHasStock;
    @ApiModelProperty(value= "有托盘")
    @TableField("has_tray")
    private Boolean hasTray;

    /**
     * 进输送线卡托盘报警
     * 有小车
     */
    @ApiModelProperty(value= "进输送线卡托盘报警")
    @TableField("in_convey_line_card_tray_alarm")
    private Integer inConveyLineCardTrayAlarm;
    @ApiModelProperty(value= "有小车")
    @TableField("has_car")
    private Boolean hasCar;

    /**
     * 出输送线卡托盘报警
     * 设备故障
     */
    @ApiModelProperty(value= "出输送线卡托盘报警")
    @TableField("out_convey_line_card_tray_alarm")
    private Integer outConveyLineCardTrayAlarm;
    @ApiModelProperty(value= "设备故障")
    @TableField("device_error")
    private Boolean deviceError;

    /**
     * 平台位置偏差报警
     * 任务地址
     */
    @ApiModelProperty(value= "平台位置偏差报警")
    @TableField("plat_position_deviation_alarm")
    private Integer platPositionDeviationAlarm;
    @ApiModelProperty(value= "任务地址")
    @TableField("task_address")
    private Integer taskAddress;

    /**
     * 平台扭矩偏差报警
     * 目的地址
     */
    @ApiModelProperty(value= "平台扭矩偏差报警")
    @TableField("plat_torque_deviation_alarm")
    private Integer platTorqueDeviationAlarm;
    @ApiModelProperty(value= "目的地址")
    @TableField("dist_address")
    private Integer distAddress;

    /**
     * 平台四向车检测
     * 已完成任务号
     */
    @ApiModelProperty(value= "平台四向车检测")
    @TableField("plat_shuttle_check")
    private Integer platShuttleCheck;
    @ApiModelProperty(value= "已完成任务号")
    @TableField("complete_task_no")
    private Integer completeTaskNo;

    /**
     * 未就绪状态
     * 楼层
     */
    @ApiModelProperty(value= "未就绪状态")
    @TableField("not_ready")
    private Integer notReady;

    /**
     * 伺服1错误
     */
    @ApiModelProperty(value= "伺服1错误")
    @TableField("servo_error1")
    private Integer servoError1;

    /**
     * 伺服2错误
     */
    @ApiModelProperty(value= "伺服2错误")
    @TableField("servo_error2")
    private Integer servoError2;

    /**
     * 伺服3错误
     */
    @ApiModelProperty(value= "伺服3错误")
    @TableField("servo_error3")
    private Integer servoError3;

    /**
     * 伺服4错误
     */
    @ApiModelProperty(value= "伺服4错误")
    @TableField("servo_error4")
    private Integer servoError4;

    /**
     * 提升机实际速度反馈
     */
    @ApiModelProperty(value= "提升机实际速度反馈")
    @TableField("lift_actual_speed")
    private Integer liftActualSpeed;
    @ApiModelProperty(value= "楼层")
    @TableField("lev")
    private Integer lev;

    public BasLift() {}

    public BasLift(Integer liftNo,Integer status,Integer wrkNo,Date updateTime,Long updateBy,String memo,Integer pakMk,Integer liftLock,Integer positionArrivalFeedback,Integer ready,Integer running,Integer mode,Integer lineFrontHasStock,Integer forwardRotationFeedback,Integer reverseFeedback,Integer motorOverload,Integer lineEndHasStock,Integer inConveyLineCardTrayAlarm,Integer outConveyLineCardTrayAlarm,Integer platPositionDeviationAlarm,Integer platTorqueDeviationAlarm,Integer platShuttleCheck,Integer notReady,Integer servoError1,Integer servoError2,Integer servoError3,Integer servoError4,Integer liftActualSpeed) {
    public BasLift(Integer liftNo, Integer status, Integer wrkNo, Date updateTime, Long updateBy, String memo, Integer pakMk, String point, Boolean model, Boolean busy, Boolean frontOverrun, Boolean backOverrun, Boolean leftOverrun, Boolean rightOverrun, Boolean overHeight, Boolean overWeight, Boolean hasTray, Boolean hasCar, Boolean deviceError, Integer taskAddress, Integer distAddress, Integer completeTaskNo, Integer lev) {
        this.liftNo = liftNo;
        this.status = status;
        this.wrkNo = wrkNo;
@@ -224,27 +192,22 @@
        this.updateBy = updateBy;
        this.memo = memo;
        this.pakMk = pakMk;
        this.liftLock = liftLock;
        this.positionArrivalFeedback = positionArrivalFeedback;
        this.ready = ready;
        this.running = running;
        this.mode = mode;
        this.lineFrontHasStock = lineFrontHasStock;
        this.forwardRotationFeedback = forwardRotationFeedback;
        this.reverseFeedback = reverseFeedback;
        this.motorOverload = motorOverload;
        this.lineEndHasStock = lineEndHasStock;
        this.inConveyLineCardTrayAlarm = inConveyLineCardTrayAlarm;
        this.outConveyLineCardTrayAlarm = outConveyLineCardTrayAlarm;
        this.platPositionDeviationAlarm = platPositionDeviationAlarm;
        this.platTorqueDeviationAlarm = platTorqueDeviationAlarm;
        this.platShuttleCheck = platShuttleCheck;
        this.notReady = notReady;
        this.servoError1 = servoError1;
        this.servoError2 = servoError2;
        this.servoError3 = servoError3;
        this.servoError4 = servoError4;
        this.liftActualSpeed = liftActualSpeed;
        this.point = point;
        this.model = model;
        this.busy = busy;
        this.frontOverrun = frontOverrun;
        this.backOverrun = backOverrun;
        this.leftOverrun = leftOverrun;
        this.rightOverrun = rightOverrun;
        this.overHeight = overHeight;
        this.overWeight = overWeight;
        this.hasTray = hasTray;
        this.hasCar = hasCar;
        this.deviceError = deviceError;
        this.taskAddress = taskAddress;
        this.distAddress = distAddress;
        this.completeTaskNo = completeTaskNo;
        this.lev = lev;
    }

//    BasLift basLift = new BasLift(
@@ -299,41 +262,6 @@
            return "";
        }
        return this.pakMk == 1 ? "Y" : "N";
    }

    public String getLiftLock$() {
        if (Cools.isEmpty(this.liftLock)){
            return "";
        }
        return this.liftLock == 1 ? "Y" : "N";
    }

    public String getReady$() {
        if (Cools.isEmpty(this.ready)){
            return "";
        }
        return this.ready == 1 ? "Y" : "N";
    }

    public String getRunning$() {
        if (Cools.isEmpty(this.running)){
            return "";
        }
        return this.running == 1 ? "Y" : "N";
    }

    public String getMode$() {
        if (Cools.isEmpty(this.mode)){
            return "";
        }
        return this.mode == 1 ? "联机" : "单机";
    }

    public String getNotReady$() {
        if (Cools.isEmpty(this.notReady)){
            return "";
        }
        return this.notReady == 1 ? "Y" : "N";
    }

}

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

@@ -186,9 +186,16 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 系统状态
     */
    @ApiModelProperty(value= "系统状态")
    @TableField("system_status")
    private String systemStatus;

    public BasLiftErrLog() {}

    public BasLiftErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer liftNo,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
    public BasLiftErrLog(String uuid, Integer wrkNo, Date startTime, Date endTime, Long wrkSts, Integer ioType, Integer liftNo, Integer plcNo, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String barcode, Integer errCode, String error, Integer status, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, String systemStatus) {
        this.uuid = uuid;
        this.wrkNo = wrkNo;
        this.startTime = startTime;
@@ -210,6 +217,7 @@
        this.updateTime = updateTime;
        this.updateBy = updateBy;
        this.memo = memo;
        this.systemStatus = systemStatus;
    }

//    BasLiftErrLog basLiftErrLog = new BasLiftErrLog(

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

@@ -76,9 +76,16 @@
    @ApiModelProperty(value= "命令")
    private String command;

    /**
     * 系统状态
     */
    @ApiModelProperty(value= "系统状态")
    @TableField("system_status")
    private String systemStatus;

    public BasLiftOpt() {}

    public BasLiftOpt(Integer wrkNo,Integer liftNo,Date sendTime,Date updateTime,Long updateBy,String memo,String command) {
    public BasLiftOpt(Integer wrkNo, Integer liftNo, Date sendTime, Date updateTime, Long updateBy, String memo, String command, String systemStatus) {
        this.wrkNo = wrkNo;
        this.liftNo = liftNo;
        this.sendTime = sendTime;
@@ -86,6 +93,7 @@
        this.updateBy = updateBy;
        this.memo = memo;
        this.command = command;
        this.systemStatus = systemStatus;
    }

//    BasLiftOpt basLiftOpt = new BasLiftOpt(

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

@@ -121,134 +121,176 @@
    private Boolean pakMk;

    /**
     * 小车忙状态位
     */
    @ApiModelProperty(value= "小车忙状态位")
    @TableField("busy_status")
    private Integer busyStatus;

    /**
     * 当前二维码
     */
    @ApiModelProperty(value= "当前二维码")
    @TableField("current_code")
    private Integer currentCode;

    /**
     * 电池电量百分比
     */
    @ApiModelProperty(value= "电池电量百分比")
    @TableField("battery_power")
    private Integer batteryPower;

    /**
     * 电池温度
     */
    @ApiModelProperty(value= "电池温度")
    @TableField("battery_temp")
    private Integer batteryTemp;

    /**
     * 错误编号
     */
    @ApiModelProperty(value= "错误编号")
    @TableField("error_code")
    private Integer errorCode;

    /**
     * Plc输出状态IO
     */
    @ApiModelProperty(value= "Plc输出状态IO")
    @TableField("plc_output_status_io")
    private Integer plcOutputStatusIo;

    /**
     * 错误信息码
     */
    @ApiModelProperty(value= "错误信息码")
    @TableField("status_error_code")
    private Integer statusErrorCode;

    /**
     * PLC输入状态
     */
    @ApiModelProperty(value= "PLC输入状态")
    @TableField("plc_input_status")
    private Integer plcInputStatus;

    /**
     * 当前或者之前读到的二维码值
     */
    @ApiModelProperty(value= "当前或者之前读到的二维码值")
    @TableField("current_or_before_code")
    private Integer currentOrBeforeCode;

    /**
     * 读到的二维码X方向偏移量
     */
    @ApiModelProperty(value= "读到的二维码X方向偏移量")
    @TableField("code_offset_x")
    private Integer codeOffsetX;

    /**
     * 读到的二维码Y方向偏移量
     */
    @ApiModelProperty(value= "读到的二维码Y方向偏移量")
    @TableField("code_offset_y")
    private Integer codeOffsetY;

    /**
     * 当前的电压值
     */
    @ApiModelProperty(value= "当前的电压值")
    @TableField("current_voltage")
    private Integer currentVoltage;

    /**
     * 当前的模拟量值
     */
    @ApiModelProperty(value= "当前的模拟量值")
    @TableField("current_analog_value")
    private Integer currentAnalogValue;

    /**
     * 当前的升降伺服速度
     */
    @ApiModelProperty(value= "当前的升降伺服速度")
    @TableField("current_lift_servo_speed")
    private Integer currentLiftServoSpeed;

    /**
     * 当前的行走伺服速度
     */
    @ApiModelProperty(value= "当前的行走伺服速度")
    @TableField("current_move_servo_speed")
    private Integer currentMoveServoSpeed;

    /**
     * 当前的升降伺服负载率
     */
    @ApiModelProperty(value= "当前的升降伺服负载率")
    @TableField("current_lift_servo_load")
    private Integer currentLiftServoLoad;

    /**
     * 当前的行走伺服负载率
     */
    @ApiModelProperty(value= "当前的行走伺服负载率")
    @TableField("current_move_servo_load")
    private Integer currentMoveServoLoad;

    /**
     * 小车运行速度
     */
    @ApiModelProperty(value= "小车运行速度")
    @TableField("run_speed")
    private Integer runSpeed;

    /**
     * 牛眼-工作模式
     */
    @ApiModelProperty(value= "工作模式")
    @TableField("working_mode")
    private Integer workingMode;

    /**
     * 牛眼-运行状态
     */
    @ApiModelProperty(value= "运行状态")
    @TableField("free")
    private Integer free;

    /**
     * 牛眼-当前速度
     */
    @ApiModelProperty(value= "当前速度")
    @TableField("speed")
    private Integer speed;

    /**
     * 牛眼-负载状态
     */
    @ApiModelProperty(value= "负载状态")
    @TableField("load_state")
    private Integer loadState;

    /**
     * 牛眼-管制状态
     */
    @ApiModelProperty(value= "管制状态")
    @TableField("suspend_state")
    private Integer suspendState;

    /**
     * 牛眼-顶升位置
     */
    @ApiModelProperty(value= "顶升位置")
    @TableField("lift_position")
    private Integer liftPosition;

    /**
     * 牛眼-运行方向
     */
    @ApiModelProperty(value= "运行方向")
    @TableField("run_dir")
    private Integer runDir;

    /**
     * 牛眼-运行方向
     */
    @ApiModelProperty(value= "运行方向")
    @TableField("run_dir2")
    private Integer runDir2;

    /**
     * 牛眼-充电状态
     */
    @ApiModelProperty(value= "充电状态")
    @TableField("charg_state")
    private Integer chargState;

    /**
     * 牛眼-电池电量
     */
    @ApiModelProperty(value= "电池电量")
    @TableField("power_percent")
    private Integer powerPercent;

    /**
     * 牛眼-最高电芯电压
     */
    @ApiModelProperty(value= "最高电芯电压")
    @TableField("max_cell_voltage")
    private Integer maxCellVoltage;

    /**
     * 牛眼-最低电芯电压
     */
    @ApiModelProperty(value= "最低电芯电压")
    @TableField("min_cell_voltage")
    private Integer minCellVoltage;

    /**
     * 牛眼-电池电压
     */
    @ApiModelProperty(value= "电池电压")
    @TableField("voltage")
    private Integer voltage;

    /**
     * 牛眼-充放电循环次数
     */
    @ApiModelProperty(value= "充放电循环次数")
    @TableField("charge_cycle_times")
    private Integer chargeCycleTimes;

    /**
     * 牛眼-剩余电量
     */
    @ApiModelProperty(value= "剩余电量")
    @TableField("surplus_quantity")
    private Integer surplusQuantity;

    /**
     * 牛眼-总电量
     */
    @ApiModelProperty(value= "总电量")
    @TableField("count_quantity")
    private Integer countQuantity;

    /**
     * 牛眼-实际库位
     */
    @ApiModelProperty(value= "实际库位")
    @TableField("point")
    private String point;

    /**
     * 牛眼-实际坐标
     */
    @ApiModelProperty(value= "实际坐标")
    @TableField("coord")
    private String coord;

    /**
     * 牛眼-任务目的库位
     */
    @ApiModelProperty(value= "任务目的库位")
    @TableField("task")
    private String task;

    /**
     * 牛眼-任务状态
     */
    @ApiModelProperty(value= "任务状态")
    @TableField("task_state")
    private Integer taskState;

    /**
     * 牛眼-故障状态
     */
    @ApiModelProperty(value= "故障状态")
    @TableField("err_state")
    private Integer errState;

    /**
     * 牛眼-总里程数
     */
    @ApiModelProperty(value= "总里程数")
    @TableField("status_sum")
    private String statusSum;

    /**
     * 牛眼-非自动状态时间计时
     */
    @ApiModelProperty(value= "非自动状态时间计时")
    @TableField("err_time")
    private Integer errTime;

    public BasShuttle() {}

    public BasShuttle(Integer shuttleNo,Integer status,Integer shuttleStatus,Integer wrkNo,String idleLoc,Integer autoCharge,Integer chargeLine,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer liftNo,Boolean pakMk,Integer busyStatus,Integer currentCode,Integer batteryPower,Integer batteryTemp,Integer errorCode,Integer plcOutputStatusIo,Integer statusErrorCode,Integer plcInputStatus,Integer currentOrBeforeCode,Integer codeOffsetX,Integer codeOffsetY,Integer currentVoltage,Integer currentAnalogValue,Integer currentLiftServoSpeed,Integer currentMoveServoSpeed,Integer currentLiftServoLoad,Integer currentMoveServoLoad) {
    public BasShuttle(Integer shuttleNo, Integer status, Integer shuttleStatus, Integer wrkNo, String idleLoc, Integer autoCharge, Integer chargeLine, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer liftNo, Boolean pakMk, Integer runSpeed, Integer workingMode, Integer free, Integer speed, Integer loadState, Integer suspendState, Integer liftPosition, Integer runDir, Integer runDir2, Integer chargState, Integer powerPercent, Integer maxCellVoltage, Integer minCellVoltage, Integer voltage, Integer chargeCycleTimes, Integer surplusQuantity, Integer countQuantity, String point, String coord, String task, Integer taskState, Integer errState, String statusSum, Integer errTime) {
        this.shuttleNo = shuttleNo;
        this.status = status;
        this.shuttleStatus = shuttleStatus;
@@ -263,23 +305,30 @@
        this.memo = memo;
        this.liftNo = liftNo;
        this.pakMk = pakMk;
        this.busyStatus = busyStatus;
        this.currentCode = currentCode;
        this.batteryPower = batteryPower;
        this.batteryTemp = batteryTemp;
        this.errorCode = errorCode;
        this.plcOutputStatusIo = plcOutputStatusIo;
        this.statusErrorCode = statusErrorCode;
        this.plcInputStatus = plcInputStatus;
        this.currentOrBeforeCode = currentOrBeforeCode;
        this.codeOffsetX = codeOffsetX;
        this.codeOffsetY = codeOffsetY;
        this.currentVoltage = currentVoltage;
        this.currentAnalogValue = currentAnalogValue;
        this.currentLiftServoSpeed = currentLiftServoSpeed;
        this.currentMoveServoSpeed = currentMoveServoSpeed;
        this.currentLiftServoLoad = currentLiftServoLoad;
        this.currentMoveServoLoad = currentMoveServoLoad;
        this.runSpeed = runSpeed;
        this.workingMode = workingMode;
        this.free = free;
        this.speed = speed;
        this.loadState = loadState;
        this.suspendState = suspendState;
        this.liftPosition = liftPosition;
        this.runDir = runDir;
        this.runDir2 = runDir2;
        this.chargState = chargState;
        this.powerPercent = powerPercent;
        this.maxCellVoltage = maxCellVoltage;
        this.minCellVoltage = minCellVoltage;
        this.voltage = voltage;
        this.chargeCycleTimes = chargeCycleTimes;
        this.surplusQuantity = surplusQuantity;
        this.countQuantity = countQuantity;
        this.point = point;
        this.coord = coord;
        this.task = task;
        this.taskState = taskState;
        this.errState = errState;
        this.statusSum = statusSum;
        this.errTime = errTime;
    }

//    BasShuttle basShuttle = new BasShuttle(
@@ -358,34 +407,6 @@
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }

    public String getBusyStatus$() {
        if (Cools.isEmpty(this.busyStatus)){
            return "";
        }
        switch (this.busyStatus){
            case 1:
                return "忙碌";
            case 0:
                return "空闲";
            default:
                return String.valueOf(this.status);
        }
    }

    public String getBatteryPower$() {
        if (Cools.isEmpty(this.batteryPower)){
            return "";
        }
        return (this.batteryPower * 0.1) + "%";
    }

    public String getBatteryTemp$() {
        if (Cools.isEmpty(this.batteryTemp)){
            return "";
        }
        return (this.batteryTemp * 0.1) + "%";
    }

    public int getPakMk() {

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

@@ -186,9 +186,16 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 系统状态
     */
    @ApiModelProperty(value= "系统状态")
    @TableField("system_status")
    private String systemStatus;

    public BasShuttleErrLog() {}

    public BasShuttleErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer shuttleNo,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
    public BasShuttleErrLog(String uuid, Integer wrkNo, Date startTime, Date endTime, Long wrkSts, Integer ioType, Integer shuttleNo, Integer plcNo, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String barcode, Integer errCode, String error, Integer status, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, String systemStatus) {
        this.uuid = uuid;
        this.wrkNo = wrkNo;
        this.startTime = startTime;
@@ -210,6 +217,7 @@
        this.updateTime = updateTime;
        this.updateBy = updateBy;
        this.memo = memo;
        this.systemStatus = systemStatus;
    }

//    BasShuttleErrLog basShuttleErrLog = new BasShuttleErrLog(
@@ -217,6 +225,7 @@
//            null,    // 工作号
//            null,    // 发生时间
//            null,    // 结束时间

//            null,    // 工作状态
//            null,    // 入出库类型
//            null,    // 穿梭车

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

@@ -99,9 +99,16 @@
    @ApiModelProperty(value= "命令")
    private String command;

    /**
     * 系统状态
     */
    @ApiModelProperty(value= "系统状态")
    @TableField("system_status")
    private String systemStatus;

    public BasShuttleOpt() {}

    public BasShuttleOpt(Integer wrkNo,Integer shuttleNo, Date sendTime,String mode,String sourceLocNo,String distLocNo, Date updateTime, Long updateBy, String memo,String command) {
    public BasShuttleOpt(Integer wrkNo, Integer shuttleNo, Date sendTime, String mode, String sourceLocNo, String distLocNo, Date updateTime, Long updateBy, String memo, String command, String systemStatus) {
        this.wrkNo = wrkNo;
        this.shuttleNo = shuttleNo;
        this.sendTime = sendTime;
@@ -112,6 +119,7 @@
        this.updateBy = updateBy;
        this.memo = memo;
        this.command = command;
        this.systemStatus = systemStatus;
    }

//    BasShuttleErrLog basShuttleErrLog = new BasShuttleErrLog(

 src/main/resources/mapper/BasLiftErrLogMapper.xml

@@ -26,6 +26,7 @@
        <result column="update_time" property="updateTime" />
        <result column="update_by" property="updateBy" />
        <result column="memo" property="memo" />
        <result column="system_status" property="systemStatus" />

    </resultMap>


 src/main/resources/mapper/BasLiftMapper.xml

@@ -11,27 +11,23 @@
        <result column="update_by" property="updateBy" />
        <result column="memo" property="memo" />
        <result column="pak_mk" property="pakMk" />
        <result column="lift_lock" property="liftLock" />
        <result column="position_arrival_feedback" property="positionArrivalFeedback" />
        <result column="ready" property="ready" />
        <result column="running" property="running" />
        <result column="mode" property="mode" />
        <result column="line_front_has_stock" property="lineFrontHasStock" />
        <result column="forward_rotation_feedback" property="forwardRotationFeedback" />
        <result column="reverse_feedback" property="reverseFeedback" />
        <result column="motor_overload" property="motorOverload" />
        <result column="line_end_has_stock" property="lineEndHasStock" />
        <result column="in_convey_line_card_tray_alarm" property="inConveyLineCardTrayAlarm" />
        <result column="out_convey_line_card_tray_alarm" property="outConveyLineCardTrayAlarm" />
        <result column="plat_position_deviation_alarm" property="platPositionDeviationAlarm" />
        <result column="plat_torque_deviation_alarm" property="platTorqueDeviationAlarm" />
        <result column="plat_shuttle_check" property="platShuttleCheck" />
        <result column="not_ready" property="notReady" />
        <result column="servo_error1" property="servoError1" />
        <result column="servo_error2" property="servoError2" />
        <result column="servo_error3" property="servoError3" />
        <result column="servo_error4" property="servoError4" />
        <result column="lift_actual_speed" property="liftActualSpeed" />

        <result column="point" property="point" />
        <result column="model" property="model" />
        <result column="busy" property="busy" />
        <result column="front_overrun" property="frontOverrun" />
        <result column="back_overrun" property="backOverrun" />
        <result column="left_overrun" property="leftOverrun" />
        <result column="right_overrun" property="rightOverrun" />
        <result column="over_height" property="overHeight" />
        <result column="over_weight" property="overWeight" />
        <result column="has_tray" property="hasTray" />
        <result column="has_car" property="hasCar" />
        <result column="device_error" property="deviceError" />
        <result column="task_address" property="taskAddress" />
        <result column="dist_address" property="distAddress" />
        <result column="complete_task_no" property="completeTaskNo" />
        <result column="lev" property="lev" />

    </resultMap>


 src/main/resources/mapper/BasLiftOptMapper.xml

@@ -12,6 +12,7 @@
        <result column="update_by" property="updateBy" />
        <result column="memo" property="memo" />
        <result column="command" property="command" />
        <result column="system_status" property="systemStatus" />

    </resultMap>


 src/main/resources/mapper/BasShuttleErrLogMapper.xml

@@ -11,7 +11,6 @@
        <result column="end_time" property="endTime" />
        <result column="wrk_sts" property="wrkSts" />
        <result column="io_type" property="ioType" />
        <result column="ste_no" property="steNo" />
        <result column="plc_no" property="plcNo" />
        <result column="loc_no" property="locNo" />
        <result column="sta_no" property="staNo" />
@@ -26,6 +25,7 @@
        <result column="update_time" property="updateTime" />
        <result column="update_by" property="updateBy" />
        <result column="memo" property="memo" />
        <result column="system_status" property="systemStatus" />

    </resultMap>


 src/main/resources/mapper/BasShuttleMapper.xml

@@ -18,23 +18,30 @@
        <result column="memo" property="memo" />
        <result column="lift_no" property="liftNo" />
        <result column="pak_mk" property="pakMk" />
        <result column="busy_status" property="busyStatus" />
        <result column="current_code" property="currentCode" />
        <result column="battery_power" property="batteryPower" />
        <result column="battery_temp" property="batteryTemp" />
        <result column="error_code" property="errorCode" />
        <result column="plc_output_status_io" property="plcOutputStatusIo" />
        <result column="status_error_code" property="statusErrorCode" />
        <result column="plc_input_status" property="plcInputStatus" />
        <result column="current_or_before_code" property="currentOrBeforeCode" />
        <result column="code_offset_x" property="codeOffsetX" />
        <result column="code_offset_y" property="codeOffsetY" />
        <result column="current_voltage" property="currentVoltage" />
        <result column="current_analog_value" property="currentAnalogValue" />
        <result column="current_lift_servo_speed" property="currentLiftServoSpeed" />
        <result column="current_move_servo_speed" property="currentMoveServoSpeed" />
        <result column="current_lift_servo_load" property="currentLiftServoLoad" />
        <result column="current_move_servo_load" property="currentMoveServoLoad" />

        <result column="working_mode" property="workingMode" />
        <result column="free" property="free" />
        <result column="speed" property="speed" />
        <result column="load_state" property="loadState" />
        <result column="suspend_state" property="suspendState" />
        <result column="lift_position" property="liftPosition" />
        <result column="run_dir" property="runDir" />
        <result column="run_dir2" property="runDir2" />
        <result column="charg_state" property="chargState" />
        <result column="power_percent" property="powerPercent" />
        <result column="max_cell_voltage" property="maxCellVoltage" />
        <result column="min_cell_voltage" property="minCellVoltage" />
        <result column="voltage" property="voltage" />
        <result column="charge_cycle_times" property="chargeCycleTimes" />
        <result column="surplus_quantity" property="surplusQuantity" />
        <result column="count_quantity" property="countQuantity" />
        <result column="point" property="point" />
        <result column="coord" property="coord" />
        <result column="task" property="task" />
        <result column="task_state" property="taskState" />
        <result column="err_state" property="errState" />
        <result column="status_sum" property="statusSum" />
        <result column="err_time" property="errTime" />

    </resultMap>


 src/main/resources/mapper/BasShuttleOptMapper.xml

@@ -15,6 +15,7 @@
        <result column="update_by" property="updateBy" />
        <result column="memo" property="memo" />
        <result column="command" property="command" />
        <result column="system_status" property="systemStatus" />

    </resultMap>


 src/main/webapp/static/js/basLiftErrLog/basLiftErrLog.js

@@ -39,6 +39,7 @@
            ,{field: 'errCode', align: 'center',title: '异常码'}
            ,{field: 'error', align: 'center',title: '异常'}
            ,{field: 'status$', align: 'center',title: '异常情况'}
            ,{field: 'systemStatus', align: 'center',title: '系统状态'}
            ,{field: 'createTime$', align: 'center',title: '添加时间'}
            ,{field: 'createBy$', align: 'center',title: '添加人员'}
            ,{field: 'updateTime$', align: 'center',title: '修改时间'}

 src/main/webapp/static/js/basLiftOpt/basLiftOpt.js

@@ -30,6 +30,7 @@
            ,{field: 'updateBy$', align: 'center',title: '修改人员'}
            ,{field: 'memo', align: 'center',title: '备注'}
            ,{field: 'command', align: 'center',title: '命令'}
            ,{field: 'systemStatus', align: 'center',title: '系统状态'}

            // ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],

 src/main/webapp/static/js/basShuttleErrLog/basShuttleErrLog.js

@@ -39,6 +39,7 @@
            ,{field: 'errCode', align: 'center',title: '异常码'}
            ,{field: 'error', align: 'center',title: '异常'}
            ,{field: 'status$', align: 'center',title: '异常情况'}
            ,{field: 'systemStatus', align: 'center',title: '系统状态'}
            ,{field: 'createTime$', align: 'center',title: '添加时间'}
            ,{field: 'createBy$', align: 'center',title: '添加人员'}
            ,{field: 'updateTime$', align: 'center',title: '修改时间'}

 src/main/webapp/static/js/basShuttleErrLog/basShuttleOpt.js

@@ -27,6 +27,7 @@
            ,{field: 'sourceLocNo', align: 'center',title: '起点库位'}
            ,{field: 'distLocNo', align: 'center',title: '目标库位'}
            ,{field: 'command', align: 'center',title: '命令'}
            ,{field: 'systemStatus', align: 'center',title: '系统状态'}
            ,{field: 'sendTime$', align: 'center',title: '下发时间'}
            ,{field: 'updateTime$', align: 'center',title: '修改时间'}
            ,{field: 'updateBy$', align: 'center',title: '修改人员'}

 src/main/webapp/views/home/map.html

@@ -17,14 +17,14 @@
        .pointContainer {
            display: flex;
            justify-content: center;
            margin-top: 1px;
            /*margin-top: 1px;*/
        }

        .pointBox {
            background: #bababa;
            width: 40px;
            height: 40px;
            margin-right: 1px;
            /*margin-right: 1px;*/
            display: flex;
            justify-content: center;
            align-items: center;
@@ -434,7 +434,7 @@
            <div style="margin-top: 20px;"><button class="layui-btn" @click="currentLev = 10" :style="{background: currentLev==10?'red':''}">10F</button></div>
        </div>
    </div>
    <div style="padding: 40px 20px 10px 10px;" :style="window.innerWidth < 2000 ? 'margin-top: 0px;' : 'flex: 5;margin-top: -70px;'">
    <div style="padding: 40px 20px 10px 10px;" :style="window.innerWidth < 2100 ? 'margin-top: 0px;' : 'flex: 5;margin-top: -70px;'">
        <el-slider v-model="showScale" :marks="showScaleMarks"></el-slider>
        <div style="display: flex;justify-content: space-between;flex-wrap: wrap;">
            <div class="hoverCard" style="width: 100%;">
@@ -650,7 +650,7 @@
        created(){
            this.init()

            this.getOutSite()
            // this.getOutSite()
        },
        watch: {
            map: {