diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml index e2915658e..e9aa41514 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml @@ -185,8 +185,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - order by a.create_time desc + order by a.storage_name asc, a.create_time desc \ No newline at end of file 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 0329feb68..7262f1440 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 @@ -792,11 +792,18 @@ public class ReviewOrderApplicationService { private void refreshReviewOrderStatus(Long reviewOrderId) { List rows = reviewOrderMapper.queryDetailByReviewOrderId(reviewOrderId); - // 业务口径:只有全部明细待复核=0 时,状态才置为 2;部分复核仍保持 1。 - // 状态 3 仅在 checkConfirm 中设置。 - boolean allReviewed = !CollectionUtils.isEmpty(rows) - && rows.stream().allMatch(r -> nz(r.getPendingReviewQty()).compareTo(BigDecimal.ZERO) == 0); - Integer targetStatus = allReviewed ? 2 : 1; + // ================== 旧口径:全部明细待复核=0 置 2,部分复核保持 1 ================== +// // 业务口径:只有全部明细待复核=0 时,状态才置为 2;部分复核仍保持 1。 +// // 状态 3 仅在 checkConfirm 中设置。 +// boolean allReviewed = !CollectionUtils.isEmpty(rows) +// && rows.stream().allMatch(r -> nz(r.getPendingReviewQty()).compareTo(BigDecimal.ZERO) == 0); +// Integer targetStatus = allReviewed ? 2 : 1; + // ================== 新口径:部分复核/全部复核完未确认均置 复核中(2),完全未复核保持 待复核(1) ================== + // 只要有任意明细已复核数量>0(部分复核 / 全部复核完未确认)即为复核中(2); + // 完全未复核(全部已复核=0)保持待复核(1)。状态 3 仅在 checkConfirm 中设置。 + boolean anyReviewed = !CollectionUtils.isEmpty(rows) + && rows.stream().anyMatch(r -> nz(r.getReviewedQty()).compareTo(BigDecimal.ZERO) > 0); + Integer targetStatus = anyReviewed ? 2 : 1; ReviewOrder order = reviewOrderMapper.selectById(reviewOrderId); if (order == null) {