zhou zhou
2 天以前 691bee4229856f8bf81c2720092ecee1c9f21509
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
@@ -20,6 +20,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
@@ -150,6 +152,9 @@
    @ApiModelProperty(value = "添加人员")
    private Long createBy;
    @TableField(exist = false)
    private String createBy$;
    /**
     * 添加时间
     */
@@ -164,6 +169,9 @@
    @ApiModelProperty(value = "修改人员")
    private Long updateBy;
    @TableField(exist = false)
    private String updateBy$;
    /**
     * 修改时间
     */
@@ -171,6 +179,9 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
    @Version
    private Integer version;
    /**
     * 备注
@@ -317,6 +328,16 @@
     */
    @ApiModelProperty(value = "销售员名称")
    private String saleUserName;
    @TableField(exist = false)
    private String exceStatus$;
    @TableField(exist = false)
    private String wkType$;
    @TableField(exist = false)
    private String checkType$;
    public WkOrder() {
    }
@@ -345,128 +366,43 @@
    }
    public WkOrder(SyncOrderParams syncOrderParams) {
        this.code = code;
        this.poCode = poCode;
        this.poId = poId;
        this.type = type;
        this.wkType = wkType;
        this.checkType = checkType;
        this.anfme = anfme;
        this.workQty = workQty;
        this.qty = qty;
        this.logisNo = logisNo;
        this.waveId = waveId;
        this.arrTime = arrTime;
        this.ntyStatus = ntyStatus;
        this.reportOnce = reportOnce;
        this.rleStatus = rleStatus;
        this.exceStatus = exceStatus;
        this.status = status;
        this.deleted = deleted;
        this.tenantId = tenantId;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
        this.warehouseId = warehouseId;
        this.wareAreaId = wareAreaId;
        this.businessTime = businessTime;
        this.stationId = stationId;
        this.shipperId = shipperId;
        this.orderInternalCode = orderInternalCode;
        this.stockDirect = stockDirect;
        this.customerId = customerId;
        this.customerName = customerName;
        this.supplierId = supplierId;
        this.supplierName = supplierName;
        this.stockOrgId = stockOrgId;
        this.stockOrgName = stockOrgName;
        this.purchaseOrgId = purchaseOrgId;
        this.purchaseOrgName = purchaseOrgName;
        this.purchaseUserId = purchaseUserId;
        this.purchaseUserName = purchaseUserName;
        this.prdOrgId = prdOrgId;
        this.prdOrgName = prdOrgName;
        this.saleOrgId = saleOrgId;
        this.saleOrgName = saleOrgName;
        this.saleUserId = saleUserId;
        this.saleUserName = saleUserName;
//        this.reportOnce = syncOrderParams.getre();
//        this.businessTime = syncOrderParams.getBusinessTime().toString();
        this.stationId = syncOrderParams.getStationId();
        this.orderInternalCode = syncOrderParams.getOrderInternalCode().toString();
        this.stockDirect = syncOrderParams.getStockDirect();
        this.customerId = syncOrderParams.getCustomerId();
        this.customerName = syncOrderParams.getCustomerName();
        this.supplierId = syncOrderParams.getSupplierId();
        this.supplierName = syncOrderParams.getSupplierName();
        this.stockOrgId = syncOrderParams.getStockOrgId();
        this.stockOrgName = syncOrderParams.getStockOrgName();
        this.purchaseOrgId = syncOrderParams.getPurchaseOrgId();
        this.purchaseOrgName = syncOrderParams.getPurchaseOrgName();
        this.purchaseUserId = syncOrderParams.getPurchaseUserId();
        this.purchaseUserName = syncOrderParams.getPurchaseUserName();
        this.prdOrgId = syncOrderParams.getPrdOrgId();
        this.prdOrgName = syncOrderParams.getPrdOrgName();
        this.saleOrgId = syncOrderParams.getSaleOrgId();
        this.saleOrgName = syncOrderParams.getSaleOrgName();
        this.saleUserId = syncOrderParams.getSaleUserId();
        this.saleUserName = syncOrderParams.getSaleUserName();
    }
    public String getExceStatus$() {
        if (Cools.isEmpty(this.exceStatus)) {
            return "";
        }
        String exceType = DictTypeCode.DICT_ASN_EXCE_STATUS;
        if (this.type.equals(OrderType.ORDER_CHECK.type)) {
            exceType = DictTypeCode.SYS_CHECK_EXCE_STATUS;
        }
        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
                .eq(DictData::getDictTypeCode, exceType)
                .eq(DictData::getValue, this.exceStatus));
        if (Objects.isNull(dictData)) {
            return null;
        }
        return dictData.getLabel();
        return this.exceStatus$;
    }
    public String getType$() {
        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$() {
        // 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();
        // }
        return this.wkType$;
    }
    public String getCheckType$() {
        if (Cools.isEmpty(this.checkType)) {
            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));
        if (Objects.isNull(dictData)) {
            return null;
        }
        return dictData.getLabel();
        return this.checkType$;
    }
    public String getArrTime$() {
@@ -504,29 +440,11 @@
        }
    }
    public String getCreateBy$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.createBy);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }
    public String getCreateTime$() {
        if (Cools.isEmpty(this.createTime)) {
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }
    public String getUpdateBy$() {
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.updateBy);
        if (!Cools.isEmpty(user)) {
            return String.valueOf(user.getNickname());
        }
        return null;
    }
    public String getUpdateTime$() {