diff --git a/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java b/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java index 0db7a33..dc90cef 100644 --- a/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java +++ b/src/main/java/tech/riemann/ims/controller/platform/material/ApplyFormController.java @@ -270,18 +270,29 @@ public class ApplyFormController { ApplyForm applyForm = applyInfo.to(); applyForm.setType(ApplyTypeEnum.AUDIT); applyFormService.save(applyForm); - List materials; - if (applyInfo.getAuditType() == AuditTypeEnum.SCAN) { - materials = materialService.listByIds(applyInfo.getIds()); - materials.forEach(material -> applyDetailService.save(ApplyDetail.builder() - .applyId(applyForm.getId()) - .materialId(material.getId()) - .quantity(material.getStock()) - .build())); - } + List materials = materialService.listByIds(applyInfo.getIds()); + materials.forEach(material -> applyDetailService.save(ApplyDetail.builder() + .applyId(applyForm.getId()) + .materialId(material.getId()) + .quantity(material.getStock()) + .build())); } + @GetMapping("manual/check-data/{applyId}") + @Operation(summary = "查询人工盘点选中物料的待核查数据") + public List getManualCheckData(@Parameter(description = "申请单ID") @PathVariable(name = "applyId") Long applyId){ + List details = applyDetailService.list(Wrappers.lambdaQuery().eq(ApplyDetail::getApplyId, applyId)); + List materialIds = details.stream().map(ApplyDetail::getMaterialId).toList(); + if(materialIds.isEmpty()){ + return new ArrayList<>(); + } + List result = materialService.listByIds(materialIds); + result.forEach(item -> item.setTypeName(typeService.getTypeName(item.getType()))); + return result; + } + + @PostMapping("manual/audit-apply") @Operation(summary = "提交人工盘点数据") public void submitManualStock(@Validated @Parameter(description = "人工盘点数据") @RequestBody List details) {