调拔功能优化

skyouc

8 天以前 d5f16640dc1bf0239beafab721480a64425d9c1e

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.DictDataService;
@@ -25,6 +26,7 @@
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;

import java.io.Serializable;

@Data
@@ -174,7 +176,8 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    public WkOrder() {}
    public WkOrder() {
    }

    public WkOrder(String code, String poCode, Long poId, String type, String wkType, Double anfme, Double qty, String logisNo, Date arrTime, Short rleStatus, Integer status, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
        this.code = code;
@@ -217,33 +220,46 @@


    public String getType$(){
        if (Cools.isEmpty(this.type)){
            return "";
        }
        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE)
                .eq(DictData::getValue, this.type));
        if (Objects.isNull(dictData)) {
            return null;
        }
        return dictData.getLabel();
        return OrderType.getValType(this.type);

//        if (this.type.equals(OrderType.ORDER_TRANSFER.type)) {
//            return OrderType.getValType(this.type);
//        } else {
//            if (Cools.isEmpty(this.type)) {
//                return "";
//            }
//            DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
//            DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
//                    .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE)
//                    .eq(DictData::getValue, this.type));
//            if (Objects.isNull(dictData)) {
//                return null;
//            }
//            return dictData.getLabel();
//        }
    }

    public String getWkType$(){
        String typeCode = DictTypeCode.DICT_SYS_BUSINESS_TYPE;
        if (type.equals(OrderType.ORDER_CHECK.type)) {
            typeCode = DictTypeCode.SYS_CHECK_ORDER_TYPE;
        }
        if (Cools.isEmpty(this.wkType)){
            return "";
        }
        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, typeCode).eq(DictData::getValue, this.wkType));
        if (Objects.isNull(dictData)) {
            return null;
        }
        return dictData.getLabel();
//        if (this.type.equals(OrderType.ORDER_TRANSFER.type)) {
            return OrderWorkType.getWorkDesc(this.wkType);
//        } else {
//            String typeCode = DictTypeCode.DICT_SYS_BUSINESS_TYPE;
//            if (type.equals(OrderType.ORDER_CHECK.type)) {
//                typeCode = DictTypeCode.SYS_CHECK_ORDER_TYPE;
//            }
//            if (Cools.isEmpty(this.wkType)) {
//                return "";
//            }
//            DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
//            DictData dictData = dictDataService
//                    .getOne(new LambdaQueryWrapper<DictData>()
//                    .eq(DictData::getDictTypeCode, typeCode)
//                            .eq(DictData::getValue, this.wkType));
//            if (Objects.isNull(dictData)) {
//                return null;
//            }
//            return dictData.getLabel();
//        }
    }

    public String getCheckType$(){
@@ -251,7 +267,9 @@
            return "";
        }
        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.SYS_CHECK_TYPE).eq(DictData::getValue, this.checkType));
        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
                .eq(DictData::getDictTypeCode, DictTypeCode.SYS_CHECK_TYPE)
                .eq(DictData::getValue, this.checkType));
        if (Objects.isNull(dictData)) {
            return null;
        }
@@ -267,7 +285,9 @@
    }

    public String getRleStatus$(){
        if (null == this.rleStatus){ return null; }
        if (null == this.rleStatus) {
            return null;
        }
        switch (this.rleStatus){
            case 0:
                return " 正常";
@@ -279,7 +299,9 @@
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        if (null == this.status) {
            return null;
        }
        switch (this.status){
            case 1:
                return "正常";
@@ -323,9 +345,10 @@
    }



    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        if (null == this.status) {
            return null;
        }
        switch (this.status){
            case 1:
                return true;
@@ -335,8 +358,11 @@
                return null;
        }
    }

    public String getNtyStatus$(){
        if (null == this.ntyStatus){ return "error"; }
        if (null == this.ntyStatus) {
            return "error";
        }
        switch (this.ntyStatus){
            case 0:
                return "未上报";