From 2c9fe3cbe9ae9360e45456356b2691c80d588adb Mon Sep 17 00:00:00 2001
From: my_ong <429426262@qq.com>
Date: Sun, 9 Mar 2025 20:36:22 +0800
Subject: [PATCH] =?UTF-8?q?:new:=20=E5=AE=A1=E6=A0=B8=E4=BA=BA=E5=B7=A5?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/ApplyFormController.java         | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 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 215a79d..02bb741 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
@@ -175,7 +175,7 @@ public class ApplyFormController {
         applyForm.setType(ApplyTypeEnum.AUDIT);
         applyFormService.save(applyForm);
         List<Material> materials;
-        if(applyInfo.getAuditType() == AuditTypeEnum.SCAN){
+        if (applyInfo.getAuditType() == AuditTypeEnum.SCAN) {
             materials = materialService.listByIds(applyInfo.getIds());
             materials.forEach(material -> applyDetailService.save(ApplyDetail.builder()
                     .applyId(applyForm.getId())
@@ -185,10 +185,11 @@ public class ApplyFormController {
         }
 
     }
+
     @PostMapping("manual/audit-apply")
     @Operation(summary = "提交人工盘点数据")
-    public void submitManualStock(@Validated @Parameter(description = "人工盘点数据") @RequestBody  List<ManualStockDetail> details){
-        if(details.isEmpty()){
+    public void submitManualStock(@Validated @Parameter(description = "人工盘点数据") @RequestBody List<ManualStockDetail> details) {
+        if (details.isEmpty()) {
             return;
         }
         manualStockDetailService.saveBatch(details);
@@ -197,15 +198,16 @@ public class ApplyFormController {
                 .eq(ApplyForm::getId, details.get(0).getApplyId())
                 .set(ApplyForm::getReviewResult, ReviewResultEnum.WAIT_REVIEW));
     }
+
     @GetMapping("manual/data/{applyId}")
     @Operation(summary = "获取人工盘点数据")
-    public List<ManualStockDTO> getManualStock(@Parameter(description = "申请单ID") @PathVariable(name = "applyId") Long applyId){
-        return  materialStockDetailService.getByApplyId(applyId);
+    public List<ManualStockDTO> getManualStock(@Parameter(description = "申请单ID") @PathVariable(name = "applyId") Long applyId) {
+        // TODO
+        return materialStockDetailService.getByApplyId(applyId);
 
     }
 
 
-
     @GetMapping("wait-scan-data/{applyId}")
     @Operation(summary = "获取盘点的待扫码信息")
     public List<WaitScanInfo> getWaitScanData(@Parameter(description = "申请单ID") @PathVariable(name = "applyId") Long applyId) {
@@ -282,6 +284,18 @@ public class ApplyFormController {
                 .set(reviewDTO.getReviewResult() == ReviewResultEnum.PASS, ApplyForm::getConfirm, Boolean.TRUE)
                 .set(ApplyForm::getReviewRemark, reviewDTO.getRemark())
                 .eq(ApplyForm::getId, reviewDTO.getApplyId()));
+        ApplyForm byId = applyFormService.getById(reviewDTO.getApplyId());
+        if (byId.getAuditType() == AuditTypeEnum.MANUAL) {
+            if (reviewDTO.getReviewResult() != ReviewResultEnum.PASS) {
+                return;
+            }
+            List<ManualStockDetail> details = manualStockDetailService.list(Wrappers.<ManualStockDetail>lambdaQuery()
+                    .eq(ManualStockDetail::getApplyId, reviewDTO.getApplyId()));
+            details.forEach(detail -> materialService.update(Wrappers.<Material>lambdaUpdate()
+                    .set(Material::getStock, detail.getManualStock())
+                    .eq(Material::getId, detail.getMaterialId())));
+            return;
+        }
         if (reviewDTO.getReviewResult() == ReviewResultEnum.PASS) {
             //修改库存明细状态和库存数量
             List<StocktakingScanExceptionalData> list = stocktakingScanExceptionalDataService.list(Wrappers.<StocktakingScanExceptionalData>lambdaQuery()