#

lsh

2024-04-14 b141c90208b6a82504680d35eacdaecff1cb7e40

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

@@ -4,8 +4,10 @@
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasBoxTypeService;
import com.zy.asrs.service.LocMastService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -35,34 +37,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= "单位")
@@ -233,6 +235,15 @@
        return null;
    }

    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)){
            return String.valueOf(basBoxType.getBoxSpecs());
        }
        return this.brand;
    }

    public String getModiTime$(){
        if (Cools.isEmpty(this.modiTime)){
            return "";