diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java index a5a7a8e7a..650c77a30 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java @@ -320,13 +320,9 @@ public class ReviewOrderApplicationService { if (reviewOrderId == null) { continue; } - // 若完成复核请求携带明细,先按本次提交快照落库(数量与计量),再校验与同步出库/交接 + // 若完成复核请求携带明细,先按本次提交快照落库(数量与计量),再同步出库/交接 applyReviewSnapshotForConfirm(reviewOrderId, cmd.getDetails(), loginUser); - List rows = reviewOrderMapper.queryDetailByReviewOrderId(reviewOrderId); - boolean hasPending = rows.stream().anyMatch(r -> nz(r.getPendingReviewQty()).compareTo(BigDecimal.ZERO) > 0); - if (hasPending) { - throw new ServiceException("存在待复核数量,无法确认"); - } + // 允许仍有待复核数量时确认(按当前已复核数量同步出库,不再强制全部复核完) // 复核确认时将复核结果同步到出库明细/出库单,供出库交接读取数量 syncOutOrderCheckQtyByReviewConfirm(reviewOrderId, loginUser); // 与出库单「复核确认」一致:复核数量与拣货数量不一致时生成复核异常单(FHYC) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outOrderAbnormal/repository/persistence/OutOrderAbnormalImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outOrderAbnormal/repository/persistence/OutOrderAbnormalImpl.java index 9e307b089..1a35ff140 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outOrderAbnormal/repository/persistence/OutOrderAbnormalImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outOrderAbnormal/repository/persistence/OutOrderAbnormalImpl.java @@ -256,7 +256,9 @@ public class OutOrderAbnormalImpl extends ServiceImpl