Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r34536 -r34550
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34536)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34550)
@@ -27452,23 +27452,36 @@
 			}
 			sql = getQualityMonitoringAmount(true, startTime, endTime, handleDepartCoding, "装配管理",null, "",extraJoin,",tdc.taskGroup"," group by tdc.taskGroup");
 			Map<String, Long> taskGroupPackQualityMonitoringAmountMap = getTaskGroupQualityMonitoringAmountMap(sql);
+			sql = getQualityMonitoringAmount(false, startTime, endTime, handleDepartCoding, "装配管理",null, "",extraJoin,",tdc.taskGroup"," group by tdc.taskGroup");
+			Map<String, Long> taskGroupPackQualityMonitoringMaterialAmountMap = getTaskGroupQualityMonitoringAmountMap(sql);
 			for (TaskGroup taskGroup : taskGroups) {
 				String taskGroupName = taskGroup.getTaskGroupName();
 				Long qualityMonitoringTousseAmount = taskGroupPackQualityMonitoringAmountMap.get(taskGroupName);
 				if(qualityMonitoringTousseAmount == null){
 					qualityMonitoringTousseAmount = 0L;
 				}
+				qualityMonitoringMaterialAmount = taskGroupPackQualityMonitoringMaterialAmountMap.get(taskGroupName);
+				if(qualityMonitoringMaterialAmount == null){
+					qualityMonitoringMaterialAmount = 0L;
+				}
 				params.taskGroupSqlWithAliasOfTousseDefinitionIsTd = " and tdc.taskGroup ='"+ taskGroupName +"' ";
 				sql = String.format("select sum(tl.amount) amount from ("
 						+dataIndex.getWorkAmountByPackageSQL("配包数量", params)
 						+ ") tl");
 
 				Long totalProTousseAmount = objectDao.getALongNum(sql, field);
+				
+				sql = String.format("select sum(tl.amount) amount from ("
+						+dataIndex.getWorkAmountByMaterialSQL("配包数量", params, dataSoureOfMaterialsCountOfToussesInReports)
+						+ ") tl");
+				totalProMaterialAmount = objectDao.getALongNum(sql, field);
+				
 				addQualityMonitoringReportTaskGroupVo(resultList, taskGroupName + "装配组"
-						, 0L , totalProTousseAmount
-						, 0L
+						, totalProMaterialAmount , totalProTousseAmount
+						, qualityMonitoringMaterialAmount
 						, qualityMonitoringTousseAmount, 0L
-						, "0.00%", 0L, totalProTousseAmount - qualityMonitoringTousseAmount
+						, "0.00%", totalProMaterialAmount - qualityMonitoringMaterialAmount
+						, totalProTousseAmount - qualityMonitoringTousseAmount
 						, getPassRate(dft, qualityMonitoringTousseAmount, totalProTousseAmount));
 			}
 		}