From 3199b777213a2e61c5a28c8a0f3af4705bb17c3a Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Mon, 21 Apr 2025 17:56:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=97=A5=E6=8A=A5=E8=A1=A8=E4=B8=89=E5=B1=82=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E7=94=A8=E4=BA=BA=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/mes/service/impl/MesReportWorkServiceImpl.java  | 10 +++++++++-
 .../main/resources/mapper/mes/MesReportWorkMapper.xml  |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

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 4c8aa0495..49396997f 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
@@ -455,7 +455,11 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 			if(sonMesReport == null){//单层工单的情况
 				sonMesReport = mesReportWorkMapper.getSumQuantityOne(quantityDto);
 			}
-
+			//三层订单
+			QuantityDto quantityDtothree = new QuantityDto();
+			quantityDtothree.setWorkorderCode(sonMesReport.getWorkorderCode());
+			quantityDtothree.setMachineCode(machineCode);
+			QuantityDto threeMesReport = mesReportWorkMapper.getSumQuantity(quantityDtothree);
 			// 产量
 			Long sumQua = 0L;
 			// 实际产量
@@ -469,6 +473,10 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 				realQua = parentMesReport.getQuantityFeedbackSum();
 				workTime = sonMesReport.getWorkTime();
 				useMan = sonMesReport.getUseMan().add(parentMesReport.getUseMan());
+				// 若 threeMesReport 不为空，则叠加其 useMan 值
+				if (threeMesReport != null && threeMesReport.getUseMan() != null) {
+					useMan = useMan.add(threeMesReport.getUseMan());
+				}
 				dto.setQuantityAct(String.valueOf(sumQua));
 				dto.setQuantityFeedback(String.valueOf(realQua));
 				dto.setWorkTime(workTime);
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 1f7be2ec3..342ae6fc8 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
@@ -863,6 +863,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="getSumQuantity" resultType="com.op.mes.domain.dto.QuantityDto">
 		select
+		    workorder_code as workorderCode,
 			sum(quantity_feedback) quantityFeedbackSum,
 		    sum(work_time) workTime,
 			ROUND(sum(work_time*use_man)/sum(work_time), 2) useMan,
@@ -872,6 +873,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="board == null">
 		  and upload_status = '1'
 		</if>
+	   group by workorder_code
 	</select>
 
 	<select id="getSumQuantityOne" resultType="com.op.mes.domain.dto.QuantityDto">

From cab780b4dff9dc9168da1b67a9a902963af33a12 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Wed, 23 Apr 2025 10:19:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=97=A5=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/mes/controller/MesReportWorkController.java   |  2 +-
 .../mes/service/impl/MesReportWorkServiceImpl.java   | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java
index 6358c5018..a3cb852c9 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java
@@ -250,7 +250,7 @@ public class MesReportWorkController extends BaseController {
 
 	@RequiresPermissions("mes:dailyReport:list")
 	@GetMapping("/getDailyReportNew")
-	@Log(title = "生成日报表查询", businessType = BusinessType.QUERY)
+	@Log(title = "生产日报表查询", businessType = BusinessType.QUERY)
 	public TableDataInfo getDailyReportNew(MesDailyReportVo mesDailyReportVo) {
 		startPage();
 		List<MesDailyReportVo> list = mesReportWorkService.getDailyReportNew(mesDailyReportVo);
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 49396997f..d9fdb886d 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
@@ -456,10 +456,14 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 				sonMesReport = mesReportWorkMapper.getSumQuantityOne(quantityDto);
 			}
 			//三层订单
-			QuantityDto quantityDtothree = new QuantityDto();
-			quantityDtothree.setWorkorderCode(sonMesReport.getWorkorderCode());
-			quantityDtothree.setMachineCode(machineCode);
-			QuantityDto threeMesReport = mesReportWorkMapper.getSumQuantity(quantityDtothree);
+			QuantityDto threeMesReport =new QuantityDto();
+			if (sonMesReport != null ){
+				QuantityDto quantityDtothree = new QuantityDto();
+				quantityDtothree.setWorkorderCode(sonMesReport.getWorkorderCode());
+				quantityDtothree.setMachineCode(machineCode);
+				threeMesReport = mesReportWorkMapper.getSumQuantity(quantityDtothree);
+			}
+
 			// 产量
 			Long sumQua = 0L;
 			// 实际产量