From 3ccc377c3a4ed61629ab133232b13f540afb98d3 Mon Sep 17 00:00:00 2001
From: my_ong <429426262@qq.com>
Date: Wed, 5 Mar 2025 23:46:05 +0800
Subject: [PATCH] =?UTF-8?q?:new:=20=E7=9B=98=E7=82=B9=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/material/ApplyFormController.java   | 16 ++++++++--------
 .../riemann/ims/dto/request/AuditApplyInfo.java  |  3 +++
 .../riemann/ims/entity/material/ApplyForm.java   |  2 +-
 .../tech/riemann/ims/enums/AuditTypeEnum.java    |  4 ++--
 4 files changed, 14 insertions(+), 11 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 aeabf18..28d5484 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
@@ -173,19 +173,19 @@ public class ApplyFormController {
         applyForm.setType(ApplyTypeEnum.AUDIT);
         applyFormService.save(applyForm);
         List<Material> materials;
-        if(applyInfo.getAuditType() == AuditTypeEnum.ALL){
-            materials = materialService.list();
-        }else{
+        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()));
         }
 
-        materials.forEach(material -> applyDetailService.save(ApplyDetail.builder()
-                .applyId(applyForm.getId())
-                .materialId(material.getId())
-                .quantity(material.getStock())
-                .build()));
     }
 
+
+
     @GetMapping("wait-scan-data/{applyId}")
     @Operation(summary = "获取盘点的待扫码信息")
     public List<WaitScanInfo> getWaitScanData(@Parameter(description = "申请单ID") @PathVariable(name = "applyId") Long applyId) {
diff --git a/src/main/java/tech/riemann/ims/dto/request/AuditApplyInfo.java b/src/main/java/tech/riemann/ims/dto/request/AuditApplyInfo.java
index 51c4a55..350aa98 100644
--- a/src/main/java/tech/riemann/ims/dto/request/AuditApplyInfo.java
+++ b/src/main/java/tech/riemann/ims/dto/request/AuditApplyInfo.java
@@ -23,6 +23,9 @@ public class AuditApplyInfo extends ApplyForm {
     @Schema(description = "物料ids")
     private List<String> ids;
 
+    @Schema(description = "物料类型")
+    private List<String> types;
+
 
     public ApplyForm to(){
         return Json.fromJson(ApplyForm.class, Json.toJson(this));
diff --git a/src/main/java/tech/riemann/ims/entity/material/ApplyForm.java b/src/main/java/tech/riemann/ims/entity/material/ApplyForm.java
index 5a5761e..430e3ca 100644
--- a/src/main/java/tech/riemann/ims/entity/material/ApplyForm.java
+++ b/src/main/java/tech/riemann/ims/entity/material/ApplyForm.java
@@ -47,7 +47,7 @@ public class ApplyForm extends IdBaseEntity {
     @ColDefine(type = ColType.INT)
     private ApplyTypeEnum type;
 
-    @Schema(description = "盘点类型（1: 全盘 2: 部分盘点）", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    @Schema(description = "盘点类型（1: 扫码 2: 人工）", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @TableField("af_audit_type")
     @Column("af_audit_type")
     @Comment("盘点类型")
diff --git a/src/main/java/tech/riemann/ims/enums/AuditTypeEnum.java b/src/main/java/tech/riemann/ims/enums/AuditTypeEnum.java
index b4d201e..cb01600 100644
--- a/src/main/java/tech/riemann/ims/enums/AuditTypeEnum.java
+++ b/src/main/java/tech/riemann/ims/enums/AuditTypeEnum.java
@@ -13,8 +13,8 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum AuditTypeEnum implements ICodeBook {
 
-    ALL("1", "全部盘点"),
-    PARTIAL("2", "部分盘点")
+    SCAN("1", "扫码盘点"),
+    PARTIAL("2", "人工盘点"),
     ;
 
     @EnumValue