# 明细历史优化+打印

cl

昨天 c664c49f8e211b7b791a5ff1e63cda53c1b1264e

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

@@ -34,10 +34,16 @@
    private Date ioTime;

    /**
     * 数量
     * 作业数量
     */
    @ApiModelProperty(value= "数量")
    @ApiModelProperty(value= "作业数量")
    private Double anfme;

    /**
     * 总库存
     */
    @ApiModelProperty(value= "总库存")
    private Double stock;

    /**
     * 托盘条码
@@ -268,6 +274,79 @@
    @ApiModelProperty(value= "备注")
    private String memo;


    @ApiModelProperty(value= "生产日期")
    @TableField("proddate")
    private Date proddate;
    @ApiModelProperty(value= "到期日期")
    @TableField("deadline")
    private Date deadline;

    public WrkDetlLog() {

    }
    /** 从现档明细拷贝到历史档 */
    public WrkDetlLog(WrkDetl wrkDetl) {
        if (wrkDetl == null) {
            return;
        }
        this.wrkNo = wrkDetl.getWrkNo();
        this.ioTime = wrkDetl.getIoTime();
        this.anfme = wrkDetl.getAnfme();
        this.stock = wrkDetl.getStock();
        this.zpallet = wrkDetl.getZpallet();
        this.matnr = wrkDetl.getMatnr();
        this.maktx = wrkDetl.getMaktx();
        this.batch = wrkDetl.getBatch();
        this.orderNo = wrkDetl.getOrderNo();
        this.specs = wrkDetl.getSpecs();
        this.model = wrkDetl.getModel();
        this.color = wrkDetl.getColor();
        this.brand = wrkDetl.getBrand();
        this.unit = wrkDetl.getUnit();
        this.price = wrkDetl.getPrice();
        this.sku = wrkDetl.getSku();
        this.units = wrkDetl.getUnits();
        this.barcode = wrkDetl.getBarcode();
        this.origin = wrkDetl.getOrigin();
        this.manu = wrkDetl.getManu();
        this.manuDate = wrkDetl.getManuDate();
        this.itemNum = wrkDetl.getItemNum();
        this.safeQty = wrkDetl.getSafeQty();
        this.weight = wrkDetl.getWeight();
        this.length = wrkDetl.getLength();
        this.volume = wrkDetl.getVolume();
        this.threeCode = wrkDetl.getThreeCode();
        this.supp = wrkDetl.getSupp();
        this.suppCode = wrkDetl.getSuppCode();
        this.beBatch = wrkDetl.getBeBatch();
        this.deadTime = wrkDetl.getDeadTime();
        this.deadWarn = wrkDetl.getDeadWarn();
        this.source = wrkDetl.getSource();
        this.inspect = wrkDetl.getInspect();
        this.danger = wrkDetl.getDanger();
        this.modiUser = wrkDetl.getModiUser();
        this.modiTime = wrkDetl.getModiTime();
        this.appeUser = wrkDetl.getAppeUser();
        this.appeTime = wrkDetl.getAppeTime();
        this.memo = wrkDetl.getMemo();
        this.proddate = wrkDetl.getProddate();
        this.deadline = wrkDetl.getDeadline();
    }

    public String getProddate$(){
        if (Cools.isEmpty(this.proddate)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd").format(this.proddate);
    }
    public String getDeadline$(){
        if (Cools.isEmpty(this.deadline)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd").format(this.deadline);
    }

    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";
@@ -356,6 +435,5 @@
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }


}