feat(sip):bug修改,人员调整
parent
2fdbafa0c3
commit
a7e4d9c1f4
|
|
@ -71,9 +71,9 @@ public class ShiroUtils {
|
||||||
// 从数据库加载用户信息
|
// 从数据库加载用户信息
|
||||||
// 例如: select * from sys_user where user_id = ?
|
// 例如: select * from sys_user where user_id = ?
|
||||||
SysUser user = new SysUser();
|
SysUser user = new SysUser();
|
||||||
user.setUserId(101L);
|
user.setUserId(103L);
|
||||||
user.setUserName("乐喽ch");
|
user.setUserName("徐心钰");
|
||||||
user.setLoginName("leoloch");
|
user.setLoginName("15168396014");
|
||||||
return user;
|
return user;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -84,13 +84,13 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
|
||||||
@Value("${sip.nex.vendor-code:P100}")
|
@Value("${sip.nex.vendor-code:P100}")
|
||||||
private String nexVendorCode;
|
private String nexVendorCode;
|
||||||
|
|
||||||
@Value("${sip.nex.purchaser-username:xuxinyu}")
|
@Value("${sip.nex.purchaser-username:15168396014}")
|
||||||
private String nexPurchaserUsername;
|
private String nexPurchaserUsername;
|
||||||
|
|
||||||
@Value("${sip.nex.owner-id:102}")
|
@Value("${sip.nex.owner-id:103}")
|
||||||
private Long nexOwnerId;
|
private Long nexOwnerId;
|
||||||
|
|
||||||
@Value("${sip.nex.owner-name:叶宇豪}")
|
@Value("${sip.nex.owner-name:徐心钰}")
|
||||||
private String nexOwnerName;
|
private String nexOwnerName;
|
||||||
|
|
||||||
@Value("${sip.nex.warehouse-id:3}")
|
@Value("${sip.nex.warehouse-id:3}")
|
||||||
|
|
@ -151,9 +151,13 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
|
||||||
@Override
|
@Override
|
||||||
public int insertOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder)
|
public int insertOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder)
|
||||||
{
|
{
|
||||||
omsPurchaseOrder.setOwnerId(ShiroUtils.getSysUser().getUserId());
|
// 如果 ownerId 或 ownerName 为空,则使用当前登录用户
|
||||||
omsPurchaseOrder.setOwnerName(ShiroUtils.getSysUser().getUserName());
|
if (omsPurchaseOrder.getOwnerId() == null) {
|
||||||
|
omsPurchaseOrder.setOwnerId(ShiroUtils.getSysUser().getUserId());
|
||||||
|
}
|
||||||
|
if (omsPurchaseOrder.getOwnerName() == null) {
|
||||||
|
omsPurchaseOrder.setOwnerName(ShiroUtils.getSysUser().getUserName());
|
||||||
|
}
|
||||||
omsPurchaseOrder.setCreateTime(DateUtils.getNowDate());
|
omsPurchaseOrder.setCreateTime(DateUtils.getNowDate());
|
||||||
omsPurchaseOrder.setPurchaseNo(generatePurchaseNo(omsPurchaseOrder.getVendorId()));
|
omsPurchaseOrder.setPurchaseNo(generatePurchaseNo(omsPurchaseOrder.getVendorId()));
|
||||||
// 设置初始版本号为 1
|
// 设置初始版本号为 1
|
||||||
|
|
@ -622,7 +626,7 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
|
||||||
// 采购员:userName=徐心钰
|
// 采购员:userName=徐心钰
|
||||||
SysUser user = userMapper.selectUserByLoginName(nexPurchaserUsername);
|
SysUser user = userMapper.selectUserByLoginName(nexPurchaserUsername);
|
||||||
if(user == null){
|
if(user == null){
|
||||||
user = userMapper.selectUserById(1L);
|
user = userMapper.selectUserById(103L);
|
||||||
}
|
}
|
||||||
omsPurchaseOrder.setPurchaserId(user.getUserId());
|
omsPurchaseOrder.setPurchaserId(user.getUserId());
|
||||||
omsPurchaseOrder.setPurchaserName(user.getUserName());
|
omsPurchaseOrder.setPurchaserName(user.getUserName());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue