From 088a46dc697ef5b719f1ab62c9988f96a21e5e0c Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 12 五月 2025 11:17:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialStorageManagementMapper.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialStorageManagementMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialStorageManagementMapper.java
index dcfe594..4bfad1e 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialStorageManagementMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialStorageManagementMapper.java
@@ -63,5 +63,10 @@
     public int deleteApsMaterialStorageManagementByIds(String[] ids);
 
 
-   int updateMaterialStorageByVersion(BigDecimal remainderStock, Integer version);
+   int updateMaterialStorageByVersion(String id, BigDecimal remainderStock, Integer version);
+
+   /**
+    * 鍒濆鍖栧墿浣欏簱瀛樻暟閲�
+    * */
+   int initRemainderStock();
 }

--
Gitblit v1.9.3