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/ApsPlateStandardRequireBomStockDetailServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java
index 34616a5..82a379d 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java
@@ -115,7 +115,8 @@
String itemCode, String batchNum, BigDecimal deductionAmount,
BigDecimal afterStockAmount,Long requireId
,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList){
- /*鏇存柊鐗╂枡鍓╀綑搴撳瓨*/
+
+
itemStorageMapper.updateMaterialStorageByVersion(itemStorage.getId(), afterStockAmount,itemStorage.getVersion());
/*璁板綍鎵ｅ噺鏄庣粏*/
ApsPlateStandardRequireBomStockDetail bomStockDetail = ApsPlateStandardRequireBomStockDetail.builder()
@@ -135,7 +136,13 @@
bomStockDetail.setCreateTime(DateUtils.getNowDate());
stockDetailsList.add(bomStockDetail);
- //plateBomStockDetailMapper.insertApsPlateStandardRequireBomStockDetail(bomStockDetail);
-
+ plateBomStockDetailMapper.insertApsPlateStandardRequireBomStockDetail(bomStockDetail);
+ /*鏇存柊鍐呭瓨涓墿鏂欏墿浣欏簱瀛�*/
+ /*itemStorage.setRemainderStock(afterStockAmount);
+ if(null== itemStorage.getVersion()){
+ itemStorage.setVersion(1);
+ }else{
+ itemStorage.setVersion(itemStorage.getVersion()+1);
+ }*/
}
}
--
Gitblit v1.9.3