From dc02c5dfaedc7cd1c35d80faf443a2a2c2185b41 Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Fri, 22 Aug 2025 19:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E8=B5=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MatMaterialsUseRecordServiceImpl.java     | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsUseRecordServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsUseRecordServiceImpl.java
index 488bf615..8c892d11 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsUseRecordServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialsUseRecordServiceImpl.java
@@ -104,7 +104,7 @@ public class MatMaterialsUseRecordServiceImpl extends ServiceImpl<MatMaterialsUs
         );
         BigDecimal residueNumber;
         if (lastRecord == null) {
-            residueNumber = BigDecimal.valueOf(inventory.getNumber());
+            residueNumber = BigDecimal.valueOf(inventory.getResidue());
         } else {
             residueNumber = lastRecord.getResidueNumber();
         }
@@ -113,7 +113,18 @@ public class MatMaterialsUseRecordServiceImpl extends ServiceImpl<MatMaterialsUs
             throw new ServiceException("使用数量不能大于库存数量", HttpStatus.BAD_REQUEST);
         }
         materialsUseRecord.setResidueNumber(subtract);
-        return this.save(materialsUseRecord);
+        boolean save = this.save(materialsUseRecord);
+        if (!save) {
+            throw new ServiceException("保存材料使用登记失败", HttpStatus.ERROR);
+        }
+        MatMaterialsInventory updateInventory = new MatMaterialsInventory();
+        updateInventory.setId(inventoryId);
+        updateInventory.setResidue(subtract.longValue());
+        boolean update = materialsInventoryService.updateById(updateInventory);
+        if (!update) {
+            throw new ServiceException("更新库存信息失败", HttpStatus.ERROR);
+        }
+        return true;
     }
 
     /**
@@ -140,14 +151,26 @@ public class MatMaterialsUseRecordServiceImpl extends ServiceImpl<MatMaterialsUs
             throw new ServiceException("只能修改最新数据", HttpStatus.CONFLICT);
         }
         BigDecimal useNumber = req.getUseNumber();
+        BigDecimal subtract = BigDecimal.ZERO;
         if (useNumber != null && useNumber.compareTo(oldMaterialsUseRecord.getUseNumber()) != 0) {
-            BigDecimal subtract = oldMaterialsUseRecord.getResidueNumber().add(oldMaterialsUseRecord.getUseNumber()).subtract(useNumber);
+            subtract = oldMaterialsUseRecord.getResidueNumber().add(oldMaterialsUseRecord.getUseNumber()).subtract(useNumber);
             if (subtract.compareTo(BigDecimal.ZERO) < 0) {
                 throw new ServiceException("使用数量不能大于库存数量", HttpStatus.BAD_REQUEST);
             }
             materialsUseRecord.setResidueNumber(subtract);
         }
-        return this.updateById(materialsUseRecord);
+        boolean update = this.updateById(materialsUseRecord);
+        if (!update) {
+            throw new ServiceException("修改材料使用登记信息失败", HttpStatus.ERROR);
+        }
+        MatMaterialsInventory updateInventory = new MatMaterialsInventory();
+        updateInventory.setId(oldMaterialsUseRecord.getInventoryId());
+        updateInventory.setResidue(subtract.longValue());
+        boolean updated = materialsInventoryService.updateById(updateInventory);
+        if (!updated) {
+            throw new ServiceException("更新库存信息失败", HttpStatus.ERROR);
+        }
+        return true;
     }
 
     /**