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 {