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-02-27 09:40:15 +08:00
parent 54cd738bd6 ca5044aa04
commit d266742b28
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java
+2
View File
@@ -132,6 +132,8 @@ public class ExcelParseService {
stockOutOrder.setUpdateTime(new Date());
stockOutOrder.setDelFlag(1);
}
// 复核下发状态默认为否（2）
stockOutOrder.setCheckTaskDistribution(2);
//校验必填字段
StringBuilder errorMsg = check(stockOutOrder);
if (errorMsg.length() > 0) {
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
+9 -1
View File
@@ -154,6 +154,10 @@ public class StockOutOrderDomainService {
//统计总体积
//BigDecimal volumeLimit = stockOutOrderDO.getMaterialDetailList().stream().map(OutMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
//stockOutOrderDO.setVolumeLimit(volumeLimit);
// 复核下发状态默认为否（2）
if (stockOutOrderDO.getCheckTaskDistribution() == null) {
stockOutOrderDO.setCheckTaskDistribution(2);
}
stockOutOrderService.insert(stockOutOrderDO);
return outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList());
}
@@ -180,6 +184,10 @@ public class StockOutOrderDomainService {
//统计总体积
BigDecimal volumeLimit = stockOutOrderDO.getMaterialDetailList().stream().map(OutMaterialDetailDO::getVolumeLimit).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
stockOutOrderDO.setVolumeLimit(volumeLimit);
// 复核下发状态默认为否（2）
if (stockOutOrderDO.getCheckTaskDistribution() == null) {
stockOutOrderDO.setCheckTaskDistribution(2);
}
stockOutOrderService.insert(stockOutOrderDO);
outMaterialDetailService.batchInsert(stockOutOrderDO.getOutOrderNumber(), stockOutOrderDO.getMaterialDetailList());
}
@@ -691,7 +699,7 @@ public class StockOutOrderDomainService {
stockOutOrderDOQuery.setCheckTaskDistribution(2);
List<StockOutOrderPO> stockOutOrderPOList = stockOutOrderService.queryList(stockOutOrderDOQuery);
if (CollectionUtils.isEmpty(stockOutOrderPOList)) {
throw new ServiceException("收货单不存在或已下发，请重新选择");
throw new ServiceException("复合单已下发，请重新选择");
}
//复核下发任务
genDeliveTask(stockOutOrderPOList, stockOutOrderDO);