*

L

5 天以前 083659a2e1a8eb245b086d7046ee7d8e61f07a8f

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

@@ -18,6 +18,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

@Data
@TableName("asr_loc_detl")
@@ -37,34 +38,34 @@
    @ExcelProperty("数量")
    private Double anfme;

    @ApiModelProperty(value= "商品编号")
    @ExcelProperty("商品编号")
    @ApiModelProperty(value= "规格")
    @ExcelProperty("规格")
    private String matnr;

    @ApiModelProperty(value= "商品名称")
    @ExcelProperty("商品名称")
    private String maktx;

    @ApiModelProperty(value= "规格")
    @ExcelProperty("规格")
    @ApiModelProperty(value= "接头")
    private String specs;

    @ApiModelProperty(value= "货品特征")
    @ExcelProperty("货品特征")
    @ApiModelProperty(value= "箱号")
//    @ExcelProperty("箱号")
    private String batch;

    @ApiModelProperty(value= "单据编号")
    @ExcelProperty("单据编号")
//    @ExcelProperty("单据编号")
    @TableField("order_no")
    private String orderNo;

    @ApiModelProperty(value= "型号")
    @ApiModelProperty(value= "卷号")
    private String model;

    @ApiModelProperty(value= "颜色")
    private String color;

    @ApiModelProperty(value= "品牌")
    @ApiModelProperty(value= "木箱类型")
    @ExcelProperty("木箱类型")
    private String brand;

    @ApiModelProperty(value= "单位")
@@ -218,9 +219,11 @@
        if (null == this.danger){ return null; }
        switch (this.danger){
            case 1:
                return "是";
                return "合格";
            case 2:
                return "不合格";
            case 0:
                return "否";
                return "待判";
            default:
                return String.valueOf(this.danger);
        }
@@ -237,8 +240,8 @@

    public String getBrand$(){
        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
        BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
        if (!Cools.isEmpty(basBoxType)){
        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
        for (BasBoxType basBoxType:basBoxTypes){
            return String.valueOf(basBoxType.getBoxSpecs());
        }
        return this.brand;