From dbcc9f8992c97b84aa6ae0a381c807ba6239ae2c Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期四, 15 五月 2025 16:47:08 +0800
Subject: [PATCH] 【UPDATE】刷新BOM、库存、工艺路线数据缓存接口增加刷新钣金子单数据
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 123 +++++++++++++++++++++++++++-------------
1 files changed, 83 insertions(+), 40 deletions(-)
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 fe53f85..e8178ce 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
@@ -14,6 +14,7 @@
import jakarta.annotation.Resource;
import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.mapper.ApsPlateStandardRequireMapper;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.service.IApsPlateStandardRequireService;
@@ -27,6 +28,7 @@
* @author zhl
* @date 2025-05-06
*/
+@Slf4j
@Service
public class ApsPlateStandardRequireServiceImpl implements IApsPlateStandardRequireService
{
@@ -62,7 +64,7 @@
ApsPlateStandardRequireBomOrderDetailMapper plateBomOrderDetailMapper;
@Autowired
- private ApsPlatePlanMapper apsPlatePlanMapper;
+ private IApsPlatePlanService apsPlatePlanService;
@Resource
IApsPlateStandardRequireBomOrderDetailService bomOrderDetailService;
@@ -72,8 +74,8 @@
@Resource
IApsPlateStandardRequireBatchService requireBatchService;
- @Autowired
- private ApsPlateStandardRequireBomStockDetailMapper apsPlateStandardRequireBomStockDetailMapper;
+ @Resource
+ private IApsMaterialStorageManagementService storageManagementService;
/**
* 鏌ヨ閽ｉ噾宸ュ崟鏍囧噯闇�姹�
@@ -173,15 +175,25 @@
String batchNum= requireBatchService.getNewBatchNumber();
/*鑾峰彇閽ｉ噾涓诲崟淇℃伅*/
List<ApsPlatePlan> mainPlans = platePlanMapper.selectPlatePlanByPlantMajor(plantCode,mainOrderType);
+ Hashtable<String, ApsMaterialStorageManagement> usedStorage = new Hashtable<>();
+ /*鍐呭瓨涓瓨鍌ㄥ瓙浠跺伐鍗�*/
+ Hashtable<String, List<ApsPlatePlan>> subPlans = new Hashtable<>();
+ log.info("寮�濮嬬敓鎴愰渶姹傦細");
for (ApsPlatePlan mainPlan : mainPlans) {
String itemNumber = mainPlan.getItemNumber();
/*鏍规嵁鏂欏彿 鑾峰彇BOM Header */
- /*褰撳墠Bom鑺傜偣澶勭悊瀹屾垚鍚庯紝澶勭悊涓嬬骇BOM*/
+
List<ApsPlateStandardRequire> requiresList=new ArrayList<>();
List<ApsPlateStandardRequireBomStockDetail> stockDetailsList=new ArrayList<>();
List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList=new ArrayList<>();
- getBomRequires(plantCode, "0","0",itemNumber,BigDecimal.ONE, batchNum, null, mainPlan, requiresList, 0L,stockDetailsList,orderDetailsList);
+
+
+ log.info("寮�濮嬬敓鎴愰渶姹傦細宸ュ崟鍙凤細"+mainPlan.getDocumentNumber());
+ /*褰撳墠Bom鑺傜偣澶勭悊瀹屾垚鍚庯紝澶勭悊涓嬬骇BOM*/
+ getBomRequires(plantCode, "0","0",itemNumber,BigDecimal.ONE, batchNum, null
+ , mainPlan, requiresList, 0L,stockDetailsList,orderDetailsList,usedStorage,subPlans
+ );
// 鎵归噺鎻掑叆浠ユ彁楂樻�ц兘
if (!requiresList.isEmpty()) {
@@ -192,24 +204,39 @@
apsPlateStandardRequireMapper.batchInsert(batch);
}
}
-
if(!stockDetailsList.isEmpty()){
int batchSize = 1000;
+ stockDetailsList.forEach(x->x.setId(IdUtil.getSnowflakeNextId()));
for (int i = 0; i < stockDetailsList.size(); i += batchSize) {
int end = Math.min(i + batchSize, stockDetailsList.size());
List<ApsPlateStandardRequireBomStockDetail> batch = stockDetailsList.subList(i, end);
plateBomStockDetailMapper.batchInsert(batch);
}
}
-
if(!orderDetailsList.isEmpty()){
int batchSize = 1000;
+ orderDetailsList.forEach(x->x.setId(IdUtil.getSnowflakeNextId()));
for (int i = 0; i < orderDetailsList.size(); i += batchSize) {
int end = Math.min(i + batchSize, orderDetailsList.size());
List<ApsPlateStandardRequireBomOrderDetail> batch = orderDetailsList.subList(i, end);
plateBomOrderDetailMapper.batchInsert(batch);
}
}
+ }
+ /*闆嗕腑淇濆瓨搴撳瓨淇℃伅*/
+ if(!usedStorage.isEmpty()){
+ usedStorage.forEach((key, sm) -> {
+ storageManagementService.updateRemainderStock(sm.getId(),sm.getRemainderStock(),sm.getVersion());
+ });
+ }
+ if(!subPlans.isEmpty()){
+ subPlans.forEach((key, subPlansList) -> {
+ subPlansList.forEach(x->{
+ if (!x.getUnmatchedQuantity().equals(x.getProductionQuantity())){
+ platePlanMapper.updatePlanUnMatchQtyAndVersion(x);
+ }
+ });
+ });
}
}
@@ -226,12 +253,16 @@
* @param plan 璁″垝瀵硅薄
* @param allRequires 鎵�鏈夐渶姹傜殑鍒楄〃
* @param level 灞傜骇
+ * @param stockDetailsList 搴撳瓨鍖归厤璁板綍
+ * @param orderDetailsList 瀛愪欢宸ュ崟鍖归厤璁板綍
*/
private void getBomRequires(String plant, String bomHeaderCode, String bomLineId,String itemCode,BigDecimal itemNum,
String batchNum, Date upLevelStartDate, ApsPlatePlan plan,
List<ApsPlateStandardRequire> allRequires,
- Long level,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList
- ,List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList
+ Long level,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList,
+ List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList,
+ Hashtable<String, ApsMaterialStorageManagement> usedStorage,
+ Hashtable<String, List<ApsPlatePlan>> subPlans
) {
/*鏋勫缓闇�姹備俊鎭�*/
ApsPlateStandardRequire require = new ApsPlateStandardRequire();
@@ -244,28 +275,33 @@
require.setBomLineId(bomLineId);
require.setBomLineCode(itemCode);
require.setBomLineLevel(level);
- require.setBomUseAmount(itemNum);
+ require.setOrderCreateTime(plan.getOrderCreateTime());
require.setCreateTime(DateUtils.getNowDate());
require.setCreateBy(SecurityUtils.getUsername());
require.setDelFlag("0");
require.setProductionBase(plan.getProductionBase());
- /*璁＄畻闇�姹傛暟閲�*/
+ /*BOM鐢ㄩ噺 level0=1 */
if (level == 0) {
require.setBomUseAmount(BigDecimal.ONE);
} else {
- require.setBomUseAmount(itemNum.multiply(plan.getProductionQuantity()));
+ require.setBomUseAmount(itemNum);
}
+ /*璁＄畻闇�姹傛暟閲�*/
+ require.setRequireAmount(itemNum.multiply(plan.getProductionQuantity()));
/*鏌ユ壘搴撳瓨锛岃绠楀噣闇�姹傦紝淇濆瓨鍓╀綑搴撳瓨锛屼繚瀛樺簱瀛樻墸鍑忔槑缁�*/
- BigDecimal remainderStock = BigDecimal.ZERO;
/*榛樿鍑�闇�姹備负BOM鐢ㄩ噺*/
- require.setNetRequirement(require.getBomUseAmount());
- Optional<ApsMaterialStorageManagement> itemStorage = getItemStorage(plant, itemCode);
+ require.setNetRequirement(require.getRequireAmount());
- if (itemStorage.isPresent()) {
- ApsMaterialStorageManagement storage = itemStorage.get();
- /*鍓╀綑搴撳瓨*/
- remainderStock = storage.getRemainderStock();
+ /*璇诲彇搴撳瓨淇℃伅鐨勪紭鍏堢骇-> 鍐呭瓨銆乺edis銆乨b*/
+ Optional<ApsMaterialStorageManagement> itemStorageOpt = Optional.ofNullable(usedStorage.get(itemCode)) ;
+ if(itemStorageOpt.isEmpty()){
+ itemStorageOpt = storageManagementService.getRdsStorage(plant, itemCode);
+ }
+ if (itemStorageOpt.isPresent()) {
+
+ ApsMaterialStorageManagement itemStorage=itemStorageOpt.get();
+ BigDecimal remainderStock =itemStorage.getRemainderStock();
/*璁＄畻鍑�闇�姹� 榛樿=闇�姹傛暟閲�*/
if (remainderStock.compareTo(BigDecimal.ZERO) == 0) {
require.setNetRequirement(require.getBomUseAmount());
@@ -284,7 +320,11 @@
require.setNetRequirement(BigDecimal.ZERO);
}
/*璁板綍搴撳瓨鍓╀綑鏁伴噺锛岃褰曞簱瀛樹娇鐢ㄨ褰�*/
- bomStockDetailService.saveStorageAndDetail(storage, plan, bomLineId,itemCode, batchNum, deductionAmount, afterStockAmount,require.getId(),stockDetailsList);
+ bomStockDetailService.saveStorageAndDetail(itemStorage, plan, bomLineId, itemCode, batchNum, deductionAmount
+ , afterStockAmount, require.getId(), stockDetailsList
+ );
+ /*鏇存柊鍐呭瓨涓殑搴撳瓨浣跨敤淇℃伅*/
+ usedStorage.put(itemCode, itemStorage);
}
}
/*鏈尮閰嶆暟閲忥紝榛樿涓哄噣闇�姹�*/
@@ -318,7 +358,12 @@
/*璁剧疆寮�濮嬫椂闂�*/
Date startDay = new Date();
- startDay.setTime(require.getCompleteDate().getTime() - totalRouteMillisecond);
+ /*寮�濮嬫椂闂� 榛樿涓� 瀹屾垚鏃堕棿 濡傛灉鍑�闇�姹�>0 寮�濮嬫椂闂�=缁撴潫鏃堕棿-宸ュ簭鎬诲伐鏃�*/
+ startDay.setTime(require.getCompleteDate().getTime());
+ if(require.getNetRequirement().compareTo(BigDecimal.ZERO)>0){
+ startDay.setTime(require.getCompleteDate().getTime() - totalRouteMillisecond);
+ }
+
require.setStartDate(startDay);
/*璁＄畻鏄惁鏈夐闄�*/
@@ -334,12 +379,12 @@
require.setMatchState("宸插尮閰�");
require.setMatchMode("搴撳瓨鍖归厤");
if (require.getNetRequirement().compareTo(BigDecimal.ZERO) > 0) {
- require.setMatchState("寰呭尮閰�");
require.setMatchMode("宸ュ崟鍖归厤");
/*浣跨敤瀛愪欢宸ュ崟杩涜闇�姹傚尮閰�*/
- matchRequireAndSubPlan(require,orderDetailsList);
+ matchRequireAndSubPlan(require,orderDetailsList,subPlans);
}
allRequires.add(require);
+ log.info("宸茬敓鎴愰渶姹傦細"+plan.getDocumentNumber()+"bomHeaderCode:"+bomHeaderCode+"bomLineCode:"+itemCode+"bomLevel:"+level);
if (require.getNetRequirement().compareTo(BigDecimal.ZERO) > 0) {
/*褰撳墠Bom鑺傜偣澶勭悊瀹屾垚鍚庯紝澶勭悊涓嬬骇BOM*/
long nextLevel=level+1;
@@ -348,22 +393,13 @@
bomLineList.forEach(line -> {
getBomRequires(plant, itemCode, line.getBomLineId(),line.getItemCode() ,line.getNum() , batchNum
, require.getStartDate(), plan, allRequires, nextLevel,stockDetailsList
- ,orderDetailsList
+ ,orderDetailsList,usedStorage,subPlans
);
});
}
}
}
- /**
- * 鑾峰彇鐗╂枡搴撳瓨淇℃伅
- * */
- private Optional<ApsMaterialStorageManagement> getItemStorage(String plant, String itemNumber) {
- ApsMaterialStorageManagement storageParam = new ApsMaterialStorageManagement();
- storageParam.setItemNumber(itemNumber);
- storageParam.setApplicableFactories(plant);
- return itemStorageMapper.selectApsMaterialStorageManagementList(storageParam).stream()
- .findFirst();
- }
+
/**
* 鑾峰彇閽ｉ噾璁″垝 棰勭暀澶╂暟
@@ -381,11 +417,12 @@
* 浣跨敤瀛愪欢宸ュ崟鍖归厤闇�姹備腑鐨勫噣闇�姹�
* */
- private void matchRequireAndSubPlan(ApsPlateStandardRequire require, List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList) {
+ private void matchRequireAndSubPlan(ApsPlateStandardRequire require, List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList,Hashtable<String, List<ApsPlatePlan>> subPlans) {
BigDecimal netRequirement = require.getNetRequirement();
require.setMatchMode("宸ュ崟鍖归厤");
+ require.setMatchState("宸插尮閰�");
if (netRequirement.compareTo(BigDecimal.ZERO) > 0) {
- ApsPlatePlan platePlan = apsPlatePlanMapper.selectUnMatchPlateSubPlan(require.getOrgCode(), require.getBomLineCode());
+ ApsPlatePlan platePlan = apsPlatePlanService.selectUnMatchPlateSubPlan(require.getOrgCode(), require.getBomLineCode(),subPlans);
/*瀛愪欢宸ュ崟鐨勬湭鍖归厤鏁伴噺 浣滀负褰撳墠鐨勫簱瀛�*/
while (platePlan != null && netRequirement.compareTo(BigDecimal.ZERO) > 0) {
BigDecimal stock = platePlan.getUnmatchedQuantity();
@@ -393,9 +430,11 @@
/* 搴撳瓨鏁伴噺 澶т簬 鍑�闇�姹傛暟閲�*/
/* 鍑�闇�姹傛暟閲�=0 锛屽瓙浠跺伐鍗曟湭鍖归厤鏁伴噺= 搴撳瓨-鍑�闇�姹�*/
BigDecimal subtract = stock.subtract(netRequirement);
+ platePlan.setUnmatchedQuantity(subtract);
+ platePlan.setVersion(platePlan.getVersion() + 1);
bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement,orderDetailsList);
netRequirement = BigDecimal.ZERO;
- require.setMatchState("宸插尮閰�");
+
require.setUnmatchedDemandAmount(BigDecimal.ZERO);
/*鍑�闇�姹傚凡缁忚婊¤冻锛屼笉闇�瑕佺户缁尮閰�*/
@@ -403,9 +442,11 @@
/*鍑�闇�姹傛暟閲� == 搴撳瓨鏁伴噺*/
BigDecimal subtract = BigDecimal.ZERO;
+ platePlan.setUnmatchedQuantity(subtract);
+ platePlan.setVersion(platePlan.getVersion() + 1);
bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement,orderDetailsList);
netRequirement = BigDecimal.ZERO;
- require.setMatchState("宸插尮閰�");
+
require.setUnmatchedDemandAmount(BigDecimal.ZERO);
/*鍑�闇�姹傚凡缁忚婊¤冻锛屼笉闇�瑕佺户缁尮閰�*/
}
@@ -413,16 +454,18 @@
/*闇�姹傚ぇ浜庡簱瀛�*/
/*鍑�闇�姹� 琚儴鍒嗘弧瓒� */
BigDecimal rest = netRequirement.subtract(stock);
- require.setMatchState("鍖归厤涓�");
+ platePlan.setUnmatchedQuantity(BigDecimal.ZERO);
+ platePlan.setVersion(platePlan.getVersion() + 1);
/*宸ュ崟 鏈尮閰嶆暟閲忎负0 鍏ㄩ儴鐢ㄤ簬鍖归厤闇�姹�*/
bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, BigDecimal.ZERO, stock, netRequirement,orderDetailsList);
/*鍑�闇�姹傛湭琚弧瓒筹紝闇�瑕佺户缁尮閰�*/
- platePlan = apsPlatePlanMapper.selectUnMatchPlateSubPlan(require.getOrgCode(), require.getBomLineCode());
+ platePlan = apsPlatePlanService.selectUnMatchPlateSubPlan(require.getOrgCode(), require.getBomLineCode(),subPlans);
/*鍓╀綑鍑�闇�姹�*/
netRequirement = rest;
require.setUnmatchedDemandAmount(rest);
}
}
+
}
}
--
Gitblit v1.9.3