From 57ff0dd3ea94403977e42f2f44a79fd76ac672f5 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 13 Oct 2023 15:48:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E6=97=B6=E4=BA=A7=E9=87=8F=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=90=88=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/mes/service/impl/MesReportWorkServiceImpl.java | 1 +
 .../src/main/resources/mapper/mes/MesReportWorkMapper.xml | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java
index beb374139..ebd15a20b 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java
+++ b/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;
diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
index b0885e3b1..61c3a72d5 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
+++ b/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">