From 5c5bc65b0edb80a4c990015a43bda0f800b25202 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 10:21:11 +0800
Subject: [PATCH] 钣金需求匹配-程序完善
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 99 ++++++++++++++++++++++++++-----------------------
1 files changed, 52 insertions(+), 47 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 0e40df7..8466aaa 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
@@ -3,7 +3,6 @@
import java.math.BigDecimal;
import java.util.*;
-import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.security.utils.DictUtils;
@@ -18,6 +17,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.service.IApsPlateStandardRequireService;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -69,6 +69,9 @@
@Resource
IApsStandardProcessRouteLineService routeLineService;
+
+ @Resource
+ IApsPlateStandardRequireBatchService requireBatchService;
/**
* 鏌ヨ閽ｉ噾宸ュ崟鏍囧噯闇�姹�
@@ -154,27 +157,29 @@
return apsPlateStandardRequireMapper.selectPlateSupplyGapList(apsPlateStandardRequire);
}
- private void generatorPlan(){
+ @Transactional
+ @Override
+ public void generatorPlan(){
+ /*鍒濆鍖栨暟鎹�*/
+ requireBatchService.initRequireBatch();
/*瀹氫箟宸ュ巶涓哄崡閫� */
String plantCode="FORTUNA";
/*瀹氫箟涓诲崟绫诲瀷涓洪挘閲戜富鍗�*/
- String mainOrderType = "閽ｉ噾涓讳欢";
+ String mainOrderType = "0";
/*鐢熸垚鏂版壒娆″彿*/
- String batchNum=getBatch();
+ String batchNum= requireBatchService.getNewBatchNumber();
/*鑾峰彇閽ｉ噾涓诲崟淇℃伅*/
List<ApsPlatePlan> mainPlans = platePlanMapper.selectPlatePlanByPlantMajor(plantCode,mainOrderType);
for (ApsPlatePlan mainPlan : mainPlans) {
String itemNumber = mainPlan.getItemNumber();
/*鏍规嵁鏂欏彿 鑾峰彇BOM Header */
/*褰撳墠Bom鑺傜偣澶勭悊瀹屾垚鍚庯紝澶勭悊涓嬬骇BOM*/
- List<ApsBom> bomLineList = bomLineService.selectApsBomLineList(plantCode, itemNumber);
+
List<ApsPlateStandardRequire> requiresList=new ArrayList<>();
- if(!bomLineList.isEmpty()){
- bomLineList.forEach(line -> {
- getBomRequires(plantCode, line, batchNum, null, mainPlan, requiresList, 0L);
- });
- }
+
+ getBomRequires(plantCode, "0",itemNumber,BigDecimal.ONE, batchNum, null, mainPlan, requiresList, 0L);
+
// 鎵归噺鎻掑叆浠ユ彁楂樻�ц兘
if (!requiresList.isEmpty()) {
int batchSize = 1000;
@@ -189,33 +194,46 @@
/**
* 鏋勫缓闇�姹備俊鎭�
- * */
- private void getBomRequires(String plant, ApsBom bomLine, String batchNum, Date upLevelStartDate, ApsPlatePlan plan, List<ApsPlateStandardRequire> allRequires, Long level) {
-
- String itemNumber = bomLine.getItemCode();
+ *
+ * @param plant 宸ュ巶浠ｇ爜
+ * @param bomLineId BOM琛孖D
+ * @param itemCode 鐗╂枡浠ｇ爜
+ * @param itemNum 鐗╂枡鏁伴噺
+ * @param batchNum 鎵规鍙�
+ * @param upLevelStartDate 涓婄骇宸ュ簭鐨勫紑濮嬫棩鏈�
+ * @param plan 璁″垝瀵硅薄
+ * @param allRequires 鎵�鏈夐渶姹傜殑鍒楄〃
+ * @param level 灞傜骇
+ */
+ private void getBomRequires(String plant, String bomLineId,String itemCode,BigDecimal itemNum, String batchNum, Date upLevelStartDate, ApsPlatePlan plan, List<ApsPlateStandardRequire> allRequires, Long level) {
/*鏋勫缓闇�姹備俊鎭�*/
ApsPlateStandardRequire require = new ApsPlateStandardRequire();
require.setId(IdUtil.getSnowflakeNextId());
- require.setRequireId(plan.getId());
+ require.setRequireTrackId(plan.getId());
require.setBatchNumber(batchNum);
require.setDocNum(plan.getDocumentNumber());
require.setOrgCode(plant);
- require.setBomLineCode(itemNumber);
+ require.setBomLineId(bomLineId);
+ require.setBomLineCode(itemCode);
require.setBomLineLevel(level);
- require.setBomUseAmount(bomLine.getNum());
+ require.setBomUseAmount(itemNum);
require.setCreateTime(DateUtils.getNowDate());
require.setCreateBy(SecurityUtils.getUsername());
+ require.setDelFlag("0");
+ require.setProductionBase(plan.getProductionBase());
/*璁＄畻闇�姹傛暟閲�*/
if (level == 0) {
require.setBomUseAmount(BigDecimal.ONE);
require.setCompleteDate(plan.getPlanEndDay());
require.setDemandDate(plan.getPlanEndDay());
} else {
- require.setBomUseAmount(bomLine.getNum().multiply(plan.getProductionQuantity()));
+ require.setBomUseAmount(itemNum.multiply(plan.getProductionQuantity()));
}
/*鏌ユ壘搴撳瓨锛岃绠楀噣闇�姹傦紝淇濆瓨鍓╀綑搴撳瓨锛屼繚瀛樺簱瀛樻墸鍑忔槑缁�*/
BigDecimal remainderStock = BigDecimal.ZERO;
- Optional<ApsMaterialStorageManagement> itemStorage = getItemStorage(plant, itemNumber);
+ /*榛樿鍑�闇�姹備负BOM鐢ㄩ噺*/
+ require.setNetRequirement(require.getBomUseAmount());
+ Optional<ApsMaterialStorageManagement> itemStorage = getItemStorage(plant, itemCode);
if (itemStorage.isPresent()) {
ApsMaterialStorageManagement storage = itemStorage.get();
/*鍓╀綑搴撳瓨*/
@@ -237,10 +255,10 @@
afterStockAmount = remainderStock.subtract(deductionAmount);
require.setNetRequirement(BigDecimal.ZERO);
}
- bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount,require.getId().toString());
+ /*璁板綍搴撳瓨鍓╀綑鏁伴噺锛岃褰曞簱瀛樹娇鐢ㄨ褰�*/
+ bomStockDetailService.saveStorageAndDetail(storage, plan, bomLineId,itemCode, batchNum, deductionAmount, afterStockAmount,require.getId());
}
}
-
/*宸ヨ壓璺嚎鎬婚渶姹�*/
ApsStandardProcessRouteLine routeHeader = routeLineService.getRouteLineTotalTime(require);
String routeId = routeHeader.getRouteId();
@@ -268,10 +286,10 @@
require.setStartDate(startDay);
/*璁＄畻鏄惁鏈夐闄�*/
- require.setHasDelayRisk("鏃犻闄�");
+ require.setHasDelayRisk("0");
Date dateZero = getDateZero(DateUtils.getNowDate());
if (startDay.before(dateZero)) {
- require.setHasDelayRisk("鏈夐闄�");
+ require.setHasDelayRisk("1");
}
/*鐢熶骇鍩哄湴*/
@@ -282,33 +300,20 @@
if (require.getNetRequirement().compareTo(BigDecimal.ZERO) > 0) {
require.setMatchState("寰呭尮閰�");
require.setMatchMode("宸ュ崟鍖归厤");
+ /*浣跨敤瀛愪欢宸ュ崟杩涜闇�姹傚尮閰�*/
+ matchRequireAndSubPlan(require);
}
- /*浣跨敤瀛愪欢宸ュ崟杩涜闇�姹傚尮閰�*/
- matchRequireAndSubPlan(require);
-
allRequires.add(require);
- /*褰撳墠Bom鑺傜偣澶勭悊瀹屾垚鍚庯紝澶勭悊涓嬬骇BOM*/
- List<ApsBom> bomLineList = bomLineService.selectApsBomLineList(plant, itemNumber);
- if (!bomLineList.isEmpty()) {
- bomLineList.forEach(line -> {
- getBomRequires(plant, line, batchNum, require.getStartDate(), plan, allRequires, level + 1);
- });
+ if (require.getNetRequirement().compareTo(BigDecimal.ZERO) > 0) {
+ /*褰撳墠Bom鑺傜偣澶勭悊瀹屾垚鍚庯紝澶勭悊涓嬬骇BOM*/
+ long nextLevel=level+1;
+ List<ApsBom> bomLineList = bomLineService.selectApsBomLineList(plant, itemCode);
+ if (!bomLineList.isEmpty()) {
+ bomLineList.forEach(line -> {
+ getBomRequires(plant, line.getBomLineId(),line.getItemCode() ,line.getNum() , batchNum, require.getStartDate(), plan, allRequires, nextLevel);
+ });
+ }
}
- }
-
- /**
- * 鐢熸垚鏂版壒娆″彿
- * */
- private String getBatch() {
- String batchNum = System.currentTimeMillis() + "";
- ApsPlateStandardRequireBatch batchBuilder = ApsPlateStandardRequireBatch.builder()
- .id(IdUtil.getSnowflakeNextId())
- .batchNumber(batchNum)
- .delFlag("0").build();
- batchBuilder.setCreateBy(SecurityUtils.getUsername());
- batchBuilder.setCreateTime(DateUtils.getNowDate());
- requireBatchMapper.insertApsPlateStandardRequireBatch(batchBuilder);
- return batchNum;
}
/**
* 鑾峰彇鐗╂枡搴撳瓨淇℃伅
--
Gitblit v1.9.3