1.erp对接新增字段 2.电视机数据

zwl

19 小时以前 3b0cab2402876426acbc0814394ff940fd2ce83d

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

@@ -1,8 +1,13 @@
package com.zy.asrs.entity;

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.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -32,12 +37,44 @@
    @ApiModelProperty(value= "商品名称")
    private String maktx;

    @ApiModelProperty(value= "序列码")
    @ApiModelProperty(value= "批号")
    private String batch;

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

    /**
     * 集装箱号
     */
    @ApiModelProperty(value= "集装箱号")
    @ExcelProperty("集装箱号")
    @TableField("container_no")
    private String containerNo;

    /**
     * TEU
     */
    @ApiModelProperty(value= "TEU")
    @ExcelProperty("TEU")
    @TableField("teu")
    private Integer teu;

    /**
     * 车牌号
     */
    @ApiModelProperty(value= "车牌号")
    @ExcelProperty("车牌号")
    @TableField("plate_no")
    private String plateNo;

    /**
     * 车次号
     */
    @ApiModelProperty(value= "车次号")
    @ExcelProperty("车次号")
    @TableField("train_no")
    private String trainNo;

    @ApiModelProperty(value= "规格")
    private String specs;
@@ -69,6 +106,18 @@
    @ApiModelProperty(value= "产地")
    private String origin;

    @ApiModelProperty(value= "货物频次：1=高频，2=低频")
    @TableField("freq_type")
    private Integer freqType;

    /**
     * 立方数
     */
    @ApiModelProperty(value= "立方数，单位：立方米")
    @ExcelProperty("立方数")
    @TableField("cube_number")
    private Double cubeNumber;

    @ApiModelProperty(value= "厂家")
    private String manu;

@@ -88,7 +137,7 @@
    private Double weight;

    @ApiModelProperty(value= "长度")
    private Double length;
    private Double man_length;

    @ApiModelProperty(value= "体积")
    private Double volume;
@@ -150,6 +199,45 @@

    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 备用1
     */
    @ApiModelProperty(value= "备用1")
    private String standby1 = "1";

    /**
     * 备用2
     */
    @ApiModelProperty(value= "备用2")
    private String standby2 = "1";

    /**
     * 备用3
     */
    @ApiModelProperty(value= "备用3")
    private String standby3 = "1";

    /**
     * 备用1
     */
    @ApiModelProperty(value= "备用1")
    @TableField("box_type1")
    private String boxType1 = "1";

    /**
     * 备用2
     */
    @ApiModelProperty(value= "备用2")
    @TableField("box_type2")
    private String boxType2 = "1";

    /**
     * 备用3
     */
    @ApiModelProperty(value= "备用3")
    @TableField("box_type3")
    private String boxType3 = "1";

    public String getBeBatch$(){
        if (null == this.beBatch){ return null; }
@@ -215,4 +303,22 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

    public String getBoxType1$(){
        BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
        BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(processProcedures)){
            return String.valueOf(processProcedures.getBoxSpecs());
        }
        return this.boxType1;
    }

    public String getBoxType2$(){
        BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
        BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
        if (!Cools.isEmpty(basQualityTesting)){
            return String.valueOf(basQualityTesting.getBoxSpecs());
        }
        return this.boxType1;
    }

}