#

Junjie

2024-06-12 7180e7e7c548c78f327a9f66c2bc89af64039e7e

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/LiftProtocol.java

@@ -1,11 +1,14 @@
package com.zy.asrs.wcs.rcs.model.protocol;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wcs.core.utils.RedisUtil;
import com.zy.asrs.wcs.rcs.constant.DeviceRedisConstant;
import com.zy.asrs.wcs.rcs.entity.BasLiftErr;
import com.zy.asrs.wcs.rcs.entity.Device;
import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
import com.zy.asrs.wcs.rcs.service.BasLiftErrService;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

@@ -203,6 +206,21 @@
        return this.taskNo == null ? 0 : this.taskNo;
    }

    public String getErrorCode$() {
        if (this.errorCode == null) {
            return "";
        }
        BasLiftErrService basLiftErrService = SpringUtils.getBean(BasLiftErrService.class);
        BasLiftErr liftErr = basLiftErrService.getOne(new LambdaQueryWrapper<BasLiftErr>()
                .eq(BasLiftErr::getErrorCode, this.errorCode)
                .eq(BasLiftErr::getHostId, this.device.getHostId())
                .eq(BasLiftErr::getDevicePlc, this.device.getDevicePlc()));
        if (liftErr != null) {
            return this.errorCode + "-" + liftErr.getErrName();
        }
        return errorCode;
    }

    @Override
    public LiftProtocol clone() {
        try {