Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r13899 -r13903 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 13899) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 13903) @@ -156,6 +156,10 @@ TousseDefinition.class.getSimpleName(), "id", Long.valueOf(id)); } + public TousseDefinition getTousseDefinitionById(Long id){ + return getTousseDefinitionById(id + ""); + } + public TousseDefinition getById_ForUpdate_MANDATORY(String id){ return (TousseDefinition) objectDao.getByProperty_ForUpdate( TousseDefinition.class.getSimpleName(), "id", Long.valueOf(id)); @@ -2201,7 +2205,7 @@ json.put("totalPrice", totalPrice); json.put("totalAmout", totalAmout); json.put("price", MathTools.divide(totalPrice, totalAmout, 2)); - json.put("materialStr", StringTools.join(materialStr, ";")); + json.put("materialStr", StringTools.join(materialStr, "/")); } return json; } Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java =================================================================== diff -u -r13899 -r13903 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java (.../TousseDefinitionManager.java) (revision 13899) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java (.../TousseDefinitionManager.java) (revision 13903) @@ -26,6 +26,8 @@ public TousseDefinition getTousseDefinitionById(String id); + public TousseDefinition getTousseDefinitionById(Long id); + public TousseDefinition getById_ForUpdate_MANDATORY(String id); public boolean delete(TousseDefinition tousseDefinition); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r13891 -r13903 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 13891) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 13903) @@ -2345,8 +2345,7 @@ } // 是消毒物品 else if (TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType)) { - td = tousseDefinitionManager - .getTousseDefinitionByName(name); + td = tousseDefinitionManager.getTousseDefinitionById(tousseItem.getTousseDefinitionId()); name = CssdUtils.filterDisinfectGoodsName(name);