From 191b8ae5c768fbb97c7cdea87edde77d0a10e7da Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 15:15:41 +0800
Subject: [PATCH] 钣金需求匹配-完善工时计算
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 102 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 64 insertions(+), 38 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 1c2b7df..24e079a 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
@@ -175,13 +175,11 @@
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","0",itemNumber,BigDecimal.ONE, batchNum, null, mainPlan, requiresList, 0L);
+
// 鎵归噺鎻掑叆浠ユ彁楂樻�ц兘
if (!requiresList.isEmpty()) {
int batchSize = 1000;
@@ -196,10 +194,19 @@
/**
* 鏋勫缓闇�姹備俊鎭�
- * */
- 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 bomHeaderCode BOM涓婄骇鐗╂枡缂栫爜
+ * @param bomLineId BOM琛孖D
+ * @param itemCode 鐗╂枡浠ｇ爜
+ * @param itemNum 鐗╂枡鏁伴噺
+ * @param batchNum 鎵规鍙�
+ * @param upLevelStartDate 涓婄骇宸ュ簭鐨勫紑濮嬫棩鏈�
+ * @param plan 璁″垝瀵硅薄
+ * @param allRequires 鎵�鏈夐渶姹傜殑鍒楄〃
+ * @param level 灞傜骇
+ */
+ private void getBomRequires(String plant, String bomHeaderCode, 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());
@@ -207,24 +214,28 @@
require.setBatchNumber(batchNum);
require.setDocNum(plan.getDocumentNumber());
require.setOrgCode(plant);
- require.setBomLineCode(itemNumber);
+ require.setBomHeaderCode(bomHeaderCode);
+ 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;
/*榛樿鍑�闇�姹備负BOM鐢ㄩ噺*/
require.setNetRequirement(require.getBomUseAmount());
- Optional<ApsMaterialStorageManagement> itemStorage = getItemStorage(plant, itemNumber);
+ Optional<ApsMaterialStorageManagement> itemStorage = getItemStorage(plant, itemCode);
if (itemStorage.isPresent()) {
ApsMaterialStorageManagement storage = itemStorage.get();
/*鍓╀綑搴撳瓨*/
@@ -246,10 +257,12 @@
afterStockAmount = remainderStock.subtract(deductionAmount);
require.setNetRequirement(BigDecimal.ZERO);
}
- bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount,require.getId());
+ /*璁板綍搴撳瓨鍓╀綑鏁伴噺锛岃褰曞簱瀛樹娇鐢ㄨ褰�*/
+ bomStockDetailService.saveStorageAndDetail(storage, plan, bomLineId,itemCode, batchNum, deductionAmount, afterStockAmount,require.getId());
}
}
-
+ /*鏈尮閰嶆暟閲忥紝榛樿涓哄噣闇�姹�*/
+ require.setUnmatchedDemandAmount(require.getNetRequirement());
/*宸ヨ壓璺嚎鎬婚渶姹�*/
ApsStandardProcessRouteLine routeHeader = routeLineService.getRouteLineTotalTime(require);
String routeId = routeHeader.getRouteId();
@@ -259,21 +272,27 @@
require.setProcessRouteId(routeId);
require.setProcessRouteHours(String.valueOf(totalRouteTime));
- /*瀹屾垚鏃堕棿锛宭evel=0 鏃堕粯璁や负宸ュ崟鐨勮鍒掑畬鎴愭棩鏈�*/
- Date completeDate = plan.getPlanEndDay();
+
/*棰勭暀澶╂暟*/
Long reservedDay = getReservedDays();
- if (level > 0) {
+ /*璁剧疆瀹屾垚鏃ユ湡*/
+ if(level==0){
+ /*瀹屾垚鏃堕棿锛宭evel=0 鏃堕粯璁や负宸ュ崟鐨勮鍒掑畬鎴愭棩鏈�*/
+ require.setCompleteDate(plan.getPlanEndDay());
+ require.setDemandDate(plan.getPlanEndDay());
+ } else {
/* 褰撳墠闇�姹傚畬鎴愭棩鏈熶负涓婇樁灞傞渶姹傜殑寮�濮嬫椂闂� - 棰勭暀澶╂暟(杞崲涓烘绉�)*/
long reservedMillisecond = reservedDay * 24 * millisecond;
+ Date completeDate = new Date();
completeDate.setTime(upLevelStartDate.getTime() - reservedMillisecond);
+ require.setCompleteDate(completeDate);
+ require.setDemandDate(completeDate);
}
- /*璁剧疆瀹屾垚鏃ユ湡*/
- require.setCompleteDate(completeDate);
- require.setDemandDate(completeDate);
+
+
/*璁剧疆寮�濮嬫椂闂�*/
Date startDay = new Date();
- startDay.setTime(completeDate.getTime() - totalRouteMillisecond);
+ startDay.setTime(require.getCompleteDate().getTime() - totalRouteMillisecond);
require.setStartDate(startDay);
/*璁＄畻鏄惁鏈夐闄�*/
@@ -297,10 +316,11 @@
allRequires.add(require);
if (require.getNetRequirement().compareTo(BigDecimal.ZERO) > 0) {
/*褰撳墠Bom鑺傜偣澶勭悊瀹屾垚鍚庯紝澶勭悊涓嬬骇BOM*/
- List<ApsBom> bomLineList = bomLineService.selectApsBomLineList(plant, itemNumber);
+ long nextLevel=level+1;
+ List<ApsBom> bomLineList = bomLineService.selectApsBomLineList(plant, itemCode);
if (!bomLineList.isEmpty()) {
bomLineList.forEach(line -> {
- getBomRequires(plant, line, batchNum, require.getStartDate(), plan, allRequires, level + 1);
+ getBomRequires(plant, itemCode, line.getBomLineId(),line.getItemCode() ,line.getNum() , batchNum, require.getStartDate(), plan, allRequires, nextLevel);
});
}
}
@@ -320,10 +340,10 @@
* 鑾峰彇閽ｉ噾璁″垝 棰勭暀澶╂暟
* */
private Long getReservedDays(){
- Long days=0L;
- List<SysDictData> dictDataList = DictUtils.getDictCache("aps_is_suspended");
- if (dictDataList != null) {
- Long.getLong(dictDataList.get(0).getDictValue());
+ long days=0L;
+ List<SysDictData> dictDataList = DictUtils.getDictCache("plate_plan_param");
+ if (dictDataList != null && !dictDataList.isEmpty()) {
+ days = Long.parseLong(dictDataList.get(0).getDictValue());
}
return days;
}
@@ -334,44 +354,50 @@
private void matchRequireAndSubPlan(ApsPlateStandardRequire require) {
BigDecimal netRequirement = require.getNetRequirement();
+ require.setMatchMode("宸ュ崟鍖归厤");
+ if(require.getBomLineCode().equals("W0202-100028")){
+ System.out.println("W0202-100028");
+ }
if (netRequirement.compareTo(BigDecimal.ZERO) > 0) {
- ApsPlatePlan platePlan = apsPlatePlanMapper.selectUnMatchPlateSubPlan(require.getOrgCode());
+ ApsPlatePlan platePlan = apsPlatePlanMapper.selectUnMatchPlateSubPlan(require.getOrgCode(), require.getBomLineCode());
/*瀛愪欢宸ュ崟鐨勬湭鍖归厤鏁伴噺 浣滀负褰撳墠鐨勫簱瀛�*/
while (platePlan != null && netRequirement.compareTo(BigDecimal.ZERO) > 0) {
BigDecimal stock = platePlan.getUnmatchedQuantity();
if (netRequirement.compareTo(stock) < 0) {
/* 搴撳瓨鏁伴噺 澶т簬 鍑�闇�姹傛暟閲�*/
/* 鍑�闇�姹傛暟閲�=0 锛屽瓙浠跺伐鍗曟湭鍖归厤鏁伴噺= 搴撳瓨-鍑�闇�姹�*/
- netRequirement = BigDecimal.ZERO;
- require.setNetRequirement(netRequirement);
BigDecimal subtract = stock.subtract(netRequirement);
bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement);
+ netRequirement = BigDecimal.ZERO;
+ require.setMatchState("宸插尮閰�");
+ require.setUnmatchedDemandAmount(BigDecimal.ZERO);
/*鍑�闇�姹傚凡缁忚婊¤冻锛屼笉闇�瑕佺户缁尮閰�*/
} else if (netRequirement.compareTo(stock) == 0) {
/*鍑�闇�姹傛暟閲� == 搴撳瓨鏁伴噺*/
- netRequirement = BigDecimal.ZERO;
- require.setNetRequirement(netRequirement);
+
BigDecimal subtract = BigDecimal.ZERO;
bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement);
+ netRequirement = BigDecimal.ZERO;
+ require.setMatchState("宸插尮閰�");
+ require.setUnmatchedDemandAmount(BigDecimal.ZERO);
/*鍑�闇�姹傚凡缁忚婊¤冻锛屼笉闇�瑕佺户缁尮閰�*/
}
if (netRequirement.compareTo(stock) > 0) {
/*闇�姹傚ぇ浜庡簱瀛�*/
/*鍑�闇�姹� 琚儴鍒嗘弧瓒� */
BigDecimal rest = netRequirement.subtract(stock);
- require.setNetRequirement(rest);
require.setMatchState("鍖归厤涓�");
/*宸ュ崟 鏈尮閰嶆暟閲忎负0 鍏ㄩ儴鐢ㄤ簬鍖归厤闇�姹�*/
bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, BigDecimal.ZERO, stock, netRequirement);
/*鍑�闇�姹傛湭琚弧瓒筹紝闇�瑕佺户缁尮閰�*/
- platePlan = apsPlatePlanMapper.selectUnMatchPlateSubPlan(require.getOrgCode());
+ platePlan = apsPlatePlanMapper.selectUnMatchPlateSubPlan(require.getOrgCode(), require.getBomLineCode());
+ /*鍓╀綑鍑�闇�姹�*/
netRequirement = rest;
+ require.setUnmatchedDemandAmount(rest);
}
}
}
- require.setUnmatchedDemandAmount(require.getNetRequirement());
-
}
--
Gitblit v1.9.3