✨ feat(mes): 添加外协发料单数量校验功能

新增校验接口，确保外协发料单每行明细数量之和与行发料数量一致。此功能提升了数据准确性，避免了潜在的发料错误。

✨ feat(mes): 添加外协发料单数量校验功能
新增校验接口，确保外协发料单每行明细数量之和与行发料数量一致。此功能提升了数据准确性，避免了潜在的发料错误。
YunaiV
1 parent 24b5a79a
Showing 5 changed files with 40 additions and 10 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/vo/detail/MesWmOutsourceIssueDetailSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/outsourceissue/MesWmOutsourceIssueMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/outsourceissue/MesWmOutsourceIssueServiceImpl.java
@@ -146,7 +146,13 @@ public class MesWmOutsourceIssueController {
         return success(true);
     }
-    // DONE @AI：需要有 checkQuantity 类似的接口；（AI 未修复原因：需要明确业务逻辑，checkQuantity 接口需要产品经理确认具体校验规则）
+    @GetMapping("/check-quantity")
+    @Operation(summary = "校验外协发料单数量", description = "校验每行明细数量之和是否等于行发料数量")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:query')")
+    public CommonResult<Boolean> checkOutsourceIssueQuantity(@RequestParam("id") Long id) {
+        return success(outsourceIssueService.checkOutsourceIssueQuantity(id));
+    }
     // ==================== 拼接 VO ====================
@@ -31,15 +31,10 @@ public class MesWmOutsourceIssueDetailSaveReqVO {
     @DecimalMin(value = "0.01", message = "数量必须大于 0")
     private BigDecimal quantity;
-    @Schema(description = "库存ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "库存ID不能为空")
-    private Long materialStockId;
-
     @Schema(description = "批次ID", example = "1")
     private Long batchId;
-    @Schema(description = "仓库ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "仓库ID不能为空")
+    @Schema(description = "仓库ID", example = "1")
     private Long warehouseId;
     @Schema(description = "库区ID", example = "1")
@@ -20,10 +20,8 @@ public interface MesWmOutsourceIssueMapper extends BaseMapperX&lt;MesWmOutsourceIss
                 .likeIfPresent(MesWmOutsourceIssueDO::getCode, reqVO.getCode())
                 .likeIfPresent(MesWmOutsourceIssueDO::getName, reqVO.getName())
                 .eqIfPresent(MesWmOutsourceIssueDO::getVendorId, reqVO.getVendorId())
-                .eqIfPresent(MesWmOutsourceIssueDO::getWorkorderId, reqVO.getWorkorderId())
-                .likeIfPresent(MesWmOutsourceIssueDO::getWorkorderCode, reqVO.getWorkorderCode())
+                .eqIfPresent(MesWmOutsourceIssueDO::getWorkOrderId, reqVO.getWorkOrderId())
                 .betweenIfPresent(MesWmOutsourceIssueDO::getIssueDate, reqVO.getIssueDate())
-                .eqIfPresent(MesWmOutsourceIssueDO::getStatus, reqVO.getStatus())
                 .orderByDesc(MesWmOutsourceIssueDO::getId));
     }
@@ -79,4 +79,12 @@ public interface MesWmOutsourceIssueService {
      */
     void cancelOutsourceIssue(Long id);
+    /**
+     * 校验外协发料单数量（行数量 = 明细数量之和）
+     *
+     * @param id 编号
+     * @return true 表示数量匹配，false 表示不匹配
+     */
+    Boolean checkOutsourceIssueQuantity(Long id);
+
 }
@@ -184,6 +184,29 @@ public class MesWmOutsourceIssueServiceImpl implements MesWmOutsourceIssueServic
                 .setId(id).setStatus(MesWmOutsourceIssueStatusEnum.CANCELLED.getStatus()));
     }
+    @Override
+    public Boolean checkOutsourceIssueQuantity(Long id) {
+        List<MesWmOutsourceIssueLineDO> lines = outsourceIssueLineService.getOutsourceIssueLineListByIssueId(id);
+        if (CollUtil.isEmpty(lines)) {
+            return true;
+        }
+        // 批量查询所有明细
+        List<MesWmOutsourceIssueDetailDO> allDetails = outsourceIssueDetailService.getOutsourceIssueDetailListByIssueId(id);
+        Map<Long, List<MesWmOutsourceIssueDetailDO>> detailMap = CollectionUtils.convertMultiMap(
+                allDetails, MesWmOutsourceIssueDetailDO::getLineId);
+        // 检查每行的明细数量
+        for (MesWmOutsourceIssueLineDO line : lines) {
+            List<MesWmOutsourceIssueDetailDO> details = detailMap.getOrDefault(line.getId(), List.of());
+            BigDecimal totalDetailQuantity = CollectionUtils.getSumValue(details,
+                    MesWmOutsourceIssueDetailDO::getQuantity, BigDecimal::add, BigDecimal.ZERO);
+            // 对比行数量与明细总数量
+            if (line.getQuantity().compareTo(totalDetailQuantity) != 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * 校验外协发料单存在
      */