Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java =================================================================== diff -u -r20841 -r20977 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java (.../ExpensiveGoodsInstance.java) (revision 20841) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java (.../ExpensiveGoodsInstance.java) (revision 20977) @@ -110,7 +110,9 @@ * 第三个自带条码 */ private String thirdBodyCode; - + + private Date expDate;// 失效期; + /** * 入库类型(区分是自购入库还是预入库) */ @@ -329,6 +331,22 @@ this.thirdBodyCode = thirdBodyCode; } + @Transient // 用于页面显示 + public String getExpDateStr() { + if(expDate == null){ + return ""; + } + return Constants.FASTDATEFORMAT_YYYYMMDD.format(expDate); + } + + public Date getExpDate() { + return expDate; + } + + public void setExpDate(Date expDate) { + this.expDate = expDate; + } + @Transient public boolean isAssociatedInfoValidForInvoice() { if (!DatabaseUtil.isPoIdValid(invoiceId)) {