Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

16 小时以前 5c90daa2c919f3f07df0a154ff91f0e015bf8d66

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

@@ -71,6 +71,9 @@
    @ApiModelProperty(value= "业务类型")
    private String wkType;

    @ApiModelProperty("盘点类型")
    private Integer checkType;

    /**
     * 送货数量
     */
@@ -228,11 +231,15 @@
    }

    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, DictTypeCode.DICT_SYS_BUSINESS_TYPE).eq(DictData::getValue, this.wkType));
        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, typeCode).eq(DictData::getValue, this.wkType));
        if (Objects.isNull(dictData)) {
            return null;
        }
@@ -240,11 +247,11 @@
    }

    public String getCheckType$(){
        if (Cools.isEmpty(this.wkType)){
        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_ORDER_TYPE).eq(DictData::getValue, this.wkType));
        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;
        }