Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/dwr/StorageLocationTableManager.java =================================================================== diff -u -r26797 -r26798 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/dwr/StorageLocationTableManager.java (.../StorageLocationTableManager.java) (revision 26797) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/dwr/StorageLocationTableManager.java (.../StorageLocationTableManager.java) (revision 26798) @@ -370,6 +370,7 @@ List sortByOrgUnitNameList = parameterMap.get("grid_sort_orgUnitName"); List sortByTousseBarcodeList = parameterMap.get("grid_sort_tousseBarcode"); List parentStorageLocationStr = parameterMap.get("grid_sort_parentStorageLocationPath"); + List sortByStorageLocationCodeList = parameterMap.get("grid_sort_storageLocationCode"); if(CollectionUtils.isNotEmpty(sortByTousseNameList)) { if (StringUtils.isNotBlank(sortByTousseNameList.get(0))) { sql += " order by tousseName " + sortByTousseNameList.get(0); @@ -410,6 +411,11 @@ sql += " order by id " + parentStorageLocationStr.get(0); } } + if(CollectionUtils.isNotEmpty(sortByStorageLocationCodeList)) { + if (StringUtils.isNotBlank(sortByStorageLocationCodeList.get(0))) { + sql += " order by storageLocationCode " + sortByStorageLocationCodeList.get(0); + } + } ResultSet rs = objectDao.executeSql(sql); JSONObject json = new JSONObject();