From 831acad31c15fd80764c81789919764b1281f0b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Thu, 30 Oct 2025 01:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=86=E6=8B=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AutoSortServiceImpl.java     | 19 ++++++++++++-------
 .../impl/WcsIntegrationServiceImpl.java       |  3 ++-
 .../WcsIntegrationMapper.xml                  |  8 +++++---
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AutoSortServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AutoSortServiceImpl.java
index 1f3a818..09de513 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AutoSortServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/AutoSortServiceImpl.java
@@ -170,16 +170,16 @@ public class AutoSortServiceImpl implements AutoSortService {
                 
                 // 更新SOIssueNotifyOrderMaterialList_detail的out_wcs_flag为Y - rqrq
                 try {
-                    wcsIntegrationMapper.updateSOIssueNotifyDetailOutWcsFlagByTask(
-                        callback.getSite(), callback.getTaskNo(), callback.getItemNo(), detail.serialNo);
-                    System.out.println("更新out_wcs_flag成功 - rqrq：taskNo=" + callback.getTaskNo() + 
-                                       ", itemNo=" + callback.getItemNo() + ", serialNo=" + detail.serialNo);
-                    
+                    // wcsIntegrationMapper.updateSOIssueNotifyDetailOutWcsFlagByTask(
+                    //     callback.getSite(), callback.getTaskNo(), callback.getItemNo(), detail.serialNo);
+                    // System.out.println("更新out_wcs_flag成功 - rqrq：taskNo=" + callback.getTaskNo() +
+                    //                    ", itemNo=" + callback.getItemNo() + ", serialNo=" + detail.serialNo);
+                    //这边不应该处理out_wcs_flag  会影响下面数据
                     // 记录处理成功的序列号 - rqrq
                     processedSerialNos.add(detail.serialNo);
                 } catch (Exception ex) {
                     // 更新失败不影响主流程，只打印日志 - rqrq
-                    System.err.println("更新out_wcs_flag失败 - rqrq：" + ex.getMessage());
+                    // System.err.println("更新out_wcs_flag失败 - rqrq：" + ex.getMessage());
                 }
             }
             
@@ -254,7 +254,12 @@ public class AutoSortServiceImpl implements AutoSortService {
                     ex.printStackTrace();
                 }
             }
-            
+            for (IncrementalDetail detail : incrementalDetails) {
+                wcsIntegrationMapper.updateSOIssueNotifyDetailOutWcsFlagByTask(
+                    callback.getSite(), callback.getTaskNo(), callback.getItemNo(), detail.serialNo);
+                System.out.println("更新out_wcs_flag成功 - rqrq：taskNo=" + callback.getTaskNo() +
+                                   ", itemNo=" + callback.getItemNo() + ", serialNo=" + detail.serialNo);
+            }
             // 9. 更新空栈板标记 - rqrq
             wcsIntegrationMapper.updatePalletEmptyFlag(callback.getSite(), targetPalletId, "N", username);
             ScheduleDeliveryTask scheduleDeliveryTask = new ScheduleDeliveryTask();
diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
index 9c4676b..2d0012b 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java
@@ -1714,7 +1714,8 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
         }
 
         // 检查是否可操作（必须是正式站点）- rqrq
-        if (!"Y".equals(palletInfo.getCanOperate())) {
+        if (!"Y".equals(palletInfo.getCanOperate())&&"N".equals(palletInfo.getIsEmpty())) {
+
             throw new RuntimeException("当前站点位置不可变更");
         }
 
diff --git a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
index df4b83e..3b27f8e 100644
--- a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
+++ b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
@@ -534,9 +534,10 @@
         UPDATE SOIssueNotifyOrderMaterialList_detail
         SET out_wcs_flag = 'Y'
         WHERE site = #{site}
-          AND task_ref = #{taskRef}
-          AND task_item = #{taskItem}
+<!--          AND task_ref = #{taskRef}-->
+<!--          AND task_item = #{taskItem}-->
           AND serialNo = #{serialNo}
+        and  out_wcs_flag = 'N'
     </update>
     
     <!-- rqrq - 根据序列号列表查询SOIssueNotifyOrderMaterialList_detail明细 -->
@@ -1012,7 +1013,7 @@
           AND active = 'Y'
           AND station_type = '正式站点'
           AND status_db = 0
-        ORDER BY station_id
+        ORDER BY id
     </select>
 
     <!-- ==================== 手工移动托盘相关SQL - rqrq ==================== -->
@@ -1024,6 +1025,7 @@
             p.location_code AS currentStationCode,
             s.station_type AS stationType,
             s.station_id as  currentStationId,
+            p.empty_flag as isEmpty ,
             CASE 
                 WHEN p.location_code IS NULL THEN 'Y'
                 WHEN s.station_type = '正式站点' THEN 'Y'