From a66aec3ac3e39238f6dcb73dfdaaf55f83a984dd Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 2 Jul 2024 09:49:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A6=84=E8=8F=8A=E6=97=A5=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8--=E5=8D=95=E5=B1=82=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/mes/mapper/MesReportWorkMapper.java |  2 ++
 .../mes/service/impl/MesReportWorkServiceImpl.java  |  3 +++
 .../resources/mapper/mes/MesReportWorkMapper.xml    | 13 ++++++++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

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 2dc221e2d..5b2c7ac08 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
@@ -183,4 +183,6 @@ public interface MesReportWorkMapper {
     QuantityDto getSumQuantity(QuantityDto quantityDto);
 
     List<Map> getmonthProductionSut(MesMonthReportVo mesMonthReportVo);
+
+    QuantityDto getSumQuantityOne(QuantityDto quantityDto);
 }
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 b61159c80..cbc63278c 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
@@ -426,6 +426,9 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 			quantityDto.setMachineCode(machineCode);
 			QuantityDto parentMesReport = mesReportWorkMapper.getRealQuantity(quantityDto);
 			QuantityDto sonMesReport = mesReportWorkMapper.getSumQuantity(quantityDto);
+			if(sonMesReport == null){//单层工单的情况
+				sonMesReport = mesReportWorkMapper.getSumQuantityOne(quantityDto);
+			}
 
 			// 产量
 			Long sumQua = 0L;
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 4f523bee1..b76e1753b 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
@@ -723,6 +723,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		  and upload_status = '1'
 	</select>
 
+	<select id="getSumQuantityOne" resultType="com.op.mes.domain.dto.QuantityDto">
+		select
+			sum(quantity_feedback) quantityFeedbackSum,
+			sum(work_time) workTime,
+			ROUND(sum(work_time*use_man)/sum(work_time), 2) useMan,
+			sum(work_time*use_man) totalWorkTime
+		from mes_report_work
+		where workorder_code = #{workorderCode} and del_flag = '0' and machine_code = #{machineCode}
+		  and upload_status = '1'
+	</select>
+
 	<select id="selectMesReportWorkList_S" parameterType="MesReportWork" resultMap="MesReportWorkResult">
 		SELECT
 		mrw.machine_name,
@@ -933,7 +944,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         {CALL GeneratePivotReport(#{params.beginTime, jdbcType=DATE}, #{params.endTime, jdbcType=DATE})}
     </select>
 
-    <insert id="insertMesReportWork" parameterType="MesReportWork">
+	<insert id="insertMesReportWork" parameterType="MesReportWork">
 		insert into mes_report_work
 		<trim prefix="(" suffix=")" suffixOverrides=",">
 			<if test="id != null">id,</if>