From 37735eb68f7a7d23a510a71a696ab376ecab0f67 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 26 Aug 2024 10:11:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=97=A5=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/mes/mapper/MesReportWorkMapper.java    |  2 ++
 .../op/mes/service/impl/MesReportWorkServiceImpl.java  | 10 ++++++++--
 .../main/resources/mapper/mes/MesReportWorkMapper.xml  |  5 ++++-
 3 files changed, 14 insertions(+), 3 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 dd30bbac..1a3c18b3 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
@@ -190,4 +190,6 @@ public interface MesReportWorkMapper {
     List<Map> getmonthProductionSutCategory(MesMonthReportVo mesMonthReportVo);
 
     String getProductReason(QuantityDto quantityDto);
+
+    String getTypeName(String productCode);
 }
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 8b31813d..6ca63047 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
@@ -416,7 +416,13 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 
 		for (MesDailyReportVo dto : dtos) {
 			dto.setFactoryCode(factoryCode);
-			dto.setProdType("蚊香");
+			//品类
+			String typeName = mesReportWorkMapper.getTypeName(dto.getProductCode().replace("0000000",""));
+			if(StringUtils.isNotBlank(typeName)){
+				dto.setProdType(typeName);
+			}else {
+				dto.setProdType("蚊香");
+			}
 
 			QuantityDto quantityDto = new QuantityDto();
 			String workorderCode = dto.getWorkorderCode();
@@ -426,7 +432,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 			quantityDto.setMachineCode(machineCode);
 			//影响效率原因
 			String reasons = mesReportWorkMapper.getProductReason(quantityDto);
-			if(!reasons.equals(";;")&&StringUtils.isNotBlank(reasons)){
+			if(StringUtils.isNotBlank(reasons)&&!reasons.equals(";;")){
 				dto.setReason(reasons);
 			}
 
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 71f13f3f..2129a115 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
@@ -957,10 +957,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		SELECT
 			STRING_AGG(Reason, ';') AS Reasons
 		FROM
-			mes_report_work  where workorder_code = #{workorderCode} and del_flag = '0'
+			mes_report_work  where workorder_code = #{workorderCode} and del_flag = '0' and Reason is not null
 		GROUP BY
 			workorder_code;
 	</select>
+	<select id="getTypeName" resultType="java.lang.String">
+		select top 1 category from base_product_attached where product_code = #{productCode}
+	</select>
 
 	<insert id="insertMesReportWork" parameterType="MesReportWork">
 		insert into mes_report_work