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 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 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 d7a13f5..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 @@ -1,12 +1,19 @@ package com.aps.core.service.impl; +import java.math.BigDecimal; import java.util.List; + +import cn.hutool.core.util.IdUtil; import com.aps.common.core.utils.DateUtils; +import com.aps.common.security.utils.SecurityUtils; +import com.aps.core.domain.*; +import com.aps.core.mapper.ApsMaterialStorageManagementMapper; +import jakarta.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.aps.core.mapper.ApsPlateStandardRequireBomStockDetailMapper; -import com.aps.core.domain.ApsPlateStandardRequireBomStockDetail; import com.aps.core.service.IApsPlateStandardRequireBomStockDetailService; +import org.springframework.transaction.annotation.Transactional; /** * ApsPlateStandardRequireBomStockDetailService涓氬姟灞傚鐞� @@ -19,7 +26,11 @@ { @Autowired private ApsPlateStandardRequireBomStockDetailMapper apsPlateStandardRequireBomStockDetailMapper; + @Resource + ApsMaterialStorageManagementMapper itemStorageMapper; + @Resource + ApsPlateStandardRequireBomStockDetailMapper plateBomStockDetailMapper; /** * 鏌ヨApsPlateStandardRequireBomStockDetail * @@ -93,4 +104,45 @@ { return apsPlateStandardRequireBomStockDetailMapper.deleteApsPlateStandardRequireBomStockDetailById(id); } + + + /** + * 璁$畻鐗╂枡鍓╀綑搴撳瓨 骞朵繚瀛樼墿鏂欏墿浣欏簱瀛樻槑缁嗐�� + * */ + @Transactional + @Override + 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(bomLineId) + .bomLineCode(itemCode) + .beforeStockAmount(itemStorage.getRemainderStock()) + .deductionAmount(deductionAmount) + .afterStockAmount(afterStockAmount) + .batchNumber(batchNum) + .orgCode(itemStorage.getApplicableFactories()) + .delFlag("0") + .build(); + 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