Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r12974 -r13018 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 12974) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 13018) @@ -2912,7 +2912,7 @@ if(StringUtils.isNotBlank(ids1)){ String value = ""; for (String id : ids1.split(";")) { - DisposableGoods goods = diposableGoodsManager.getDiposableGoodsById(id); + DisposableGoods goods = diposableGoodsManager.getDisposableGoodsById(id); if(goods != null){ if(value.length() > 0){ value += ";"; @@ -2984,7 +2984,7 @@ if(StringUtils.isNotBlank(ids5)){ String value = ""; for (String id : ids5.split(";")) { - DisposableGoods goods = diposableGoodsManager.getDiposableGoodsById(id); + DisposableGoods goods = diposableGoodsManager.getDisposableGoodsById(id); if(goods != null){ if(value.length() > 0){ value += ";"; Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java =================================================================== diff -u -r13017 -r13018 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java (.../DepartmentAppTemplateAction.java) (revision 13017) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/action/DepartmentAppTemplateAction.java (.../DepartmentAppTemplateAction.java) (revision 13018) @@ -204,7 +204,7 @@ String [] diposableGoodsdsArry = diposableGoodsIds.split(","); for (String diposableGoodsId : diposableGoodsdsArry) { String [] diposableGoodsItemArray = diposableGoodsId.split(";"); - DisposableGoods diposableGoods = diposableGoodsManager.getDiposableGoodsById(diposableGoodsItemArray[0]); + DisposableGoods diposableGoods = diposableGoodsManager.getDisposableGoodsById(diposableGoodsItemArray[0]); DiposableGoodsTemplateItem oldDiposalbeGoodsItem = diposableGoodsMap.get(diposableGoods.getId()); if(diposableGoods != null && oldDiposalbeGoodsItem != null && diposableGoods.getId().equals(oldDiposalbeGoodsItem.getApplicationDiposableGoods().getId())){ oldDiposalbeGoodsItem.setSortNumber(Integer.parseInt(diposableGoodsItemArray[1])); Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java =================================================================== diff -u -r12972 -r13018 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java (.../GoodPurchaseTableManager.java) (revision 12972) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java (.../GoodPurchaseTableManager.java) (revision 13018) @@ -114,7 +114,7 @@ jsonObject.put("supplier1", ""); jsonObject.put("manufacturer", ""); DisposableGoods disposableGoods = - diposableGoodsManager.getDiposableGoodsById(disposableGoodsId); + diposableGoodsManager.getDisposableGoodsById(disposableGoodsId); if(disposableGoods != null && StringUtils.isNotBlank(disposableGoods.getName())){ //一次性物品库存 Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java =================================================================== diff -u -r13017 -r13018 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 13017) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 13018) @@ -504,7 +504,7 @@ } } - public DisposableGoods getDiposableGoodsById(String id) { + public DisposableGoods getDisposableGoodsById(String id) { return (DisposableGoods) objectDao.getByProperty( DisposableGoods.class.getSimpleName(), "id", Long.valueOf(id)); } @@ -513,7 +513,7 @@ DisposableGoodsStock.class.getSimpleName(), "id", Long.valueOf(id)); } public void deleteDiposableGoodsById(String id) { - objectDao.delete(getDiposableGoodsById(id)); + objectDao.delete(getDisposableGoodsById(id)); } public boolean verifyDiposableGoods(String id, String name, Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java =================================================================== diff -u -r13011 -r13018 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 13011) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 13018) @@ -666,7 +666,7 @@ public void prepare() { String id = StrutsParamUtils.getPraramValue("id", ""); if (StringUtils.isNotBlank(id) && !id.equals("0")) { - diposableGoods = diposableGoodsManager.getDiposableGoodsById(id); + diposableGoods = diposableGoodsManager.getDisposableGoodsById(id); } else { diposableGoods = new DisposableGoods(); } Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java =================================================================== diff -u -r13017 -r13018 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java (.../DiposableGoodsManager.java) (revision 13017) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java (.../DiposableGoodsManager.java) (revision 13018) @@ -24,7 +24,7 @@ // 更新标识号和相应的批次,一次性物品库存 public void updateStorage_TRANS_MANDATORY(Iterable identifications); - public DisposableGoods getDiposableGoodsById(String id); + public DisposableGoods getDisposableGoodsById(String id); public DisposableGoodsStock getDiposableGoodsStockById(String id);