From 3990a3fcaf06d99da126331a5c158cecf5b27523 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: Tue, 22 Sep 2026 18:04:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=A7=BB=E5=BA=93=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/other/service/impl/InventoryMoveServiceImpl.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java b/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java
index 947fa2ab..a872f10d 100644
--- a/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java
@@ -968,9 +968,12 @@ public class InventoryMoveServiceImpl implements InventoryMoveService {
 
         String username="CCL_AGV_USER";
         try {
+            // PDA手工移库保留当前登录用户名作为IFS操作账号；取不到登录用户时按移库分组site兜底 - rqrq
             username = ((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUsername();
         } catch (Exception e) {
-            username="CCL_AGV_USER";
+            // 自动任务无登录用户：54及其子site使用海安账号，55及其他site保留原账号；不改变本地单据操作人 - rqrq
+            username = group != null && group.site != null && group.site.trim().startsWith("54")
+                    ? "haian_agv" : "CCL_AGV_USER";
         }
 
         try {