Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java =================================================================== diff -u -r15734 -r15903 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java (.../DiposableGoodsManager.java) (revision 15734) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java (.../DiposableGoodsManager.java) (revision 15903) @@ -145,7 +145,6 @@ public List getDiposableGoodsPriceAmountInfoCanOutEntryByBatchID( String batchID); - public void update_TRANS_REQUIRED(DisposableGoodsStock disposableGoodsStock); public void updateDisposableGoods_TRANS_REQUIRED( DisposableGoods diposableGoods); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java =================================================================== diff -u -r15901 -r15903 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 15901) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 15903) @@ -83,6 +83,8 @@ private String middlePackageUnit; //中包装单位 + private String applicationSpecification; // 申领规格 + private Integer transferScale; //中包装单位装换单位系数 private Integer minApplyAmount; //最小申请数量 @@ -353,8 +355,8 @@ @Transient public String getShowName() { - if (StringUtils.isNotBlank(this.packageSpec)) { - return this.name + "[" + this.packageSpec + "]"; + if (StringUtils.isNotBlank(this.applicationSpecification)) { + return this.name + "[" + this.applicationSpecification + "]"; } if (StringUtils.isNotBlank(this.specification)) { return this.name + "[" + this.specification + "]"; @@ -479,6 +481,14 @@ } + public String getApplicationSpecification() { + return applicationSpecification; + } + + public void setApplicationSpecification(String applicationSpecification) { + this.applicationSpecification = applicationSpecification; + } + public Integer getTransferScale() { return transferScale; } Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java =================================================================== diff -u -r15828 -r15903 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 15828) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 15903) @@ -218,25 +218,6 @@ objectDao.saveOrUpdate(disposableGoods); } - public void update_TRANS_REQUIRED(DisposableGoodsStock disposableGoodsStock){ - saveOrUpdate(disposableGoodsStock); - // 如果修改了名称或者规则,同步修改其他关联的表 - String oldName = disposableGoodsStock.getOrginalName(); - String oldSpecification = disposableGoodsStock.getOrginalSpecification(); - String newName = disposableGoodsStock.getName(); - String newSpecification = disposableGoodsStock.getSpecification(); - boolean nameChanged = false; - if(!StringUtils.isBlank(oldName) || !StringUtils.isBlank(newName)){ - nameChanged = !StringUtils.equals(oldName, newName); - } - boolean specificationChanged = false; - if(!StringUtils.isBlank(oldName) || !StringUtils.isBlank(newName)){ - specificationChanged = !StringUtils.equals(oldSpecification, newSpecification); - } - if(nameChanged || specificationChanged){ - updateNameAndSpecification(oldName, oldSpecification, newName, newSpecification); - } - } private void setUpdatingProperties(DisposableGoods curDisposableGoods,DisposableGoods disposableGoods){ curDisposableGoods.setCertification(disposableGoods.getCertification()); curDisposableGoods.setExternalCode(disposableGoods.getExternalCode()); @@ -802,8 +783,7 @@ return null; Map temp = new HashMap(); - String goodsName = DisposableGoodsUtils.getDisposableGoodsFullName(disposableGoods.getName(), - disposableGoods.getSpecification()) ; + String goodsName = disposableGoods.getShowName() ; String externalCode = disposableGoods.getExternalCode(); if (externalCode == null){ externalCode = ""; @@ -866,8 +846,7 @@ if(disposableGoods == null){ return StringTools.EMPTY; } - String displayName = DisposableGoodsUtils.getDisposableGoodsFullName( - disposableGoods.getName(),disposableGoods.getSpecification()); + String displayName = disposableGoods.getShowName(); if(goodsStock != null){ displayName += "(库存:"; displayName += goodsStock.getAmount(); @@ -880,8 +859,7 @@ if(disposableGoods == null){ return StringTools.EMPTY; } - String displayName = DisposableGoodsUtils.getDisposableGoodsFullName( - disposableGoods.getName(),disposableGoods.getSpecification()); + String displayName = disposableGoods.getShowName(); if(price != null){ String packageSpec = disposableGoods.getPackageSpec(); if (StringUtils.isBlank(packageSpec)) { @@ -2096,7 +2074,6 @@ disposableGoodsStock.setName(disposableGoods.getName()); disposableGoodsStock.setPackageSpec(disposableGoods.getPackageSpec()); disposableGoodsStock.setReferencePrice(disposableGoods.getReferencePrice()); - disposableGoodsStock.setShowName(); disposableGoodsStock.setSpecification(disposableGoods.getSpecification()); disposableGoodsStock.setSpelling(disposableGoods.getSpelling()); disposableGoodsStock.setType(disposableGoods.getType());