From 5c84eb2095892ec95a52ca9bc09db4c311c3fc98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Tue, 3 Mar 2026 14:42:35 +0800 Subject: [PATCH] =?UTF-8?q?WMS=E5=85=A5=E5=BA=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9A=84=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=A7=93=E5=90=8D=EF=BC=8C?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BA=BA=E5=A7=93=E5=90=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AD=98=E8=B4=A6=E5=8F=B7=E7=9A=84=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/web/domain/BaseVOEntity.java | 2 +- .../StockInOrderApplicationService.java | 15 ++++++++++++++- .../persistence/InMaterialDetailImpl.java | 14 +++++++++++--- .../service/StockInOrderDomainService.java | 8 ++++++-- .../stockInOrder/StockInOrderAssembler.java | 19 ++++++++++++++++--- 5 files changed, 48 insertions(+), 10 deletions(-) diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/web/domain/BaseVOEntity.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/web/domain/BaseVOEntity.java index ab659f2ad..c8cb909a3 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/web/domain/BaseVOEntity.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/web/domain/BaseVOEntity.java @@ -32,7 +32,7 @@ public class BaseVOEntity implements Serializable @ApiModelProperty(value = "更新者") private Long updateBy; - @ApiModelProperty(name = "创建者姓名") + @ApiModelProperty(name = "更新人姓名") private String updateByName; @ApiModelProperty(value = "更新时间") diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 52393333c..175acfb0f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -1142,7 +1142,20 @@ public class StockInOrderApplicationService { order.setOrganizationName(loginUser.getUserPo().getOrganizationName()); order.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); order.setCreateBy(loginUser.getUserid()); - order.setCreateByName(loginUser.getUsername()); + // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底） + String userRealName = null; + if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null + && !loginUser.getUserPo().getUserName().trim().isEmpty()) { + // 优先使用UserPo中的userName（用户真实姓名） + userRealName = loginUser.getUserPo().getUserName(); + } else if (loginUser.getRealname() != null && !loginUser.getRealname().trim().isEmpty()) { + // 其次使用realname + userRealName = loginUser.getRealname(); + } else { + // 最后使用username（账号）作为兜底 + userRealName = loginUser.getUsername(); + } + order.setCreateByName(userRealName); // 设置创建时间为当前时间 order.setCreateTime(new Date()); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/persistence/InMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/persistence/InMaterialDetailImpl.java index 8236b5e2a..f95edc930 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/persistence/InMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/persistence/InMaterialDetailImpl.java @@ -133,6 +133,10 @@ public class InMaterialDetailImpl extends ServiceImpl inMaterialDetailList = new ArrayList<>(); for (InMaterialDetailDO inMaterialDetailDO : inMaterialDetailDOList){ @@ -145,7 +149,7 @@ public class InMaterialDetailImpl extends ServiceImpl inMaterialDetailDbAllList = inMaterialDetailMapper.selectList(new QueryWrapper().lambda() @@ -218,7 +226,7 @@ public class InMaterialDetailImpl extends ServiceImpl().lambda() .set(InMaterialDetail::getDelFlag, 2) .set(InMaterialDetail::getUpdateBy, loginUser.getUserid()) - .set(InMaterialDetail::getUpdateByName, loginUser.getUsername()) + .set(InMaterialDetail::getUpdateByName, userRealName) .set(InMaterialDetail::getUpdateTime, new Date()) .in(InMaterialDetail::getMaterialDetailId, materialDetailIdsByDb)); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index de3cc88a6..f1d320bb4 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -373,15 +373,19 @@ public class StockInOrderDomainService { if (stockInOrderDO.getAuditStatus() == 3){ auditApprove(stockInOrderDO); } + // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底） + String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null + ? loginUser.getUserPo().getUserName() + : (loginUser.getRealname() != null ? loginUser.getRealname() : loginUser.getUsername()); return stockInOrderService.update(null, new UpdateWrapper().lambda() .set(3 == stockInOrderDO.getAuditStatus(), StockInOrder::getStatus, 2) .set(StockInOrder::getAuditStatus, stockInOrderDO.getAuditStatus()) .set(StockInOrder::getAuditRemark, stockInOrderDO.getAuditRemark()) .set(StockInOrder::getAuditBy, loginUser.getUserid()) - .set(StockInOrder::getAuditByName, loginUser.getUsername()) + .set(StockInOrder::getAuditByName, userRealName) .set(StockInOrder::getAuditTime, new Date()) .set(StockInOrder::getUpdateBy, loginUser.getUserid()) - .set(StockInOrder::getUpdateByName, loginUser.getUsername()) + .set(StockInOrder::getUpdateByName, userRealName) .set(StockInOrder::getUpdateTime, new Date()) .in(StockInOrder::getInOrderId, stockInOrderDO.getInOrderIds())); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockInOrder/StockInOrderAssembler.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockInOrder/StockInOrderAssembler.java index 2c741d1cf..6ddd1e5cc 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockInOrder/StockInOrderAssembler.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockInOrder/StockInOrderAssembler.java @@ -56,19 +56,32 @@ public class StockInOrderAssembler { if (ObjectUtil.isNull(loginUser)) { throw new DigitalLogisticsException(UserError.TIMEOUT); } - String userName = loginUser.getUsername(); // 获取登录人id Long userId = loginUser.getUserid(); + // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底） + String userRealName = null; + if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null + && !loginUser.getUserPo().getUserName().trim().isEmpty()) { + // 优先使用UserPo中的userName（用户真实姓名） + userRealName = loginUser.getUserPo().getUserName(); + } else if (loginUser.getRealname() != null && !loginUser.getRealname().trim().isEmpty()) { + // 其次使用realname + userRealName = loginUser.getRealname(); + } else { + // 最后使用username（账号）作为兜底 + userRealName = loginUser.getUsername(); + } if(stockInOrderDTO.getInOrderId() != null){ stockInOrderDO.setUpdateBy(userId); - stockInOrderDO.setUpdateByName(userName); + stockInOrderDO.setUpdateByName(userRealName); stockInOrderDO.setUpdateTime(new Date()); }else { stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); stockInOrderDO.setCreateBy(userId); - stockInOrderDO.setCreateByName(userName); + // 强制设置创建人姓名为用户真实姓名，确保覆盖前端可能传递的账号 + stockInOrderDO.setCreateByName(userRealName); stockInOrderDO.setCreateTime(new Date()); stockInOrderDO.setDelFlag(1); // 新增入库单时，如果入库单类型为空，默认设置为普通入库