From 293306863ba9cc3c4cfd56d916ac869b5d434f7a Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 4 Jun 2026 11:47:48 +0800
Subject: [PATCH] =?UTF-8?q?2026-06-04=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml b/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml
index 022d4bb..e006781 100644
--- a/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml
+++ b/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml
@@ -177,7 +177,7 @@
         SUM(ISNULL(allocSetupTime,0)) allocSetupTime,
         SUM(ISNULL(allocManfTime,0)) allocManfTime,
         MAX(allocBy )AS allocBy,
-        ReportDate AS allocDate,
+        MAX(ReportDate) AS allocDate,
         '' allocType
         FROM UspWorkOrderAlloc
         <where>
@@ -192,7 +192,7 @@
                 AND orderNo = #{orderNo}
             </if>
         </where>
-        GROUP BY site , orderNo  , erp_orderNo , erp_orderLineNo  , operation_id , operator , ReportDate
+        GROUP BY site , orderNo  , erp_orderNo , erp_orderLineNo  , operation_id , operator
     </select>
     
     <!-- 更新SFDC表的同步信息 -->