From 706ebb998c15478872f034cb96786c33ca1ed6a4 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期一, 12 五月 2025 19:57:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java
index 47d6e6c..79015ad 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialStorageManagementServiceImpl.java
@@ -1,5 +1,9 @@
package com.aps.core.service.impl;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Optional;
+
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.aps.common.core.utils.DateUtils;
@@ -105,7 +109,8 @@
/**
* 鑾峰彇鐗╂枡搴撳瓨淇℃伅
* */
- private Optional<ApsMaterialStorageManagement> getItemStorage(String plant, String itemNumber) {
+ @Override
+ public Optional<ApsMaterialStorageManagement> getItemStorage(String plant, String itemNumber) {
ApsMaterialStorageManagement storageParam = new ApsMaterialStorageManagement();
storageParam.setItemNumber(itemNumber);
storageParam.setApplicableFactories(plant);
@@ -183,4 +188,16 @@
// }
return true;
}
+
+ /**
+ * 鏇存柊搴撳瓨淇℃伅
+ * */
+ public int updateMaterialStorageByVersion(String id, BigDecimal remainderStock, Integer version) {
+ return apsMaterialStorageManagementMapper.updateMaterialStorageByVersion(id, remainderStock, version);
+ }
+
+ @Override
+ public int updateRemainderStock(String id, BigDecimal remainderStock, Integer version){
+ return apsMaterialStorageManagementMapper.updateRemainderStock(id, remainderStock, version);
+ }
}
--
Gitblit v1.9.3