From 822c05c82b72eec1f427cce0fec9f19ee42400ca Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Wed, 22 Mar 2023 13:40:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E4=BD=8D=E4=B9=8B?=
 =?UTF-8?q?=E9=97=B4=E8=BD=AC=E7=A7=BB=E6=97=B6=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DepositoryRecordServiceImpl.java            | 1 +
 .../depository_manage/service/impl/MaterialServiceImpl.java  | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
index e1f07e77..df4f6d8a 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
@@ -741,6 +741,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
             if (!flagForApproval) {
                 // 如果不需要审批
                 Integer result = updateInventoryInfoForApproval(map, quantity, materialById, placeById);
+                map.put("applicationInIdForOut", map.get("id"));
                 map.remove("id");
                 return result;
             } else {
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
index 9ca1006f..dba2267b 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.*;
 import java.util.concurrent.*;
 
@@ -1612,7 +1613,7 @@ public class MaterialServiceImpl implements MaterialService {
                 insertForSplitInventory.put("type", "in");
                 insertForSplitInventory.put("flagForApproval", false);
                 splitUnitService.addSplitInventory(insertForSplitInventory);
-                Integer new_id = ObjectFormatUtil.toInteger(insertForSplitInventory.get("newInMid"));
+                Integer new_id = ObjectFormatUtil.toInteger(insertForSplitInventory.get("applicationInIdForOut"));
                 depositoryRecordMapper.deleteApplicationInRecordById(new_id);
 
             }
@@ -1762,7 +1763,7 @@ public class MaterialServiceImpl implements MaterialService {
                         paramForNewMap.put("realQuantity", String.valueOf(dispose));
                         paramForNewMap.put("quantity", String.valueOf(dispose));
                         depositoryRecordService.applicationInPlace(paramForNewMap, false);
-                        depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(paramForNewMap.get("id")));
+                        depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(paramForNewMap.get("applicationInIdForOut")));
                     }
 
                 } else {