From 7bc066b5b8c7a0447baef1cfd3cd9089440ae36f Mon Sep 17 00:00:00 2001
From: my_ong <429426262@qq.com>
Date: Sat, 29 Mar 2025 21:51:41 +0800
Subject: [PATCH] =?UTF-8?q?:new:=20=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E7=9B=98=E7=82=B9=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/ApplyFormController.java         | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

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<Material> 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<Material> 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<Material> getManualCheckData(@Parameter(description = "申请单ID") @PathVariable(name = "applyId") Long applyId){
+        List<ApplyDetail> details = applyDetailService.list(Wrappers.<ApplyDetail>lambdaQuery().eq(ApplyDetail::getApplyId, applyId));
+        List<Long> materialIds = details.stream().map(ApplyDetail::getMaterialId).toList();
+        if(materialIds.isEmpty()){
+            return new ArrayList<>();
+        }
+        List<Material> 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<ManualStockDetail> details) {