From dadf503b15f3423980ad2bc17d23ea1a444aca10 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期三, 14 五月 2025 17:48:00 +0800
Subject: [PATCH] 【UPDATE】修改mapper适配mybatis-plus

---
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 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 e1acf03..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
@@ -13,6 +13,7 @@
 import org.springframework.stereotype.Service;
 import com.aps.core.mapper.ApsPlateStandardRequireBomStockDetailMapper;
 import com.aps.core.service.IApsPlateStandardRequireBomStockDetailService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * ApsPlateStandardRequireBomStockDetailService涓氬姟灞傚鐞�
@@ -108,17 +109,22 @@
     /**
      * 璁$畻鐗╂枡鍓╀綑搴撳瓨 骞朵繚瀛樼墿鏂欏墿浣欏簱瀛樻槑缁嗐��
      * */
+    @Transactional
     @Override
-    public void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,Long requireId){
-        /*鏇存柊鐗╂枡鍓╀綑搴撳瓨*/
-        itemStorageMapper.updateMaterialStorageByVersion(afterStockAmount,itemStorage.getVersion());
+    public void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, String bomLineId,
+                                     String itemCode, String batchNum, BigDecimal deductionAmount,
+                                     BigDecimal afterStockAmount,Long requireId
+            ,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList){
+
+
+        itemStorageMapper.updateMaterialStorageByVersion(itemStorage.getId(), afterStockAmount,itemStorage.getVersion());
         /*璁板綍鎵e噺鏄庣粏*/
         ApsPlateStandardRequireBomStockDetail bomStockDetail = ApsPlateStandardRequireBomStockDetail.builder()
                 .id(IdUtil.getSnowflakeNextId())
                 .requireId(requireId)
                 .requireTrackId(plan.getRequireId())
-                .bomLineId(bomLine.getBomLineId())
-                .bomLineCode(bomLine.getItemCode())
+                .bomLineId(bomLineId)
+                .bomLineCode(itemCode)
                 .beforeStockAmount(itemStorage.getRemainderStock())
                 .deductionAmount(deductionAmount)
                 .afterStockAmount(afterStockAmount)
@@ -129,8 +135,14 @@
         bomStockDetail.setCreateBy(SecurityUtils.getUsername());
         bomStockDetail.setCreateTime(DateUtils.getNowDate());
 
+        stockDetailsList.add(bomStockDetail);
         plateBomStockDetailMapper.insertApsPlateStandardRequireBomStockDetail(bomStockDetail);
-
+        /*鏇存柊鍐呭瓨涓墿鏂欏墿浣欏簱瀛�*/
+        /*itemStorage.setRemainderStock(afterStockAmount);
+        if(null== itemStorage.getVersion()){
+            itemStorage.setVersion(1);
+        }else{
+            itemStorage.setVersion(itemStorage.getVersion()+1);
+        }*/
     }
-
 }

--
Gitblit v1.9.3