Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java =================================================================== diff -u -r28043 -r28867 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java (.../MaterialDefinitionManagerImpl.java) (revision 28043) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java (.../MaterialDefinitionManagerImpl.java) (revision 28867) @@ -42,6 +42,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.datasynchronization.HisMaterialType; import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; +import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.security.tools.Util; import com.forgon.systemsetting.model.HttpOption; @@ -1671,14 +1672,15 @@ " join mi.materialDefinition md " + " where td.id = %s", tousseDefinitionId); List materialDefinitionList = objectDao.findByHql(hql);*/ - String sql = String.format("select md.id, md.name, md.cost, mi.count from MaterialInstance mi join MaterialDefinition md " + - " on mi.materialDefinition_id = md.id and mi.tousse_id = '%s'", tousseDefinitionId); + String sql = String.format("select md.id, md.name , md.specification, md.cost, mi.count from %s mi join %s md " + + " on mi.materialDefinition_id = md.id and mi.tousse_id = '%s'", MaterialInstance.class.getSimpleName(), + MaterialDefinition.class.getSimpleName(), tousseDefinitionId); ResultSet rs = objectDao.executeSql(sql); try { while (rs.next()) { Map temp = new HashMap(); temp.put("materialDefinitionId", rs.getObject("id")); - temp.put("materialName", rs.getObject("name")); + temp.put("materialName", CssdUtils.buildShowName(rs.getString("name"), rs.getString("specification"))); temp.put("cost", rs.getObject("cost")); temp.put("count", rs.getObject("count")); list.add(temp);