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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
zhou-hongcheng
2026-03-03 16:30:32 +08:00
parent 02c8e16242 849b8da2dc
commit 44982e97c6
21 changed files with 299 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/web/domain/BaseVOEntity.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class BaseVOEntity implements Serializable
@ApiModelProperty(value = "更新者")
private Long updateBy;
@ApiModelProperty(name = "创建者姓名")
@ApiModelProperty(name = "更新人姓名")
private String updateByName;
@ApiModelProperty(value = "更新时间")
mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java
+14 -1
View File
@@ -1142,7 +1142,20 @@ public class StockInOrderApplicationService {
order.setOrganizationName(loginUser.getUserPo().getOrganizationName());
order.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
order.setCreateBy(loginUser.getUserid());
order.setCreateByName(loginUser.getUsername());
// 获取用户姓名（优先从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();
}
order.setCreateByName(userRealName);
// 设置创建时间为当前时间
order.setCreateTime(new Date());
mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java
+16 -9
View File
@@ -783,15 +783,22 @@ public class StockReceiptOrderApplicationService {
receiptMaterialDetailDOList.forEach(receiptMaterialDetailDO -> {
List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList1 = receiptMaterialDetailDO.getChildren();
if (receiptMaterialDetailDOChildrenList1 != null && receiptMaterialDetailDOChildrenList1.size() > 0) {
ReceiptMaterialDetailDO receiptMaterialDetailDOChildren = receiptMaterialDetailDOChildrenList1.stream().filter(p -> 1 == p.getLevel()).collect(Collectors.toList()).get(0);
receiptMaterialDetailDO.setMaterialDetailId(receiptMaterialDetailDOChildren.getMaterialDetailId());
receiptMaterialDetailDO.setReceiptQuantity(receiptMaterialDetailDOChildren.getReceiptQuantity());
receiptMaterialDetailDO.setMaterialStatusCode(receiptMaterialDetailDOChildren.getMaterialStatusCode());
receiptMaterialDetailDO.setBatchNumber(receiptMaterialDetailDOChildren.getBatchNumber());
receiptMaterialDetailDO.setContainerId(receiptMaterialDetailDOChildren.getContainerId());
receiptMaterialDetailDO.setLevel(receiptMaterialDetailDOChildren.getLevel());
receiptMaterialDetailDO.setMaterialMoreDetailList(receiptMaterialDetailDOChildren.getMaterialMoreDetailList());
receiptMaterialDetailDO.setMaterialDetailSerialNumberList(receiptMaterialDetailDOChildren.getMaterialDetailSerialNumberList());
//ReceiptMaterialDetailDO receiptMaterialDetailDOChildren = receiptMaterialDetailDOChildrenList1.stream().filter(p -> 1 == p.getLevel()).collect(Collectors.toList()).get(0);
ReceiptMaterialDetailDO receiptMaterialDetailDOChildren =
receiptMaterialDetailDOChildrenList1.stream()
.filter(p -> 1 == p.getLevel())
.findFirst() // 返回 Optional<ReceiptMaterialDetailDO>
.orElse(null); // 没有符合条件的元素时返回null（也可以自定义默认值）
if (receiptMaterialDetailDOChildren != null) {
receiptMaterialDetailDO.setMaterialDetailId(receiptMaterialDetailDOChildren.getMaterialDetailId());
receiptMaterialDetailDO.setReceiptQuantity(receiptMaterialDetailDOChildren.getReceiptQuantity());
receiptMaterialDetailDO.setMaterialStatusCode(receiptMaterialDetailDOChildren.getMaterialStatusCode());
receiptMaterialDetailDO.setBatchNumber(receiptMaterialDetailDOChildren.getBatchNumber());
receiptMaterialDetailDO.setContainerId(receiptMaterialDetailDOChildren.getContainerId());
receiptMaterialDetailDO.setLevel(receiptMaterialDetailDOChildren.getLevel());
receiptMaterialDetailDO.setMaterialMoreDetailList(receiptMaterialDetailDOChildren.getMaterialMoreDetailList());
receiptMaterialDetailDO.setMaterialDetailSerialNumberList(receiptMaterialDetailDOChildren.getMaterialDetailSerialNumberList());
}
//只留二级
List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList2 = receiptMaterialDetailDOChildrenList1.stream().filter(p -> 2 == p.getLevel()).collect(Collectors.toList());
receiptMaterialDetailDO.setChildren(receiptMaterialDetailDOChildrenList2);
mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java
+9 -2
View File
@@ -307,6 +307,13 @@ public class HandoverTaskOrderDomainService {
private void genDeliveTask(List<HandoverTaskOrder> handoverTaskOrders, HandoverTaskOrderDO handoverTaskOrderDO) {
LoginUser loginUser = SecurityUtils.getLoginUser();
// 获取用户姓名（优先从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();
List<DeliveTaskDO> deliveTaskDOList = new ArrayList<>();
for (HandoverTaskOrder handoverTaskOrder : handoverTaskOrders) {
DeliveTaskDO deliveTaskDO = new DeliveTaskDO();
@@ -321,12 +328,12 @@ public class HandoverTaskOrderDomainService {
deliveTaskDO.setTaskType(7);
deliveTaskDO.setTaskDistribution(1);
deliveTaskDO.setTaskDistributionId(loginUser.getUserid());
deliveTaskDO.setTaskDistributionName(loginUser.getUsername());
deliveTaskDO.setTaskDistributionName(userRealName);
deliveTaskDO.setTaskDistributionTime(new Date());
deliveTaskDO.setOperatorsBy(handoverTaskOrderDO.getOperatorsBy());
deliveTaskDO.setOperatorsName(handoverTaskOrderDO.getOperatorsName());
deliveTaskDO.setCreateBy(loginUser.getUserid());
deliveTaskDO.setCreateByName(loginUser.getUsername());
deliveTaskDO.setCreateByName(userRealName);
deliveTaskDO.setCreateTime(new Date());
deliveTaskDOList.add(deliveTaskDO);
}
mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/persistence/InMaterialDetailImpl.java
+11 -3
View File
@@ -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));
}
mhd_wms/src/main/java/com/mhd/wms/domain/inOrderAbnormal/repository/persistence/InOrderAbnormalImpl.java
+16 -2
View File
@@ -140,6 +140,13 @@ public class InOrderAbnormalImpl extends ServiceImpl<InOrderAbnormalMapper, InOr
*/
private List<InOrderAbnormal> genShelfOrderMaterialDetailList(InOrderAbnormalBaseDO inOrderAbnormalBaseDO, List<ShelfMaterialDetail> shelfMaterialDetailList){
LoginUser loginUser = SecurityUtils.getLoginUser();
// 获取用户姓名（优先从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();
List<InOrderAbnormal> inOrderAbnormalList = new ArrayList<>();
for (ShelfMaterialDetail shelfMaterialDetail : shelfMaterialDetailList){
//上架
@@ -165,7 +172,7 @@ public class InOrderAbnormalImpl extends ServiceImpl<InOrderAbnormalMapper, InOr
inOrderAbnormal.setAllowActualQuantity(shelfMaterialDetail.getQuantity());
inOrderAbnormal.setAbnormalActualQuantity(shelfMaterialDetail.getShelvesQuantity().subtract(shelfMaterialDetail.getQuantity()));
inOrderAbnormal.setCreateBy(loginUser.getUserid());
inOrderAbnormal.setCreateByName(loginUser.getUsername());
inOrderAbnormal.setCreateByName(userRealName);
inOrderAbnormal.setCreateTime(new Date());
inOrderAbnormal.setType(2);
inOrderAbnormalList.add(inOrderAbnormal);
@@ -184,6 +191,13 @@ public class InOrderAbnormalImpl extends ServiceImpl<InOrderAbnormalMapper, InOr
*/
private List<InOrderAbnormal> genReceiptOrderMaterialDetailList(InOrderAbnormalBaseDO inOrderAbnormalBaseDO, List<ReceiptMaterialDetail> receiptMaterialDetailList){
LoginUser loginUser = SecurityUtils.getLoginUser();
// 获取用户姓名（优先从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();
List<InOrderAbnormal> inOrderAbnormalList = new ArrayList<>();
for (ReceiptMaterialDetail receiptMaterialDetail : receiptMaterialDetailList){
//收货
@@ -203,7 +217,7 @@ public class InOrderAbnormalImpl extends ServiceImpl<InOrderAbnormalMapper, InOr
lessAbnormalSmallParams(receiptMaterialDetail, inOrderAbnormal);
}
inOrderAbnormal.setCreateBy(loginUser.getUserid());
inOrderAbnormal.setCreateByName(loginUser.getUsername());
inOrderAbnormal.setCreateByName(userRealName);
inOrderAbnormal.setCreateTime(new Date());
inOrderAbnormal.setType(1);
inOrderAbnormalList.add(inOrderAbnormal);
mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java
+8 -1
View File
@@ -153,6 +153,13 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
}
LoginUser loginUser = SecurityUtils.getLoginUser();
// 批量新增或修改
// 获取用户姓名（优先从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();
List<OutMaterialDetail> outMaterialDetailList = new ArrayList<>();
for (OutMaterialDetailDO outMaterialDetailDO : outMaterialDetailDOList){
OutMaterialDetail outMaterialDetail = new OutMaterialDetail();
@@ -163,7 +170,7 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
outMaterialDetail.setOrganizationId(loginUser.getUserPo().getOrganizationId());
outMaterialDetail.setOrganizationName(loginUser.getUserPo().getOrganizationName());
outMaterialDetail.setCreateBy(loginUser.getUserid());
outMaterialDetail.setCreateByName(loginUser.getUsername());
outMaterialDetail.setCreateByName(userRealName);
outMaterialDetail.setCreateTime(new Date());
outMaterialDetail.setQuantity(outMaterialDetail.getOutboundQuantity());
String materialNo = outMaterialDetail.getMaterialNo();
mhd_wms/src/main/java/com/mhd/wms/domain/outOrderAbnormal/repository/persistence/OutOrderAbnormalImpl.java
+16 -2
View File
@@ -139,6 +139,13 @@ public class OutOrderAbnormalImpl extends ServiceImpl<OutOrderAbnormalMapper, Ou
*/
private List<OutOrderAbnormal> genPickingOrderMaterialDetailList(OutOrderAbnormalBaseDO OutOrderAbnormalBaseDO, List<PickingMaterialDetail> pickingMaterialDetailList){
LoginUser loginUser = SecurityUtils.getLoginUser();
// 获取用户姓名（优先从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();
List<OutOrderAbnormal> outOrderAbnormalList = new ArrayList<>();
//BigDecimal actualQuantity = BigDecimal.ZERO;
for (PickingMaterialDetail pickingMaterialDetail : pickingMaterialDetailList){
@@ -163,7 +170,7 @@ public class OutOrderAbnormalImpl extends ServiceImpl<OutOrderAbnormalMapper, Ou
}
outOrderAbnormal.setAbnormalActualQuantity(pickingMaterialDetail.getPickingQuantity().subtract(pickingMaterialDetail.getQuantity()));
outOrderAbnormal.setCreateBy(loginUser.getUserid());
outOrderAbnormal.setCreateByName(loginUser.getUsername());
outOrderAbnormal.setCreateByName(userRealName);
outOrderAbnormal.setCreateTime(new Date());
outOrderAbnormalList.add(outOrderAbnormal);
}
@@ -181,6 +188,13 @@ public class OutOrderAbnormalImpl extends ServiceImpl<OutOrderAbnormalMapper, Ou
*/
private List<OutOrderAbnormal> genCheckOrderMaterialDetailList(OutOrderAbnormalBaseDO OutOrderAbnormalBaseDO, List<OutMaterialDetail> outMaterialDetailList){
LoginUser loginUser = SecurityUtils.getLoginUser();
// 获取用户姓名（优先从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();
List<OutOrderAbnormal> outOrderAbnormalList = new ArrayList<>();
for (OutMaterialDetail outMaterialDetail : outMaterialDetailList){
//复核
@@ -203,7 +217,7 @@ public class OutOrderAbnormalImpl extends ServiceImpl<OutOrderAbnormalMapper, Ou
}
outOrderAbnormal.setAbnormalActualQuantity(outMaterialDetail.getCheckQuantity().subtract(outMaterialDetail.getPickingQuantity()));
outOrderAbnormal.setCreateBy(loginUser.getUserid());
outOrderAbnormal.setCreateByName(loginUser.getUsername());
outOrderAbnormal.setCreateByName(userRealName);
outOrderAbnormal.setCreateTime(new Date());
outOrderAbnormalList.add(outOrderAbnormal);
}
mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/persistence/PickingOrderImpl.java
+11 -3
View File
@@ -61,7 +61,13 @@ public class PickingOrderImpl extends ServiceImpl<PickingOrderMapper, PickingOrd
public Boolean batchInsert(List<PickingOrderDO> pickingOrderDOList) {
LoginUser loginUser = SecurityUtils.getLoginUser();
Long userId = loginUser.getUserid();
String userName = loginUser.getUsername();
// 获取用户姓名（优先从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();
Date date = new Date();
List<PickingOrder> pickingOrderList = new ArrayList<>();
for (PickingOrderDO pickingOrderDO : pickingOrderDOList){
@@ -69,10 +75,12 @@ public class PickingOrderImpl extends ServiceImpl<PickingOrderMapper, PickingOrd
BeanUtils.copyProperties(pickingOrderDO,pickingOrder, "status","createBy","createByName","createTime",
"updateBy","updateByName","updateTime");
pickingOrder.setCreateBy(userId);
pickingOrder.setCreateByName(userName);
// 使用用户真实姓名，而不是账号
pickingOrder.setCreateByName(userRealName);
pickingOrder.setCreateTime(date);
pickingOrder.setUpdateBy(userId);
pickingOrder.setUpdateByName(userName);
// 使用用户真实姓名，而不是账号
pickingOrder.setUpdateByName(userRealName);
pickingOrder.setUpdateTime(date);
pickingOrderList.add(pickingOrder);
}
mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java
+42 -3
View File
@@ -139,6 +139,31 @@ public class PickingOrderDomainService {
*/
@Transactional(rollbackFor = Exception.class)
public Boolean batchInsert(List<PickingOrderDO> pickingOrderDOList) {
// 统一设置拣货单的创建人/修改人为当前登录用户（使用用户姓名，而不是账号）
LoginUser loginUser = SecurityUtils.getLoginUser();
if (loginUser != null && loginUser.getUserPo() != null) {
final Long userId = loginUser.getUserid();
// 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底）
final String userRealName = (loginUser.getUserPo().getUserName() != null
&& !loginUser.getUserPo().getUserName().trim().isEmpty())
? loginUser.getUserPo().getUserName()
: (loginUser.getRealname() != null && !loginUser.getRealname().trim().isEmpty())
? loginUser.getRealname()
: loginUser.getUsername();
final Date now = new Date();
for (PickingOrderDO pickingOrderDO : pickingOrderDOList) {
// 覆盖来源出库单中可能携带的旧的账号型创建人/修改人信息
pickingOrderDO.setCreateBy(userId);
pickingOrderDO.setCreateByName(userRealName);
if (pickingOrderDO.getCreateTime() == null) {
pickingOrderDO.setCreateTime(now);
}
pickingOrderDO.setUpdateBy(userId);
pickingOrderDO.setUpdateByName(userRealName);
pickingOrderDO.setUpdateTime(now);
}
}
pickingOrderService.batchInsert(pickingOrderDOList);
List<PickingMaterialDetail> pickingMaterialDetailList = new ArrayList<>();
for (PickingOrderDO pickingOrderDO : pickingOrderDOList){
@@ -160,6 +185,13 @@ public class PickingOrderDomainService {
*/
private PickingMaterialDetail genPickingMaterialDetail(PickingMaterialDetailDO pickingMaterialDetailDO){
LoginUser loginUser = SecurityUtils.getLoginUser();
// 获取用户姓名（优先从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();
PickingMaterialDetail pickingMaterialDetail = new PickingMaterialDetail();
BeanUtils.copyProperties(pickingMaterialDetailDO, pickingMaterialDetail, "createBy","createByName","createTime",
"updateBy","updateByName","updateTime");
@@ -168,7 +200,7 @@ public class PickingOrderDomainService {
pickingMaterialDetail.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
pickingMaterialDetail.setUniqueId(idGenerator.snowflakeId(SnowFlakeConstants.wmsId));
pickingMaterialDetail.setCreateBy(loginUser.getUserid());
pickingMaterialDetail.setCreateByName(loginUser.getUsername());
pickingMaterialDetail.setCreateByName(userRealName);
pickingMaterialDetail.setCreateTime(new Date());
return pickingMaterialDetail;
}
@@ -739,6 +771,13 @@ public class PickingOrderDomainService {
@Transactional(rollbackFor = Exception.class)
public void genDeliveTask(PickingOrderDO pickingOrderDO, List<StockOutTaskOrderDO> stockOutTaskOrderDOList){
LoginUser loginUser = SecurityUtils.getLoginUser();
// 获取用户姓名（优先从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();
List<DeliveTaskDO> deliveTaskDOList = new ArrayList<>();
for (StockOutTaskOrderDO stockOutTaskOrderDO : stockOutTaskOrderDOList){
DeliveTaskDO deliveTaskDO = new DeliveTaskDO();
@@ -753,12 +792,12 @@ public class PickingOrderDomainService {
deliveTaskDO.setTaskType(3);
deliveTaskDO.setTaskDistribution(1);
deliveTaskDO.setTaskDistributionId(loginUser.getUserid());
deliveTaskDO.setTaskDistributionName(loginUser.getUsername());
deliveTaskDO.setTaskDistributionName(userRealName);
deliveTaskDO.setTaskDistributionTime(new Date());
deliveTaskDO.setOperatorsBy(pickingOrderDO.getOperatorsBy());
deliveTaskDO.setOperatorsName(pickingOrderDO.getOperatorsName());
deliveTaskDO.setCreateBy(loginUser.getUserid());
deliveTaskDO.setCreateByName(loginUser.getUsername());
deliveTaskDO.setCreateByName(userRealName);
deliveTaskDO.setCreateTime(new Date());
deliveTaskDOList.add(deliveTaskDO);
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java
+6 -2
View File
@@ -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()));
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java
+12 -2
View File
@@ -124,11 +124,21 @@ public class ExcelParseService {
}
//设置创建时间和创建人信息
if (loginUser != null) {
// 获取用户姓名（优先从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();
}
stockOutOrder.setCreateBy(loginUser.getUserid());
stockOutOrder.setCreateByName(loginUser.getUsername());
stockOutOrder.setCreateByName(userRealName);
stockOutOrder.setCreateTime(new Date());
stockOutOrder.setUpdateBy(loginUser.getUserid());
stockOutOrder.setUpdateByName(loginUser.getUsername());
stockOutOrder.setUpdateByName(userRealName);
stockOutOrder.setUpdateTime(new Date());
stockOutOrder.setDelFlag(1);
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
+25 -6
View File
@@ -519,6 +519,10 @@ public class StockOutOrderDomainService {
@Transactional(rollbackFor = Exception.class)
public Boolean auditState(StockOutOrderDO stockOutOrderDO) {
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());
//统计是否已经审核
int count = stockOutOrderService.count(new QueryWrapper<StockOutOrder>().lambda()
.eq(StockOutOrder::getAuditStatus, 3)
@@ -532,10 +536,10 @@ public class StockOutOrderDomainService {
.set(StockOutOrder::getAuditStatus, stockOutOrderDO.getAuditStatus())
.set(StockOutOrder::getAuditRemark, stockOutOrderDO.getAuditRemark())
.set(StockOutOrder::getAuditBy, loginUser.getUserid())
.set(StockOutOrder::getAuditByName, loginUser.getUsername())
.set(StockOutOrder::getAuditByName, userRealName)
.set(StockOutOrder::getAuditTime, new Date())
.set(StockOutOrder::getUpdateBy, loginUser.getUserid())
.set(StockOutOrder::getUpdateByName, loginUser.getUsername())
.set(StockOutOrder::getUpdateByName, userRealName)
.set(StockOutOrder::getUpdateTime, new Date())
.in(StockOutOrder::getOutOrderId, stockOutOrderDO.getOutOrderIds()));
}
@@ -1296,8 +1300,12 @@ public class StockOutOrderDomainService {
stockInOrderDO.setOrderTypeName("调拨入库");
stockInOrderDO.setDirectWarehouse(2);
stockInOrderDO.setMaterialQuantity(mobilizeManageDetailPOList.size());
// 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底）
String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null
? loginUser.getUserPo().getUserName()
: (loginUser.getRealname() != null ? loginUser.getRealname() : loginUser.getUsername());
stockInOrderDO.setCreateBy(loginUser.getUserid());
stockInOrderDO.setCreateByName(loginUser.getUsername());
stockInOrderDO.setCreateByName(userRealName);
stockInOrderDO.setCreateTime(new Date());
//统计总计划数
BigDecimal quantity = stockInOrderDO.getMaterialDetailList().stream().map(InMaterialDetailDO::getQuantity).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -1333,6 +1341,10 @@ public class StockOutOrderDomainService {
return;
}
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());
HandoverTaskOrderDO handoverTaskOrderDO = new HandoverTaskOrderDO();
handoverTaskOrderDO.setOrganizationId(stockOutOrderPO.getOrganizationId());
handoverTaskOrderDO.setOrganizationName(stockOutOrderPO.getOrganizationName());
@@ -1350,7 +1362,7 @@ public class StockOutOrderDomainService {
handoverTaskOrderDO.setExpectTime(stockOutOrderPO.getExpectTime());
handoverTaskOrderDO.setOrderNumber(stockOutOrderPO.getOutOrderNumber());
handoverTaskOrderDO.setCreateBy(loginUser.getUserid());
handoverTaskOrderDO.setCreateByName(loginUser.getUsername());
handoverTaskOrderDO.setCreateByName(userRealName);
handoverTaskOrderDO.setCreateTime(new Date());
handoverTaskOrderService.insert(handoverTaskOrderDO);;
}
@@ -1401,6 +1413,13 @@ public class StockOutOrderDomainService {
@Transactional(rollbackFor = Exception.class)
public void genDeliveTask(List<StockOutOrderPO> stockOutOrderPOList, StockOutOrderDO stockOutOrderDO){
LoginUser loginUser = SecurityUtils.getLoginUser();
// 获取用户姓名（优先从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();
List<DeliveTaskDO> deliveTaskDOList = new ArrayList<>();
for (StockOutOrderPO stockOutOrderPO : stockOutOrderPOList){
DeliveTaskDO deliveTaskDO = new DeliveTaskDO();
@@ -1415,12 +1434,12 @@ public class StockOutOrderDomainService {
deliveTaskDO.setTaskType(4);
deliveTaskDO.setTaskDistribution(1);
deliveTaskDO.setTaskDistributionId(loginUser.getUserid());
deliveTaskDO.setTaskDistributionName(loginUser.getUsername());
deliveTaskDO.setTaskDistributionName(userRealName);
deliveTaskDO.setTaskDistributionTime(new Date());
deliveTaskDO.setOperatorsBy(stockOutOrderDO.getCheckOperatorsBy());
deliveTaskDO.setOperatorsName(stockOutOrderDO.getCheckOperatorsName());
deliveTaskDO.setCreateBy(loginUser.getUserid());
deliveTaskDO.setCreateByName(loginUser.getUsername());
deliveTaskDO.setCreateByName(userRealName);
deliveTaskDO.setCreateTime(new Date());
deliveTaskDOList.add(deliveTaskDO);
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutTaskOrder/repository/persistence/StockOutTaskOrderImpl.java
+11 -4
View File
@@ -107,6 +107,13 @@ public class StockOutTaskOrderImpl extends ServiceImpl<StockOutTaskOrderMapper,
LoginUser loginUser = SecurityUtils.getLoginUser();
List<StockOutTaskOrder> stockOutTaskOrderList = new ArrayList<>();
List<TaskPickingMaterialDetail> taskPickingMaterialDetailList = new ArrayList<>();
// 获取用户姓名（优先从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();
stockOutTaskOrderDOList.forEach(stockOutTaskOrderDO -> {
StockOutTaskOrder stockOutTaskOrder = new StockOutTaskOrder();
BeanUtils.copyProperties(stockOutTaskOrderDO, stockOutTaskOrder, "materialDetailId", "status", "createBy","createByName","createTime",
@@ -115,10 +122,10 @@ public class StockOutTaskOrderImpl extends ServiceImpl<StockOutTaskOrderMapper,
stockOutTaskOrder.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockOutTaskOrder.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
stockOutTaskOrder.setCreateBy(loginUser.getUserid());
stockOutTaskOrder.setCreateByName(loginUser.getUsername());
stockOutTaskOrder.setCreateByName(userRealName);
stockOutTaskOrder.setCreateTime(new Date());
stockOutTaskOrder.setUpdateBy(loginUser.getUserid());
stockOutTaskOrder.setUpdateByName(loginUser.getUsername());
stockOutTaskOrder.setUpdateByName(userRealName);
stockOutTaskOrder.setUpdateTime(new Date());
stockOutTaskOrder.setOperatorsBy(stockOutTaskOrderDO.getOperatorsBy());
stockOutTaskOrder.setOperatorsName(stockOutTaskOrderDO.getOperatorsName());
@@ -133,10 +140,10 @@ public class StockOutTaskOrderImpl extends ServiceImpl<StockOutTaskOrderMapper,
taskPickingMaterialDetail.setOrganizationName(loginUser.getUserPo().getOrganizationName());
taskPickingMaterialDetail.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
taskPickingMaterialDetail.setCreateBy(loginUser.getUserid());
taskPickingMaterialDetail.setCreateByName(loginUser.getUsername());
taskPickingMaterialDetail.setCreateByName(userRealName);
taskPickingMaterialDetail.setCreateTime(new Date());
taskPickingMaterialDetail.setUpdateBy(loginUser.getUserid());
taskPickingMaterialDetail.setUpdateByName(loginUser.getUsername());
taskPickingMaterialDetail.setUpdateByName(userRealName);
taskPickingMaterialDetail.setUpdateTime(new Date());
taskPickingMaterialDetailList.add(taskPickingMaterialDetail);
});
mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java
+20 -6
View File
@@ -136,16 +136,23 @@ public class StockReceiptOrderDomainService {
@Transactional(rollbackFor = Exception.class)
public Boolean batchInsert(List<StockReceiptOrderDO> stockReceiptOrderDOList) {
LoginUser loginUser = SecurityUtils.getLoginUser();
// 获取用户姓名（优先从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();
List<StockReceiptOrder> stockReceiptOrderList = new ArrayList<>();
List<ReceiptMaterialDetail> receiptMaterialDetailList = new ArrayList<>();
stockReceiptOrderDOList.forEach(stockReceiptOrderDO -> {
StockReceiptOrder stockReceiptOrder = JSONUtil.toBean(JSONUtil.toJsonStr(stockReceiptOrderDO), StockReceiptOrder.class);
stockReceiptOrder.setReceiptOrderNumber(OrderSequence.getOrderCode("SH"));
stockReceiptOrder.setCreateBy(loginUser.getUserid());
stockReceiptOrder.setCreateByName(loginUser.getUsername());
stockReceiptOrder.setCreateByName(userRealName);
stockReceiptOrder.setCreateTime(new Date());
stockReceiptOrder.setUpdateBy(loginUser.getUserid());
stockReceiptOrder.setUpdateByName(loginUser.getUsername());
stockReceiptOrder.setUpdateByName(userRealName);
stockReceiptOrder.setUpdateTime(new Date());
stockReceiptOrderList.add(stockReceiptOrder);
stockReceiptOrderDO.getMaterialDetailList().forEach(materialDetailDO -> {
@@ -159,7 +166,7 @@ public class StockReceiptOrderDomainService {
receiptMaterialDetail.setReceiptOrderNumber(stockReceiptOrder.getReceiptOrderNumber());
receiptMaterialDetail.setGenStockShelf(2); // 设置需要生成上架单
receiptMaterialDetail.setCreateBy(loginUser.getUserid());
receiptMaterialDetail.setCreateByName(loginUser.getUsername());
receiptMaterialDetail.setCreateByName(userRealName);
receiptMaterialDetail.setCreateTime(new Date());
receiptMaterialDetailList.add(receiptMaterialDetail);
});
@@ -665,6 +672,13 @@ public class StockReceiptOrderDomainService {
throw new ServiceException("收货单【" + stockReceiptOrderPO.getReceiptOrderNumber() + "】已完成收货，请重新选择");
}
LoginUser loginUser = SecurityUtils.getLoginUser();
// 获取用户姓名（优先从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();
int abnormal = 2;
if (stockReceiptOrderPO.getReceiptQuantity().compareTo(stockReceiptOrderPO.getQuantity()) != 0){
abnormal = 1;
@@ -678,7 +692,7 @@ public class StockReceiptOrderDomainService {
stockInOrder.setInOrderNumber(stockReceiptOrderPO.getInOrderNumber());
stockInOrder.setStatus(4); // 4-上架中
stockInOrder.setUpdateBy(loginUser.getUserid());
stockInOrder.setUpdateByName(loginUser.getUsername());
stockInOrder.setUpdateByName(userRealName);
stockInOrder.setUpdateTime(new Date());
stockInOrderService.update(stockInOrder,
new QueryWrapper<StockInOrder>().lambda()
@@ -701,7 +715,7 @@ public class StockReceiptOrderDomainService {
//如果没有指定操作人员，使用当前登录用户
if (stockShelfOrderDO.getOperatorsBy() == null) {
stockShelfOrderDO.setOperatorsBy(loginUser.getUserid());
stockShelfOrderDO.setOperatorsName(loginUser.getUsername());
stockShelfOrderDO.setOperatorsName(userRealName);
}
//生成上架任务
stockShelfOrderDomainService.genDeliveTask(stockShelfOrderPOList, stockShelfOrderDO);
@@ -710,7 +724,7 @@ public class StockReceiptOrderDomainService {
.set(StockShelfOrder::getTaskDistribution, 1)
.set(StockShelfOrder::getTaskDistributionTime, new Date())
.set(StockShelfOrder::getUpdateBy, loginUser.getUserid())
.set(StockShelfOrder::getUpdateByName, loginUser.getUsername())
.set(StockShelfOrder::getUpdateByName, userRealName)
.set(StockShelfOrder::getUpdateTime, new Date())
.in(StockShelfOrder::getShelfOrderId, stockShelfOrderDO.getShelfOrderIds()));
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
+19 -5
View File
@@ -146,6 +146,13 @@ public class StockShelfOrderDomainService {
@Transactional(rollbackFor = Exception.class)
public Boolean genStockShelfOrder(List<StockShelfOrderDO> stockShelfOrderDOList) {
LoginUser loginUser = SecurityUtils.getLoginUser();
// 获取用户姓名（优先从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();
List<StockShelfOrder> stockShelfOrderList = new ArrayList<>();
List<ShelfMaterialDetail> shelfMaterialDetailList = new ArrayList<>();
stockShelfOrderDOList.forEach(stockShelfOrderDO -> {
@@ -156,10 +163,10 @@ public class StockShelfOrderDomainService {
stockShelfOrder.setShelfOrderNumber(OrderSequence.getOrderCode("SJ"));
}
stockShelfOrder.setCreateBy(loginUser.getUserid());
stockShelfOrder.setCreateByName(loginUser.getUsername());
stockShelfOrder.setCreateByName(userRealName);
stockShelfOrder.setCreateTime(new Date());
stockShelfOrder.setUpdateBy(loginUser.getUserid());
stockShelfOrder.setUpdateByName(loginUser.getUsername());
stockShelfOrder.setUpdateByName(userRealName);
stockShelfOrder.setUpdateTime(new Date());
stockShelfOrderList.add(stockShelfOrder);
stockShelfOrderDO.getMaterialDetailList().forEach(materialDetailDO -> {
@@ -173,7 +180,7 @@ public class StockShelfOrderDomainService {
shelfMaterialDetail.setShelfOrderNumber(stockShelfOrder.getShelfOrderNumber());
shelfMaterialDetail.setLevel(1);
shelfMaterialDetail.setCreateBy(loginUser.getUserid());
shelfMaterialDetail.setCreateByName(loginUser.getUsername());
shelfMaterialDetail.setCreateByName(userRealName);
shelfMaterialDetail.setCreateTime(new Date());
shelfMaterialDetailList.add(shelfMaterialDetail);
});
@@ -1080,6 +1087,13 @@ public class StockShelfOrderDomainService {
@Transactional(rollbackFor = Exception.class)
public void genDeliveTask(List<StockShelfOrderPO> stockReceiptOrderPOList, StockShelfOrderDO stockReceiptOrderDO){
LoginUser loginUser = SecurityUtils.getLoginUser();
// 获取用户姓名（优先从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();
List<DeliveTaskDO> deliveTaskDOList = new ArrayList<>();
for (StockShelfOrderPO stockShelfOrderPO : stockReceiptOrderPOList){
DeliveTaskDO deliveTaskDO = new DeliveTaskDO();
@@ -1094,12 +1108,12 @@ public class StockShelfOrderDomainService {
deliveTaskDO.setTaskType(2);
deliveTaskDO.setTaskDistribution(1);
deliveTaskDO.setTaskDistributionId(loginUser.getUserid());
deliveTaskDO.setTaskDistributionName(loginUser.getUsername());
deliveTaskDO.setTaskDistributionName(userRealName);
deliveTaskDO.setTaskDistributionTime(new Date());
deliveTaskDO.setOperatorsBy(stockReceiptOrderDO.getOperatorsBy());
deliveTaskDO.setOperatorsName(stockReceiptOrderDO.getOperatorsName());
deliveTaskDO.setCreateBy(loginUser.getUserid());
deliveTaskDO.setCreateByName(loginUser.getUsername());
deliveTaskDO.setCreateByName(userRealName);
deliveTaskDO.setCreateTime(new Date());
deliveTaskDOList.add(deliveTaskDO);
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/inOrderAbnormal/InOrderAbnormalAssembler.java
+15 -3
View File
@@ -43,19 +43,31 @@ public class InOrderAbnormalAssembler {
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(inOrderAbnormalDTO.getInOrderAbnormalId() != null){
inOrderAbnormalDO.setUpdateBy(userId);
inOrderAbnormalDO.setUpdateByName(userName);
inOrderAbnormalDO.setUpdateByName(userRealName);
inOrderAbnormalDO.setUpdateTime(new Date());
}else {
inOrderAbnormalDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
inOrderAbnormalDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
inOrderAbnormalDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
inOrderAbnormalDO.setCreateBy(userId);
inOrderAbnormalDO.setCreateByName(userName);
inOrderAbnormalDO.setCreateByName(userRealName);
inOrderAbnormalDO.setCreateTime(new Date());
inOrderAbnormalDO.setDelFlag(1);
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/assember/stockInOrder/StockInOrderAssembler.java
+16 -3
View File
@@ -56,19 +56,32 @@ public class StockInOrderAssembler {
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(stockInOrderDTO.getInOrderId() != null){
stockInOrderDO.setUpdateBy(userId);
stockInOrderDO.setUpdateByName(userName);
stockInOrderDO.setUpdateByName(userRealName);
stockInOrderDO.setUpdateTime(new Date());
}else {
stockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
stockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
stockInOrderDO.setCreateBy(userId);
stockInOrderDO.setCreateByName(userName);
// 强制设置创建人姓名为用户真实姓名，确保覆盖前端可能传递的账号
stockInOrderDO.setCreateByName(userRealName);
stockInOrderDO.setCreateTime(new Date());
stockInOrderDO.setDelFlag(1);
// 新增入库单时，如果入库单类型为空，默认设置为普通入库
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);
}
mhd_wms/src/main/resources/mapper/inventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml
+3 -1
View File
@@ -54,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="batchRefNo" column="batch_ref_no" />
<result property="sheetRefNo" column="sheet_ref_no" />
<result property="boxPalletNo" column="box_pallet_no" />
<result property="adjustAction" column="adjust_action" />
<result property="relateNo" column="relate_no" />
</resultMap>
@@ -67,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.freeze_after_quantity, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name,
a.del_flag,b.ext_attr_1, b.ext_attr_2, b.ext_attr_3, b.ext_attr_4,
b.production_date, b.expiry_date, b.inventory_date,
b.batch_ref_no, b.sheet_ref_no, b.box_pallet_no
b.batch_ref_no, b.sheet_ref_no, b.box_pallet_no,a.ADJUST_ACTION,a.RELATE_NO
from inventory_adjustment_record a left join material_inventory b on a.material_inventory_id = b.material_inventory_id
where a.del_flag = 1
</sql>