Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java
===================================================================
diff -u -r13295 -r13296
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java	(.../MonthGoodsDetailSummaryService.java)	(revision 13295)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java	(.../MonthGoodsDetailSummaryService.java)	(revision 13296)
@@ -24,13 +24,13 @@
 	private List<MonthGoodsDetailVo> returnGoodsVos = new LinkedList<MonthGoodsDetailVo>();
 	
 	public List<MonthGoodsDetailVo> getList(){
-		returnGoodsVos.forEach(vo->{
-			//本期出库数量
-			//Long outStoageAmount = vo.getStartStockAmount()+vo.getInStorageAmount()-vo.getEndStockAmount();
-			//Double outStoragePrice =  vo.getStartStockPrice()+vo.getInStoragePrice()-vo.getEndStockPrice();
-			//vo.setOutStorageAmount(outStoageAmount);
-			//vo.setOutStoragePrice(outStoragePrice);
-		});
+//		returnGoodsVos.forEach(vo->{
+//			//本期出库数量
+//			//Long outStoageAmount = vo.getStartStockAmount()+vo.getInStorageAmount()-vo.getEndStockAmount();
+//			//Double outStoragePrice =  vo.getStartStockPrice()+vo.getInStoragePrice()-vo.getEndStockPrice();
+//			//vo.setOutStorageAmount(outStoageAmount);
+//			//vo.setOutStoragePrice(outStoragePrice);
+//		});
 		return returnGoodsVos;
 	}
 	
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r13293 -r13296
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13293)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13296)
@@ -7620,7 +7620,7 @@
 		if ("汇总".equals(summaryType)) {
 			return createGoodsSummary(endRecord, startRecord, type);
 		} else {
-			return createGoodsSummary1(endRecord, startRecord, type);
+			return createGoodsDetail(endRecord, startRecord, type);
 		}
 	}
 	
@@ -7647,6 +7647,16 @@
 			vo.setEndStockPrice(MathTools.add(vo.getEndStockPrice(), item.getEndStockPrice()).doubleValue());
 			vo.setInStoragePrice(MathTools.add(vo.getInStoragePrice(), item.getInStoragePrice()).doubleValue());
 			vo.setOutStoragePrice(MathTools.add(vo.getOutStoragePrice(), item.getOutStoragePrice()).doubleValue());
+			
+			vo.setBuyInStoragePrice(MathTools.add(vo.getBuyInStoragePrice(),item.getBuyInStoragePrice()).doubleValue());
+			vo.setMoveInStoragePrice(MathTools.add(vo.getMoveInStoragePrice(),item.getMoveInStoragePrice()).doubleValue());
+			vo.setStockTakeInStoragePrice(MathTools.add(vo.getStockTakeInStoragePrice(),item.getStockTakeInStoragePrice()).doubleValue());
+			vo.setReturnBackToSupplierStoragePrice(MathTools.add(vo.getReturnBackToSupplierStoragePrice(),item.getReturnBackToSupplierStoragePrice()).doubleValue());
+			vo.setSendOutStoragePrice(MathTools.add(vo.getSendOutStoragePrice(),item.getSendOutStoragePrice()).doubleValue());
+			vo.setReceiveRecordStoragePrice(MathTools.add(vo.getReceiveRecordStoragePrice(),item.getReceiveRecordStoragePrice()).doubleValue());
+			vo.setMoveOutStoragePrice(MathTools.add(vo.getMoveOutStoragePrice(),item.getMoveOutStoragePrice()).doubleValue());
+			vo.setStockTakeOutStoragePrice(MathTools.add(vo.getStockTakeOutStoragePrice(),item.getStockTakeOutStoragePrice()).doubleValue());
+			vo.setDepartmentReturnStoragePrice(MathTools.add(vo.getDepartmentReturnStoragePrice(),item.getDepartmentReturnStoragePrice()).doubleValue());
 		}
 		List<MonthGoodsDetailVo> retList = new ArrayList<MonthGoodsDetailVo>();
 		retList.add(vo);