WMS入库管理的创建人姓名,审核人姓名修改存账号的姓名
This commit is contained in:
+11
-3
@@ -133,6 +133,10 @@ public class InMaterialDetailImpl extends ServiceImpl<InMaterialDetailMapper, In
|
||||
throw new ServiceException("物料明细不能为空");
|
||||
}
|
||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||
// 获取用户姓名(优先从UserPo获取,如果为空则使用realname,最后使用username作为兜底)
|
||||
String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null
|
||||
? loginUser.getUserPo().getUserName()
|
||||
: (loginUser.getRealname() != null ? loginUser.getRealname() : loginUser.getUsername());
|
||||
// 批量新增或修改
|
||||
List<InMaterialDetail> inMaterialDetailList = new ArrayList<>();
|
||||
for (InMaterialDetailDO inMaterialDetailDO : inMaterialDetailDOList){
|
||||
@@ -145,7 +149,7 @@ public class InMaterialDetailImpl extends ServiceImpl<InMaterialDetailMapper, In
|
||||
inMaterialDetail.setInOrderNumber(inOrderNumber);
|
||||
inMaterialDetail.setLevel(1);
|
||||
inMaterialDetail.setCreateBy(loginUser.getUserid());
|
||||
inMaterialDetail.setCreateByName(loginUser.getUsername());
|
||||
inMaterialDetail.setCreateByName(userRealName);
|
||||
inMaterialDetail.setCreateTime(new Date());
|
||||
// 新增入库单明细时,如果计划数量为空,则使用入库数量作为计划数量
|
||||
if (inMaterialDetail.getQuantity() == null && inMaterialDetailDO.getInboundQuantity() != null) {
|
||||
@@ -171,6 +175,10 @@ public class InMaterialDetailImpl extends ServiceImpl<InMaterialDetailMapper, In
|
||||
throw new ServiceException("物料明细不能为空");
|
||||
}
|
||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||
// 获取用户姓名(优先从UserPo获取,如果为空则使用realname,最后使用username作为兜底)
|
||||
String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null
|
||||
? loginUser.getUserPo().getUserName()
|
||||
: (loginUser.getRealname() != null ? loginUser.getRealname() : loginUser.getUsername());
|
||||
|
||||
// 查询所有记录(包括已删除的),用于判断是否需要恢复已删除的记录
|
||||
List<InMaterialDetail> inMaterialDetailDbAllList = inMaterialDetailMapper.selectList(new QueryWrapper<InMaterialDetail>().lambda()
|
||||
@@ -218,7 +226,7 @@ public class InMaterialDetailImpl extends ServiceImpl<InMaterialDetailMapper, In
|
||||
}else {
|
||||
BeanUtils.copyProperties(inMaterialDetailDO, inMaterialDetail);
|
||||
inMaterialDetail.setUpdateBy(loginUser.getUserid());
|
||||
inMaterialDetail.setUpdateByName(loginUser.getUsername());
|
||||
inMaterialDetail.setUpdateByName(userRealName);
|
||||
inMaterialDetail.setUpdateTime(new Date());
|
||||
materialDetailIdsByUpdate.add(inMaterialDetailDO.getMaterialDetailId());
|
||||
}
|
||||
@@ -234,7 +242,7 @@ public class InMaterialDetailImpl extends ServiceImpl<InMaterialDetailMapper, In
|
||||
update(new UpdateWrapper<InMaterialDetail>().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));
|
||||
}
|
||||
|
||||
+6
-2
@@ -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<StockInOrder>().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()));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user