Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java =================================================================== diff -u -r29003 -r29023 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 29003) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 29023) @@ -353,47 +353,8 @@ if(nameChanged || specificationChanged || applicationSpecificationChanged){ updateNameAndSpecification(oldName, oldSpecification, newName, newSpecification,oldApplicationSpecification, newApplicationSpecification); } - // 联动修改一次性物品在所有申领模板中的默认数量(GDSZYY-15) - Integer orginalTransferScale = disposableGoods.getOrginalTransferScale(); - Integer transferScale = disposableGoods.getTransferScale(); - if(orginalTransferScale != null && transferScale != null){ - if(transferScale.intValue() != orginalTransferScale.intValue()){ - updateDiposableGoodsTemplateItem(disposableGoods); - } - } } - /** - * 联动修改该物品在所有申领模板中的默认数量,改为新的申领单位的数量GDSZYY-15 - * 新默认数量 = 原默认数量(不为空的值) x 原转换系数(空值的值按1计算) / 新转换系数(空值的值按1计算) - * 新默认数量如果为大于0小于1的小数,则赋值为1 - * @param disposableGoods - */ - @SuppressWarnings("unchecked") - private void updateDiposableGoodsTemplateItem(DisposableGoods disposableGoods) { - if(disposableGoods == null || !DatabaseUtil.isPoIdValid(disposableGoods.getId())){ - return; - } - String hql = String.format(" from %s po where po.applicationDiposableGoods.id = %s ", - DiposableGoodsTemplateItem.class.getSimpleName(), disposableGoods.getId()); - List diposableGoodsTemplateItemList = objectDao.findByHql(hql); - if(CollectionUtils.isNotEmpty(diposableGoodsTemplateItemList)){ - for (DiposableGoodsTemplateItem diposableGoodsTemplateItem : diposableGoodsTemplateItemList) { - if(diposableGoodsTemplateItem.getAmount() == null || diposableGoodsTemplateItem.getAmount().intValue() == 0){ - continue; - } - Integer orginalTransferScale = disposableGoods.getOrginalTransferScale(); - orginalTransferScale = orginalTransferScale == null ? 1 : orginalTransferScale; - Integer transferScale = disposableGoods.getTransferScale(); - transferScale = transferScale == null ? 1 : transferScale; - //新默认数量如果为大于0小于1的小数,则赋值为1 - double amount = diposableGoodsTemplateItem.getAmount() * orginalTransferScale / (transferScale * 1.0); - diposableGoodsTemplateItem.setAmount(Double.valueOf(Math.ceil(amount)).intValue()); - } - objectDao.batchSaveOrUpdate(diposableGoodsTemplateItemList); - } - } - @Override public void batchEnableOrDisableDiposableGoods(String ids, String needEnable) { if(StringUtils.isNotBlank(ids)){