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

---
 .../Impl/WorkOrderAllocServiceImpl.java       | 10 ++---
 .../mapper/shopOrder/WorkOrderAllocMapper.xml | 38 +++++++++----------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/WorkOrderAllocServiceImpl.java b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/WorkOrderAllocServiceImpl.java
index 9cac9b5..dd37d82 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/WorkOrderAllocServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/WorkOrderAllocServiceImpl.java
@@ -238,11 +238,11 @@ public class WorkOrderAllocServiceImpl implements WorkOrderAllocService {
                             // 接口调用成功，更新SFDC表
                             String u8CCode = u8Response.getU8CCode();
                             for (UspWorkOrderAllocData item : groupItems) {
-                                workOrderAllocMapper.updateSfdcSyncedCode(
-                                        item.getSite(), 
-                                        item.getOrderNo(), 
-                                        item.getBatchNo(), 
-                                        u8CCode);
+//                                workOrderAllocMapper.updateSfdcSyncedCode( -- batchNo的原因，先注释掉
+//                                        item.getSite(),
+//                                        item.getOrderNo(),
+//                                        item.getBatchNo(),
+//                                        u8CCode);
                                 
                                 // 更新UspWorkOrderAlloc的同步成功信息
                                 workOrderAllocMapper.updateAllocSyncedSuccess(
diff --git a/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml b/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml
index 55a194a..5a54151 100644
--- a/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml
+++ b/src/main/resources/mapper/shopOrder/WorkOrderAllocMapper.xml
@@ -162,25 +162,23 @@
     <!-- 查询未传输的数据 -->
     <select id="selectUnSyncedData" parameterType="com.gaotao.modules.shopOrder.entity.UspWorkOrderAllocData" 
             resultType="com.gaotao.modules.shopOrder.entity.UspWorkOrderAllocData">
-        SELECT  
-            site,
-            orderNo,
-            batchNo,
-            erp_orderNo as erpOrderNo,
-            erp_orderLineNo as erpOrderLineNo,
-            rowNo,
-            operation_id as itemNo,
-            operator,
-            allocReportQty,
-            allocApproveQty,
-            allocScrapQty,
-            allocSetupTime,
-            allocManfTime,
-            allocBy,
-            allocDate,
-            synced_date as syncedDate,
-            synced_mes as syncedMes,
-            allocType
+        SELECT
+        site,
+        orderNo,
+        ROW_NUMBER() OVER (ORDER BY MAX(allocDate) ASC) AS batchNo,
+        erp_orderNo as erpOrderNo,
+        erp_orderLineNo as erpOrderLineNo,
+        ROW_NUMBER() OVER (ORDER BY MAX(allocDate) ASC) AS rowNo,
+        operation_id as itemNo,
+        operator,
+        SUM(ISNULL(allocReportQty,0)),
+        SUM(ISNULL(allocApproveQty,0)),
+        SUM(ISNULL(allocScrapQty,0)),
+        SUM(ISNULL(allocSetupTime,0)) allocSetupTime,
+        SUM(ISNULL(allocManfTime,0)) allocManfTime,
+        MAX(allocBy )AS allocBy,
+        MAX(allocDate) AS allocDate,
+        '' allocType
         FROM UspWorkOrderAlloc
         <where>
             AND (allocType = '产量未传输' OR allocType = '工时未传输')
@@ -194,7 +192,7 @@
                 AND orderNo = #{orderNo}
             </if>
         </where>
-        ORDER BY allocDate ASC
+        GROUP BY site , orderNo  , erp_orderNo , erp_orderLineNo  , operation_id , operator
     </select>
     
     <!-- 更新SFDC表的同步信息 -->