From 59c913b03831ffa62fe4a4724e74aad1c44b9356 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 23:29:49 +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/WcsTaskServiceImpl.java      | 20 +++++++++----------
 .../task/WcsTaskScheduler.java                |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java
index 12360a1..355a9ac 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java
@@ -319,8 +319,16 @@ public class WcsTaskServiceImpl implements WcsTaskService {
      */
     private String processPickupNotification(WcsCallbackTask callbackTask) {
         System.out.println("开始处理取货通知 - rqrq，palletId=" + callbackTask.getPalletId() + ", toStation=" + callbackTask.getToStation());
-        
+
         try {
+            // 2. 更新托盘calling_flag为N - rqrq
+            wcsIntegrationMapper.updatePalletCallingFlag(callbackTask.getSite(), callbackTask.getPalletId(), "N", "SYS_WMS");
+
+            // 3. 更新站点状态为有货 - rqrq
+            wcsIntegrationMapper.updateAgvStationStatus(callbackTask.getToStation(), 1, "有货");
+
+            // 4. 更新托盘位置 - rqrq
+            wcsIntegrationMapper.updatePalletLocationCode(callbackTask.getSite(), callbackTask.getPalletId(), callbackTask.getToStation());
             // 1. 更新订单任务状态 - rqrq
             if (callbackTask.getTaskNo() != null && callbackTask.getItemNo() != null) {
                 WmsOrderTask orderTask = wcsIntegrationMapper.findOrderTasksByTaskNoItem(
@@ -493,15 +501,7 @@ public class WcsTaskServiceImpl implements WcsTaskService {
                     System.out.println("栈板{}已有预约任务，无需创建配送任务 - rqrq：taskNo=" + checkIfHasNeedTask.getTaskNo());
                 }
             }
-            
-            // 2. 更新托盘calling_flag为N - rqrq
-            wcsIntegrationMapper.updatePalletCallingFlag(callbackTask.getSite(), callbackTask.getPalletId(), "N", "SYS_WMS");
-            
-            // 3. 更新站点状态为有货 - rqrq
-            wcsIntegrationMapper.updateAgvStationStatus(callbackTask.getToStation(), 1, "有货");
-            
-            // 4. 更新托盘位置 - rqrq
-            wcsIntegrationMapper.updatePalletLocationCode(callbackTask.getSite(), callbackTask.getPalletId(), callbackTask.getToStation());
+
             
             System.out.println("处理取货通知完成 - rqrq，palletId=" + callbackTask.getPalletId());
             return "取货通知处理成功";
diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/task/WcsTaskScheduler.java b/src/main/java/com/gaotao/modules/automatedWarehouse/task/WcsTaskScheduler.java
index 9cf1654..c6ccf01 100644
--- a/src/main/java/com/gaotao/modules/automatedWarehouse/task/WcsTaskScheduler.java
+++ b/src/main/java/com/gaotao/modules/automatedWarehouse/task/WcsTaskScheduler.java
@@ -49,7 +49,7 @@ public class WcsTaskScheduler {
      * cron表达式：0 * * * * ? 表示每分钟的第0秒执行
      * 配置说明：通过 scheduler.wcs.enabled 控制是否启用
      */
-    @Scheduled(cron = "5/10 * * * * ?")
+    @Scheduled(cron = "4/10 * * * * ?")
     public void scheduleWcsTaskProcessing() {
         // 检查定时任务开关
         // if (!enabled) {