WMS盘点管理创建人修改
This commit is contained in:
+13
-3
@@ -338,6 +338,15 @@ public class InvestigationManageImpl extends ServiceImpl<InvestigationManageMapp
|
||||
.eq(InvestigetionManageDetail::getInvestigationNumber, investigationManage.getInvestigationNumber())
|
||||
.eq(InvestigetionManageDetail::getDelFlag, 1)
|
||||
.ne(InvestigetionManageDetail::getInvestigationResult, 4));
|
||||
// 获取用户姓名(优先从UserPo获取,如果为空则使用realname,最后使用username作为兜底)
|
||||
final String userRealName =
|
||||
(loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null
|
||||
&& !loginUser.getUserPo().getUserName().trim().isEmpty())
|
||||
? loginUser.getUserPo().getUserName()
|
||||
: (loginUser.getRealname() != null && !loginUser.getRealname().trim().isEmpty())
|
||||
? loginUser.getRealname()
|
||||
: loginUser.getUsername();
|
||||
|
||||
String differentNumber = null;
|
||||
if (count > 0){
|
||||
//存在差异 生成差异单
|
||||
@@ -373,10 +382,11 @@ public class InvestigationManageImpl extends ServiceImpl<InvestigationManageMapp
|
||||
differentManage.setOrganizationName(userPo.getOrganizationName());
|
||||
differentManage.setCreateBy(loginUser.getUserid());
|
||||
differentManage.setCreateTime(new Date());
|
||||
differentManage.setCreateByName(loginUser.getUsername());
|
||||
// 差异单创建人/修改人使用用户姓名而不是账号
|
||||
differentManage.setCreateByName(userRealName);
|
||||
differentManage.setUpdateBy(loginUser.getUserid());
|
||||
differentManage.setUpdateTime(new Date());
|
||||
differentManage.setUpdateByName(loginUser.getUsername());
|
||||
differentManage.setUpdateByName(userRealName);
|
||||
iDifferentManageService.insert(differentManage);
|
||||
}
|
||||
//生成盘点追溯记录
|
||||
@@ -386,7 +396,7 @@ public class InvestigationManageImpl extends ServiceImpl<InvestigationManageMapp
|
||||
investigationManageUpdate.setInvestigationStatus(4); // 盘点完成
|
||||
investigationManageUpdate.setUpdateBy(loginUser.getUserid());
|
||||
investigationManageUpdate.setUpdateTime(new Date());
|
||||
investigationManageUpdate.setUpdateByName(loginUser.getUsername());
|
||||
investigationManageUpdate.setUpdateByName(userRealName);
|
||||
investigationManageUpdate.setDifferentNumber(differentNumber);
|
||||
return this.updateById(investigationManageUpdate);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user