weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WMS出库管理、拣货管理、出库交接、出库异常、拣货作业单的创建人姓名，审核人姓名修改存账号的姓名

Browse Source
This commit is contained in:
秦鸿展
2026-03-03 16:06:40 +08:00
parent 7e3228807b
commit 849b8da2dc
10 changed files with 162 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockOutOrder/StockOutOrderAssembler.java
+16 -4
View File
@@ -48,22 +48,34 @@ public class StockOutOrderAssembler {
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(stockOutOrderDTO.getOutOrderId() != null){
stockOutOrderDO.setUpdateBy(userId);
stockOutOrderDO.setUpdateByName(userName);
stockOutOrderDO.setUpdateByName(userRealName);
stockOutOrderDO.setUpdateTime(new Date());
}else {
stockOutOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
stockOutOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockOutOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
stockOutOrderDO.setCreateBy(userId);
stockOutOrderDO.setCreateByName(userName);
stockOutOrderDO.setCreateByName(userRealName);
stockOutOrderDO.setCreateTime(new Date());
stockOutOrderDO.setUpdateBy(userId);
stockOutOrderDO.setUpdateByName(userName);
stockOutOrderDO.setUpdateByName(userRealName);
stockOutOrderDO.setUpdateTime(new Date());
stockOutOrderDO.setDelFlag(1);
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockOutTaskOrder/StockOutTaskOrderAssembler.java
+12 -3
View File
@@ -52,19 +52,28 @@ public class StockOutTaskOrderAssembler {
if (ObjectUtil.isNull(loginUser)) {
throw new DigitalLogisticsException(UserError.TIMEOUT);
}
String userName = loginUser.getUsername();
// 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底）
String userRealName = null;
if (loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null
&& !loginUser.getUserPo().getUserName().trim().isEmpty()) {
userRealName = loginUser.getUserPo().getUserName();
} else if (loginUser.getRealname() != null && !loginUser.getRealname().trim().isEmpty()) {
userRealName = loginUser.getRealname();
} else {
userRealName = loginUser.getUsername();
}
// 获取登录人id
Long userId = loginUser.getUserid();
if(stockOutTaskOrderDTO.getOutTaskOrderId() != null){
stockOutTaskOrderDO.setUpdateBy(userId);
stockOutTaskOrderDO.setUpdateByName(userName);
stockOutTaskOrderDO.setUpdateByName(userRealName);
stockOutTaskOrderDO.setUpdateTime(new Date());
}else {
stockOutTaskOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
stockOutTaskOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockOutTaskOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
stockOutTaskOrderDO.setCreateBy(userId);
stockOutTaskOrderDO.setCreateByName(userName);
stockOutTaskOrderDO.setCreateByName(userRealName);
stockOutTaskOrderDO.setCreateTime(new Date());
stockOutTaskOrderDO.setDelFlag(1);
}