From 04bbc3649af0f318e5346eabb0f0446a5376f5d9 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 15:27:27 +0800
Subject: [PATCH] 钣金需求匹配-完善工时计算
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 2 --
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomOrderDetailServiceImpl.java | 3 ++-
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireBomStockDetailServiceImpl.java | 2 ++
3 files changed, 4 insertions(+), 3 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 bd6637b..0f54f59 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
@@ -14,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涓氬姟灞傚鐞�
@@ -101,7 +102,7 @@
{
return apsPlateStandardRequireBomOrderDetailMapper.deleteApsPlateStandardRequireBomOrderDetailById(id);
}
-
+ @Transactional
@Override
public void savePlastPlanAndBomOrderDetail(ApsPlateStandardRequire require, ApsPlatePlan platePlan, BigDecimal subtract, BigDecimal stock, BigDecimal netRequirement) {
platePlan.setUnmatchedQuantity(subtract);
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 3bb35b8..a3637e7 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,6 +109,7 @@
/**
* 璁＄畻鐗╂枡鍓╀綑搴撳瓨 骞朵繚瀛樼墿鏂欏墿浣欏簱瀛樻槑缁嗐��
* */
+ @Transactional
@Override
public void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, String bomLineId,String itemCode, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,Long requireId){
/*鏇存柊鐗╂枡鍓╀綑搴撳瓨*/
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
index 24e079a..af2b106 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
@@ -226,8 +226,6 @@
/*璁＄畻闇�姹傛暟閲�*/
if (level == 0) {
require.setBomUseAmount(BigDecimal.ONE);
- require.setCompleteDate(plan.getPlanEndDay());
- require.setDemandDate(plan.getPlanEndDay());
} else {
require.setBomUseAmount(itemNum.multiply(plan.getProductionQuantity()));
}
--
Gitblit v1.9.3