Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java =================================================================== diff -u -r14407 -r14420 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java (.../MaterialDefinitionManager.java) (revision 14407) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java (.../MaterialDefinitionManager.java) (revision 14420) @@ -29,6 +29,8 @@ public MaterialDefinition getMaterialDefinitionByName(String name,String specification); + public MaterialDefinition getForeignTousseMaterialDefinition(String name,String specification); + public List getAllMaterialDefinition(); public JSONObject searchMaterialDefinitionAndDiposableGoods(String simpleSpell,String selectType); Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java =================================================================== diff -u -r14407 -r14420 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java (.../MaterialDefinitionManagerImpl.java) (revision 14407) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java (.../MaterialDefinitionManagerImpl.java) (revision 14420) @@ -732,4 +732,21 @@ return array; } + @Override + public MaterialDefinition getForeignTousseMaterialDefinition(String name, + String specification) { + String sql = " where 1=1 "; + if (StringUtils.isNotBlank(name)) { + sql += " and po.name = '" + name + "'"; + } + if (StringUtils.isNotBlank(specification)) { + sql += " and po.specification = '" + specification + "'"; + } else { + sql += " and po.specification is null"; + } + sql += " and po.isForeignMaterial = '" + Constants.STR_YES + "'"; + return (MaterialDefinition) objectDao.getBySql( + MaterialDefinition.class.getSimpleName(), sql); + } + } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r14416 -r14420 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 14416) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 14420) @@ -647,7 +647,7 @@ } private MaterialDefinition getMaterialDefintion(String materialName) { - MaterialDefinition md = materialDefinitionManager.getMaterialDefinitionByName(materialName, null); + MaterialDefinition md = materialDefinitionManager.getForeignTousseMaterialDefinition(materialName, null); if(md == null){ md = new MaterialDefinition(); md.setName(materialName);