Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java =================================================================== diff -u -r27331 -r27349 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 27331) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 27349) @@ -713,22 +713,22 @@ case "检查数量": if(dataSoureOfMaterialsCountOfToussesInReports == 3){ - amountColumnSql = "ti.materialAmount * pr.amount"; + amountColumnSql = "ti.materialAmount"; joinMaterialInstanceSql = ""; }else{ - amountColumnSql = "sum(mi.count) * pr.amount"; + amountColumnSql = "mi.count"; joinMaterialInstanceSql = "inner join MaterialInstance mi on td.id = mi.tousse_id"; } if(!obj.getIsOnlyQueryComboTousse()){ //非拆分包 amountSql = String - .format("select (%s) amount ,pr.inspector userName, td.tousseType,td.name tousseName " + .format("select sum(%s) amount ,pr.inspector userName, td.tousseType,td.name tousseName " + "from TousseInstance ti inner join PackingRecord pr on pr.id = ti.packingRecord_id inner join TousseDefinition td on ti.tousseDefinition_id=td.id " + " %s where pr.packTime %s %s " + " and pr.splitTousseName is null" + " and pr.inspector is not null and %s(pr.inspector)<>0 %s %s %s %s " - + "group by pr.inspector,td.tousseType,td.name,pr.amount ", + + "group by pr.inspector,td.tousseType,td.name", amountColumnSql, joinMaterialInstanceSql, obj.betweenSql, @@ -744,7 +744,7 @@ + " from PackingRecord pr inner join TousseDefinition td on pr.tousseDefinitionId = td.parentID " + "inner join TousseInstance ti on ti.tousseDefinition_id = td.id " + " %s where pr.packTime %s %s " - + "and pr.inspector is not null and td.tousseType='%s' and %s(pr.inspector)<>0 %s %s %s %s " + + " and td.tousseType='%s' and pr.inspector is not null and %s(pr.inspector)<>0 %s %s %s %s " + "group by pr.inspector,td.tousseType,td.name ", amountColumnSql, joinMaterialInstanceSql,