From f306557dbcfc1583a45e26d86fdfe0aa4b446fb4 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期三, 14 五月 2025 18:45:04 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
index bc6c7b0..f360c6f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java
@@ -5,6 +5,7 @@
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.ApsPlatePlan;
import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.mapper.ApsPlatePlanMapper;
@@ -13,6 +14,7 @@
import com.aps.core.mapper.ApsPlateStandardRequireBomOrderDetailMapper;
import com.aps.core.domain.ApsPlateStandardRequireBomOrderDetail;
import com.aps.core.service.IApsPlateStandardRequireBomOrderDetailService;
+import org.springframework.transaction.annotation.Transactional;
/**
* ApsPlateStandardRequireBomOrderDetailService涓氬姟灞傚鐞�
@@ -100,16 +102,17 @@
{
return apsPlateStandardRequireBomOrderDetailMapper.deleteApsPlateStandardRequireBomOrderDetailById(id);
}
-
+ @Transactional
@Override
- public void savePlastPlanAndBomOrderDetail(ApsPlateStandardRequire require, ApsPlatePlan platePlan, BigDecimal subtract, BigDecimal stock, BigDecimal netRequirement) {
+ public void savePlastPlanAndBomOrderDetail(ApsPlateStandardRequire require, ApsPlatePlan platePlan, BigDecimal subtract
+ , BigDecimal stock, BigDecimal netRequirement, List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList) {
platePlan.setUnmatchedQuantity(subtract);
apsPlatePlanMapper.updatePlanUnMatchQtyByVersion(platePlan);
/* 璁板綍宸ュ崟涓庡噣闇�姹傜殑鍖归厤鍏崇郴*/
ApsPlateStandardRequireBomOrderDetail bomOrderDetail = ApsPlateStandardRequireBomOrderDetail.builder()
.id(IdUtil.getSnowflakeNextId())
- .requireId(require.getId().toString())
- .requireTrackId(require.getRequireId())
+ .requireId(require.getId())
+ .requireTrackId(require.getRequireTrackId())
.bomLineId(require.getBomLineId())
.bomLineCode(require.getBomLineCode())
.docNo(platePlan.getDocumentNumber())
@@ -117,7 +120,18 @@
.deductionAmount(netRequirement)
.afterProdAmount(subtract)
.batchNumber(require.getBatchNumber())
+ .orgCode(require.getOrgCode())
+ .delFlag("0")
.build();
+ bomOrderDetail.setCreateTime(DateUtils.getNowDate());
+ bomOrderDetail.setCreateBy(SecurityUtils.getUsername());
+
+ orderDetailsList.add(bomOrderDetail);
apsPlateStandardRequireBomOrderDetailMapper.insertApsPlateStandardRequireBomOrderDetail(bomOrderDetail);
}
+
+ @Override
+ public List<ApsPlatePlan> selectRequireUpAndDownLevel(Long requireId){
+ return apsPlateStandardRequireBomOrderDetailMapper.selectRequireUpAndDownLevel(requireId);
+ }
}
--
Gitblit v1.9.3