Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java
===================================================================
diff -u -r20242 -r20464
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java	(.../DiposableGoodsTableManager.java)	(revision 20242)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java	(.../DiposableGoodsTableManager.java)	(revision 20464)
@@ -701,19 +701,19 @@
 		JSONArray dataJsonArray = new JSONArray();
 		String sql = "select * from ("+
 			//--1.以追溯系统数据为基准,查询出与物资系统库存不一致的数据(包括追溯系统有库存但物资系统却没有的库存数据)
-			"select dg.idFromHisSync sourceid,dgi.batchIdFromHisSync batchid, dg.externalCode externalCode,dg.name name,dg.specification specification,dgb.batchNumber batchNumber,dgi.amount cssdStock,js.quantity inventoryStock "+ 
+			"select dg.idFromHisSync sourceid,dgi.batchIdFromHisSync batchid, dg.externalCode externalCode,dg.name name,dg.specification specification,dgb.batchNumber batchNumber,sum(dgi.amount) cssdStock,avg(js.quantity) inventoryStock "+ 
 			"from DisposableGoodsIdentification dgi join DisposableGoods dg on dgi.disposableGoodsID=dg.id "+
 			"join DisposableGoodsBatch dgb on dgi.disposableGoodsBatchID=dgb.id "+
 			"left join JXINVENTORYSTOCK js on dgi.batchIdFromHisSync=js.batchid "+
-			"where dgi.amount > 0 and convert(decimal(20,4),js.quantity) > 0 and dgi.amount <> convert(decimal(20,4),js.quantity) "+
+			"where dgi.amount > 0 and convert(decimal(20,4),js.quantity) > 0 and dgi.amount <> convert(decimal(20,4),js.quantity) group by dg.idFromHisSync ,dgi.batchIdFromHisSync , dg.externalCode ,dg.name ,dg.specification ,dgb.batchNumber "+
 			
 			"union "+
 
 			//2.查询追溯系统有库存但物资系统没有库存的数据
-			"select dg.idFromHisSync sourceid,dgi.batchIdFromHisSync batchid,dg.externalCode externalCode,dg.name name,dg.specification specification,dgb.batchNumber batchNumber,dgi.amount cssdStock,null inventoryStock "+ 
+			"select dg.idFromHisSync sourceid,dgi.batchIdFromHisSync batchid,dg.externalCode externalCode,dg.name name,dg.specification specification,dgb.batchNumber batchNumber,sum(dgi.amount) cssdStock,null inventoryStock "+ 
 			"from DisposableGoodsIdentification dgi join DisposableGoods dg on dgi.disposableGoodsID=dg.id "+
 			"join DisposableGoodsBatch dgb on dgi.disposableGoodsBatchID=dgb.id "+
-			"where dgi.amount > 0 and dgi.batchIdFromHisSync not in (select BatchID from JXINVENTORYSTOCK where Quantity > 0 and SourceID is not null) "+
+			"where dgi.amount > 0 and dgi.batchIdFromHisSync not in (select BatchID from JXINVENTORYSTOCK where Quantity > 0 and SourceID is not null) group by dg.idFromHisSync ,dgi.batchIdFromHisSync , dg.externalCode ,dg.name ,dg.specification ,dgb.batchNumber "+
 			
 			"union "+