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

WMSPC端收货后生成上架任务任务下发默认值为否

Browse Source
This commit is contained in:
秦鸿展
2026-03-11 11:01:50 +08:00
parent 7b8d3250b9
commit 2631d298ac
2 changed files with 3 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java
+1 -33
View File
@@ -700,39 +700,7 @@ public class StockReceiptOrderDomainService {
.eq(StockInOrder::getInOrderNumber, stockReceiptOrderPO.getInOrderNumber()));
}
//收货完成后自动生成上架任务
try {
//查询刚生成的上架单
StockShelfOrderDO stockShelfOrderDOQuery = new StockShelfOrderDO();
stockShelfOrderDOQuery.setReceiptOrderNumber(stockReceiptOrderPO.getReceiptOrderNumber());
stockShelfOrderDOQuery.setTaskDistribution(2); // 查询未下发的上架单
List<StockShelfOrderPO> stockShelfOrderPOList = stockShelfOrderService.queryList(stockShelfOrderDOQuery);
if (!CollectionUtils.isEmpty(stockShelfOrderPOList)) {
//创建上架任务参数
StockShelfOrderDO stockShelfOrderDO = new StockShelfOrderDO();
stockShelfOrderDO.setShelfOrderIds(stockShelfOrderPOList.stream()
.map(StockShelfOrderPO::getShelfOrderId)
.collect(Collectors.toList()));
//如果没有指定操作人员，使用当前登录用户
if (stockShelfOrderDO.getOperatorsBy() == null) {
stockShelfOrderDO.setOperatorsBy(loginUser.getUserid());
stockShelfOrderDO.setOperatorsName(userRealName);
}
//生成上架任务
stockShelfOrderDomainService.genDeliveTask(stockShelfOrderPOList, stockShelfOrderDO);
//标记上架单任务已下发
stockShelfOrderService.update(null, new UpdateWrapper<StockShelfOrder>().lambda()
.set(StockShelfOrder::getTaskDistribution, 1)
.set(StockShelfOrder::getTaskDistributionTime, new Date())
.set(StockShelfOrder::getUpdateBy, loginUser.getUserid())
.set(StockShelfOrder::getUpdateByName, userRealName)
.set(StockShelfOrder::getUpdateTime, new Date())
.in(StockShelfOrder::getShelfOrderId, stockShelfOrderDO.getShelfOrderIds()));
}
} catch (Exception e) {
//如果生成上架任务失败，记录日志但不影响收货完成流程
log.error("收货完成后生成上架任务失败，收货单号：{}", stockReceiptOrderPO.getReceiptOrderNumber(), e);
}
//收货完成后生成的上架单，任务下发默认值为否（2-未下发），需用户手动进行任务下发操作
//生成收货追溯记录
genInventoryStandingDetail(stockReceiptOrderPO);
mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
+2 -4
View File
@@ -162,10 +162,8 @@ public class StockShelfOrderDomainService {
if (StringUtils.isBlank(stockShelfOrder.getShelfOrderNumber())){
stockShelfOrder.setShelfOrderNumber(OrderSequence.getOrderCode("SJ"));
}
// 收货完成生成上架任务时，任务下发默认值为否（2-未下发）
if (stockShelfOrder.getTaskDistribution() == null) {
stockShelfOrder.setTaskDistribution(2);
}
// 收货完成生成上架任务时，任务下发默认值为否（2-未下发），强制覆盖避免从收货单复制到错误值
stockShelfOrder.setTaskDistribution(2);
stockShelfOrder.setCreateBy(loginUser.getUserid());
stockShelfOrder.setCreateByName(userRealName);
stockShelfOrder.setCreateTime(new Date());