小时产量报表增加合计

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java

@@ -247,6 +247,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 			HashMap result = new HashMap();
 			result.put("equCode",equ.getEquCode());
 			result.put("equName",equ.getEquName());
+			result.put("quantity",equ.getQuantity());
 			for(int n = 0;n < hourNames.size();n++){
 				String hourName = hourNames.get(n);
 				String key = equ.getEquCode()+hourName;

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -246,8 +246,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<select id="getEquNames" resultType="com.op.mes.domain.MesHourReport">
 		select
-			DISTINCT mt.equipmentCode equCode,
-		    equ.equipment_name equName
+			mt.equipmentCode equCode,
+		    equ.equipment_name equName,
+		    count(0) quantity
 		from mes_material_transfer_result mt
 		left join base_equipment equ on mt.equipmentCode = equ.equipment_code
 		left join pro_order_workorder pow on pow.workorder_id = mt.OrderCode
@@ -269,6 +270,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="equName != null  and equName != ''">
 			and equ.equipment_name like concat('%', #{equName}, '%')
 		</if>
+		group by
+		mt.equipmentCode,
+		equ.equipment_name
         order by mt.equipmentCode
 	</select>
     <select id="getHourProductionList" resultType="com.op.mes.domain.MesHourReport">