Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
===================================================================
diff -u -r24226 -r25220
--- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java	(.../InventoryRecordManagerImpl.java)	(revision 24226)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java	(.../InventoryRecordManagerImpl.java)	(revision 25220)
@@ -1908,6 +1908,7 @@
 		if(columnJsonArray != null && columnJsonArray.size() > 0 && CollectionUtils.isNotEmpty(itemVoList)){
 			//按物品差值排序
 			Collections.sort(itemVoList);
+			//
 			JSONArray itemsArray = JSONArray.fromObject(itemVoList);
 			for (int i = 0 ;i < itemsArray.size() ; i++){
 				HSSFRow operatingRow = sheet.createRow(row);
@@ -2159,25 +2160,22 @@
 	public JSONArray getGatherInventoryRecordItems(String id){
 		JSONArray data = new JSONArray();
 		if(DatabaseUtil.isPoIdValid(id)){
-			String findSql = getGatherInventoryRecordSql(id);
-			ResultSet rs = objectDao.executeSql(findSql);
-			try {
-				while(rs.next()){	
+			//获取盘点汇总
+			List<gatherInventoryRecordItemVo> gatherItemVoList = buildInventoryRecordItemVo(id);
+			//
+			if(CollectionUtils.isNotEmpty(gatherItemVoList)){
+				for (gatherInventoryRecordItemVo vo : gatherItemVoList) {
 					JSONObject obj = new JSONObject();
-					obj.put("externalCode",rs.getString("externalCode"));//外部编码
-					obj.put("name",rs.getString("materialName"));//名称
-					obj.put("specification",rs.getString("specification"));//规格
-					obj.put("type",rs.getString("type"));//类型
-					obj.put("amount",rs.getInt("storage"));//盘点数量
-					obj.put("inventoryAmount",rs.getInt("amount"));//账面数量
-					obj.put("amountDifferent",rs.getInt("amountDifferent"));//差值
-					obj.put("unit",rs.getString("unit"));//单位
+					obj.put("externalCode",vo.getExternalCode());//外部编码
+					obj.put("name",vo.getMaterialName());//名称
+					obj.put("specification",vo.getSpecification());//规格
+					obj.put("type",vo.getType());//类型
+					obj.put("amount",vo.getStorage());//盘点数量
+					obj.put("inventoryAmount",vo.getAmount());//账面数量
+					obj.put("amountDifferent",vo.getStorageDifference());//差值
+					obj.put("unit",vo.getUnit());//单位
 					data.add(obj);
 				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}finally{
-				DatabaseUtil.closeResultSetAndStatement(rs);
 			}
 		}
 		return data;
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/vo/gatherInventoryRecordItemVo.java
===================================================================
diff -u -r22621 -r25220
--- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/vo/gatherInventoryRecordItemVo.java	(.../gatherInventoryRecordItemVo.java)	(revision 22621)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/vo/gatherInventoryRecordItemVo.java	(.../gatherInventoryRecordItemVo.java)	(revision 25220)
@@ -174,6 +174,7 @@
 	
 	@Override
 	public int compareTo(gatherInventoryRecordItemVo o) {
+		//根据差值排序
 		Integer t_StorageDifference = Math.abs(this.storageDifference);
 		Integer p_StorageDifference = Math.abs(o.storageDifference);
 		if(t_StorageDifference == null){
@@ -189,5 +190,19 @@
 		} else {
 			return 0;
 		}
+		//根据顺序号排序
+//		Integer t_sequence = this.sequence;
+//		Integer p_sequence = o.sequence;
+//		if(t_sequence == null || p_sequence == null){
+//			if(t_sequence == null){
+//				return -1;
+//			}else if(p_sequence == null){
+//				return 1;
+//			}else{
+//				return 0;
+//			}
+//		};
+//		return t_sequence - p_sequence;
+		
 	}
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryItem.java
===================================================================
diff -u -r23664 -r25220
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryItem.java	(.../InventoryItem.java)	(revision 23664)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryItem.java	(.../InventoryItem.java)	(revision 25220)
@@ -165,7 +165,8 @@
 		materialColumnNameAndPoPropertyNameArrray.add("{header:'单价',dataIndex:'price',type:'double'}");
 		materialColumnNameAndPoPropertyNameArrray.add("{header:'供应商',dataIndex:'supplierName',type:'string'}");
 		
-		disposableGoodsColumnNameAndPoPropertyNameFormatArrray.add("{header:'序号',dataIndex:'rowIndex',type:'int'}");
+//		disposableGoodsColumnNameAndPoPropertyNameFormatArrray.add("{header:'序号',dataIndex:'rowIndex',type:'int'}");
+		disposableGoodsColumnNameAndPoPropertyNameFormatArrray.add("{header:'顺序号',dataIndex:'sequence',type:'int'}");
 		disposableGoodsColumnNameAndPoPropertyNameFormatArrray.add("{header:'名称',dataIndex:'materialName',type:'string'}");
 		disposableGoodsColumnNameAndPoPropertyNameFormatArrray.add("{header:'规格',dataIndex:'specification',type:'string'}");
 		disposableGoodsColumnNameAndPoPropertyNameFormatArrray.add("{header:'批次',dataIndex:'batchNumber',type:'string'}");