From 7361313e08fa2f7a49706fd18194ad2e318e4210 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 18 Feb 2025 21:28:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/mes/service/impl/MesReportWorkServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 23fd92d6..e5637614 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
@@ -268,12 +268,12 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 			mesReportWork.setUpdateBy(updateBy);
 		}
         //统一备注
-        List<String> remarks = mesReportWorkMapper.getUnionRemark(mesReportWorks.get(0).getWorkorderCode());
-		if(!CollectionUtils.isEmpty(remarks)){
+//        List<String> remarks = mesReportWorkMapper.getUnionRemark(mesReportWorks.get(0).getWorkorderCode());
+//		if(!CollectionUtils.isEmpty(remarks)){
 			for(MesReportWork mesReportWork:mesReportWorks){
-				mesReportWork.setRemark(remarks.get(0));
+				mesReportWork.setRemark(mesReportWorks.get(0).getRemark());
 			}
-		}
+//		}
 		return mesReportWorkMapper.submitReportPS(mesReportWorks);
 	}