Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java =================================================================== diff -u -r15820 -r15901 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 15820) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 15901) @@ -82,7 +82,7 @@ private String unit; //单位 private String middlePackageUnit; //中包装单位 - + private Integer transferScale; //中包装单位装换单位系数 private Integer minApplyAmount; //最小申请数量 @@ -353,11 +353,21 @@ @Transient public String getShowName() { + if (StringUtils.isNotBlank(this.packageSpec)) { + return this.name + "[" + this.packageSpec + "]"; + } if (StringUtils.isNotBlank(this.specification)) { return this.name + "[" + this.specification + "]"; } return this.name; } + @Transient + public String getShowNameForSmallestUnit() { + if (StringUtils.isNotBlank(this.specification)) { + return this.name + "[" + this.specification + "]"; + } + return this.name; + } public void setShowName() { @@ -468,6 +478,7 @@ this.middlePackageUnit = middlePackageUnit; } + public Integer getTransferScale() { return transferScale; } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsStock.java =================================================================== diff -u -r13435 -r15901 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsStock.java (.../DisposableGoodsStock.java) (revision 13435) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoodsStock.java (.../DisposableGoodsStock.java) (revision 15901) @@ -277,15 +277,22 @@ @Transient public String getShowName() { + if (StringUtils.isNotBlank(this.packageSpec)) { + return this.name + "[" + this.packageSpec + "]"; + } if (StringUtils.isNotBlank(this.specification)) { return this.name + "[" + this.specification + "]"; } return this.name; } - - public void setShowName() { - + @Transient + public String getShowNameForSmallestUnit() { + if (StringUtils.isNotBlank(this.specification)) { + return this.name + "[" + this.specification + "]"; + } + return this.name; } + public String getIsSupplyRoomGoods() { if(isSupplyRoomGoods == null || "".equals(isSupplyRoomGoods)){