From 226c432a5cd4def93e7215ca1405c87dd6612d56 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 5 Mar 2025 09:42:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/mes/mapper/MesReportWorkMapper.java    |  3 +++
 .../impl/MesReportWorkServiceImpl.java        |  2 +-
 .../mapper/mes/MesReportWorkMapper.xml        | 21 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
index 0fa14b461..d5baafb81 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
@@ -96,6 +96,9 @@ public interface MesReportWorkMapper {
     @MapKey("nameDate")
     Map<String, MesReportProduction> getLineChartsDatas(MesReportProduction mesReportProduction);
 
+    @MapKey("nameDate")
+    Map<String, MesReportProduction> getLineChartsDayDatas(MesReportProduction mesReportProduction);
+
     @MapKey("name")
     Map<String, MesReportProduction> getDayOfMonthDatas(MesReportProduction mesReportProduction);
 
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 e5637614f..5035d5f3f 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
@@ -688,7 +688,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 		//日期名称数组
 		List<String> xAxisDatas = getDays(startTime,endTime);
 		lineChartDto.setxAxisDatas(xAxisDatas);
-		Map<String,MesReportProduction> productdatas = mesReportWorkMapper.getLineChartsDatas(mesReportProduction);
+		Map<String,MesReportProduction> productdatas = mesReportWorkMapper.getLineChartsDayDatas(mesReportProduction);
 		//值
 		List<String> datas = new ArrayList<>();
 		for(String dayStr:xAxisDatas) {
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 3934a5495..cf45716c2 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
@@ -310,6 +310,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			)mrw
 		group by mrw.nameDate,mrw.productCode,mrw.productName,mrw.feedbackTime
 	</select>
+	<select id="getLineChartsDayDatas" resultType="com.op.mes.domain.MesReportProduction">
+		select mrw.nameDate,
+			   mrw.feedbackTime,
+			   sum(mrw.quantity) quantity
+		from(
+				select
+					CONVERT(varchar(10),feedback_time, 120) nameDate,
+					product_code productCode,
+					product_name productName,
+					CONVERT(varchar(10),feedback_time, 120) feedbackTime,
+					quantity_feedback quantity
+				from mes_report_work
+				where
+					CONVERT(varchar(10),feedback_time, 120) >= #{productDateStart}
+				  and #{productDateEnd} >= CONVERT(varchar(10),feedback_time, 120)
+				  and parent_order = '0' and del_flag = '0'
+			)mrw
+		group by mrw.nameDate,mrw.feedbackTime
+	</select>
 	<select id="getDayOfMonthDatas" resultType="com.op.mes.domain.MesReportProduction">
 		select mrw.nameDate,
 			   mrw.feedbackTime,
@@ -766,7 +785,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			bp.umrez spec,
 		    bp.report_rate reportRate
 		from base_equipment be
-		left join pro_order_workorder pow on be.equipment_code = pow.workorder_name
+		left join  on be.equipment_code = pow.workorder_name
 		left join mes_line_product mlp on pow.workorder_name = mlp.line_code and pow.product_code = mlp.product_code and mlp.del_flag='0'
 		left join base_product bp on bp.product_code = pow.product_code
 		where be.del_flag = '0' and be.sap_code is not null and pow.status in ('w2','w3')