mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mula:5749d20c808231d6065dc6fe06243796c34b4ebd
Branches Tags
mula:dev_1.0.2
mula:dev_1.0.1
mula:dev_1.0.0
mula:master
..
compare: mula:f68242d2e705b5b7dbb8975d4e784596b110e93c
Branches Tags
mula:dev_1.0.2
mula:dev_1.0.1
mula:dev_1.0.0
mula:master

No commits in common. "5749d20c808231d6065dc6fe06243796c34b4ebd" and "f68242d2e705b5b7dbb8975d4e784596b110e93c" have entirely different histories.
5749d20c80 ... f68242d2e7

2 changed files with 10 additions and 14 deletions
Show Stats Expand all files Collapse all files

6
ruoyi-common/src/main/java/com/ruoyi/common/utils/ShiroUtils.java
View File

@ -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(103L); user.setUserId(101L);
user.setUserName("徐心钰"); user.setUserName("乐喽ch");
user.setLoginName("15168396014"); user.setLoginName("leoloch");
return user; return user;
} }

18
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java
View File

@ -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:15168396014}") @Value("${sip.nex.purchaser-username:xuxinyu}")
private String nexPurchaserUsername; private String nexPurchaserUsername;
@Value("${sip.nex.owner-id:103}") @Value("${sip.nex.owner-id:102}")
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,13 +151,9 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To
@Override @Override
public int insertOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder) public int insertOmsPurchaseOrder(OmsPurchaseOrder omsPurchaseOrder)
{ {
// 如果 ownerId 或 ownerName 为空，则使用当前登录用户 omsPurchaseOrder.setOwnerId(ShiroUtils.getSysUser().getUserId());
if (omsPurchaseOrder.getOwnerId() == null) { omsPurchaseOrder.setOwnerName(ShiroUtils.getSysUser().getUserName());
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
@ -626,7 +622,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(103L); user = userMapper.selectUserById(1L);
} }
omsPurchaseOrder.setPurchaserId(user.getUserId()); omsPurchaseOrder.setPurchaserId(user.getUserId());
omsPurchaseOrder.setPurchaserName(user.getUserName()); omsPurchaseOrder.setPurchaserName(user.getUserName());