From b9104dd956e2c8b6b8dd3ec090ee4dd00bff13a1 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Mon, 18 May 2026 17:56:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Impl/LdOneOutStorageServiceImpl.java      | 27 ++++++++++---------
 .../Impl/LdOnePutStorageServiceImpl.java      |  2 ++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java
index dc24d28..7ad29f7 100644
--- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java
+++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOneOutStorageServiceImpl.java
@@ -466,20 +466,22 @@ public class LdOneOutStorageServiceImpl extends ServiceImpl<LdOneOutStorageMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean delete(Long id) {
-        //根据id删除一级出库表
-        this.removeById(id);
+        LdOneOutStorage oneOutStorage = this.getById(id);
         //根据id查询一级出库明细
         List<LdOneOutStorageDetail> oneOutStorageDetails = oneOutStorageDetailService.list(Wrappers.<LdOneOutStorageDetail>lambdaQuery().eq(LdOneOutStorageDetail::getOneOutStorageId,id));
-        //还原库存
-        for (LdOneOutStorageDetail ldOneOutStorageDetail : oneOutStorageDetails) {
-            System.out.println(ldOneOutStorageDetail.getOneFormId());
-            // 库存
-            LdOneForm oneForm = oneFormService.getByMaterialCode(ldOneOutStorageDetail.getMaterialCode(),ldOneOutStorageDetail.getOneFormId());
-            // 计算数量 金额
-            BigDecimal result = oneForm.getNum().add(ldOneOutStorageDetail.getOutboundQuantity());
-            oneForm.setNum(result);
-            oneFormService.updateById(oneForm);
+        if("2".equals(oneOutStorage.getStatus())){
+            //已提交的还原库存
+            for (LdOneOutStorageDetail ldOneOutStorageDetail : oneOutStorageDetails) {
+                System.out.println(ldOneOutStorageDetail.getOneFormId());
+                // 库存
+                LdOneForm oneForm = oneFormService.getByMaterialCode(ldOneOutStorageDetail.getMaterialCode(),ldOneOutStorageDetail.getOneFormId());
+                // 计算数量 金额
+                BigDecimal result = oneForm.getNum().add(ldOneOutStorageDetail.getOutboundQuantity());
+                oneForm.setNum(result);
+                oneFormService.updateById(oneForm);
+            }
         }
+
         List<Long> detailIdList = oneOutStorageDetails.stream().map(LdOneOutStorageDetail::getId).collect(Collectors.toList());
         if(!CollectionUtils.isEmpty(detailIdList)){
             oneOutStorageDetailService.removeByIds(detailIdList);
@@ -507,7 +509,8 @@ public class LdOneOutStorageServiceImpl extends ServiceImpl<LdOneOutStorageMappe
                 twoPutStorageDetailService.removeByIds(twoDetailIdList);
             }
         }
-
+        //根据id删除一级出库表
+        this.removeById(id);
         return true;
     }
 }
diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java
index 2bf2534..683dec6 100644
--- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java
+++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdOnePutStorageServiceImpl.java
@@ -440,6 +440,8 @@ public class LdOnePutStorageServiceImpl extends ServiceImpl<LdOnePutStorageMappe
         // 3.删除明细
         deleteDetails(dto);
 
+        // 4. 提交审批
+        submitForApproval(dto);
         return true;
     }