Index: ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/service/StockTakeRecordManagerImpl.java
===================================================================
diff -u -r31745 -r31975
--- ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/service/StockTakeRecordManagerImpl.java	(.../StockTakeRecordManagerImpl.java)	(revision 31745)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/service/StockTakeRecordManagerImpl.java	(.../StockTakeRecordManagerImpl.java)	(revision 31975)
@@ -1145,15 +1145,16 @@
 		Map<String, String> dateMap = getMonthStartAndEndDate2(currentRecord.getStockYearMonth());
 		String startDate = this.dateQueryAdapter.dateAdapter((String)dateMap.get("startDay"));
 		String endDate = this.dateQueryAdapter.dateAdapter((String)dateMap.get("endDay") + " 23:59:59");
-		String querySql = "select temp1.name,temp1.specification,sum(temp1.amount) as amount,sum(temp1.totalprice) as totalprice from ( select dg.name,dg.specification,sum(gei.amount) as amount,sum(gei.amount * gei.cost) as totalprice from godownentry ge join godownentryitem gei on ge.id=gei.godownentry_id join diposablegoods dg on gei.diposablegoods_id=dg.id where ge.time between " + 
+		String querySql = "select temp1.name,temp1.specification,sum(temp1.amount) as amount,sum(temp1.totalprice) as totalprice from ( select dg.name,dg.specification,sum(gei.amount) as amount,sum(gei.amount * gei.cost) as totalprice from godownentry ge join godownentryitem gei on ge.id=gei.godownentry_id "
+				+ " inner join "+  DisposableGoodsStock.class.getSimpleName() +" dgs on gei.diposablegoods_id = dgs.id inner join "+ DisposableGoods.class.getSimpleName() +" dg on dgs.disposableGoodsID = dg.id where ge.time between " + 
 	      startDate + " and " + endDate + 
 	      " and ge.type='"+GodownEntry.TYPE_IN+"'" + 
 	      " group by dg.name,dg.specification" + 
 	      " union all" + 
 	      " select dg.name,dg.specification" + 
 	      ",-1 * sum(gei.amount) as amount,-1 * sum(gei.amount * gei.cost) as totalprice" + 
 	      " from godownentry ge join godownentryitem gei on ge.id=gei.godownentry_id" + 
-	      " join diposablegoods dg on gei.diposablegoods_id=dg.id" + 
+	      " inner join "+ DisposableGoodsStock.class.getSimpleName() +" dgs on gei.diposablegoods_id = dgs.id inner join "+ DisposableGoods.class.getSimpleName() +" dg on dgs.disposableGoodsID = dg.id " + 
 	      " where ge.time between " + startDate + " and " + endDate + 
 	      " and ge.type='"+GodownEntry.TYPE_OUT+"'" + 
 	      " group by dg.name,dg.specification" +