From 3f8ae1f3943485c8d38c7fcfb5349a1dc0f04c74 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 08 五月 2025 15:15:52 +0800
Subject: [PATCH] 增加需求追溯号
---
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomStockDetailService.java | 2 +-
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 31 ++++---------------------------
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 | 5 +++--
4 files changed, 10 insertions(+), 31 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomStockDetailService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomStockDetailService.java
index 9a187ed..44a0e68 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomStockDetailService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireBomStockDetailService.java
@@ -64,5 +64,5 @@
*/
public int deleteApsPlateStandardRequireBomStockDetailById(Long id);
- void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount);
+ void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,String requireId);
}
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 29b53d1..e82eee2 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
@@ -108,7 +108,8 @@
/* 璁板綍宸ュ崟涓庡噣闇�姹傜殑鍖归厤鍏崇郴*/
ApsPlateStandardRequireBomOrderDetail bomOrderDetail = ApsPlateStandardRequireBomOrderDetail.builder()
.id(IdUtil.getSnowflakeNextId())
- .requireId(require.getRequireId())
+ .requireId(require.getId().toString())
+ .requireTrackId(require.getRequireId())
.bomLineId(require.getBomLineId())
.bomLineCode(require.getBomLineCode())
.docNo(platePlan.getDocumentNumber())
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 33b8409..054cf44 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
@@ -109,13 +109,14 @@
* 璁＄畻鐗╂枡鍓╀綑搴撳瓨 骞朵繚瀛樼墿鏂欏墿浣欏簱瀛樻槑缁嗐��
* */
@Override
- public void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount){
+ public void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,String requireId){
/*鏇存柊鐗╂枡鍓╀綑搴撳瓨*/
itemStorageMapper.updateMaterialStorageByVersion(afterStockAmount,itemStorage.getVersion());
/*璁板綍鎵ｅ噺鏄庣粏*/
ApsPlateStandardRequireBomStockDetail bomStockDetail = ApsPlateStandardRequireBomStockDetail.builder()
.id(IdUtil.getSnowflakeNextId())
- .requireId(plan.getRequireId())
+ .requireId(requireId)
+ .requireTrackId(plan.getRequireId())
.bomLineId(bomLine.getBomLineId())
.bomLineCode(bomLine.getItemCode())
.beforeStockAmount(itemStorage.getRemainderStock())
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 7029b83..0e40df7 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
@@ -160,8 +160,6 @@
String plantCode="FORTUNA";
/*瀹氫箟涓诲崟绫诲瀷涓洪挘閲戜富鍗�*/
String mainOrderType = "閽ｉ噾涓讳欢";
- /*瀹氫箟瀛愬崟绫诲瀷涓洪挘閲戝瓙鍗�*/
- String subOrderType = "閽ｉ噾瀛愪欢";
/*鐢熸垚鏂版壒娆″彿*/
String batchNum=getBatch();
/*鑾峰彇閽ｉ噾涓诲崟淇℃伅*/
@@ -187,17 +185,14 @@
}
}
}
-
-
-
-
}
+ /**
+ * 鏋勫缓闇�姹備俊鎭�
+ * */
private void getBomRequires(String plant, ApsBom bomLine, String batchNum, Date upLevelStartDate, ApsPlatePlan plan, List<ApsPlateStandardRequire> allRequires, Long level) {
String itemNumber = bomLine.getItemCode();
- String productivityModel_combined_batch = "鍚堟壒";
- String productivityModel_monopolize = "鐙崰";
/*鏋勫缓闇�姹備俊鎭�*/
ApsPlateStandardRequire require = new ApsPlateStandardRequire();
require.setId(IdUtil.getSnowflakeNextId());
@@ -242,7 +237,7 @@
afterStockAmount = remainderStock.subtract(deductionAmount);
require.setNetRequirement(BigDecimal.ZERO);
}
- bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount);
+ bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount,require.getId().toString());
}
}
@@ -288,7 +283,6 @@
require.setMatchState("寰呭尮閰�");
require.setMatchMode("宸ュ崟鍖归厤");
}
- require.setHasDelayRisk("鏃犻闄�");
/*浣跨敤瀛愪欢宸ュ崟杩涜闇�姹傚尮閰�*/
matchRequireAndSubPlan(require);
@@ -300,23 +294,6 @@
getBomRequires(plant, line, batchNum, require.getStartDate(), plan, allRequires, level + 1);
});
}
- }
-
- private BigDecimal getRouteLineTotalTime(ApsStandardProcessRouteHeader routeHeader, String productivityModel_monopolize, BigDecimal netRequirement) {
- ApsStandardProcessRouteLine routeLineParam = ApsStandardProcessRouteLine.builder()
- .routeId(routeHeader.getRouteId())
- .build();
- List<ApsStandardProcessRouteLine> apsStandardProcessRouteLines = ApsStandardProcessRouteLineMapper.selectApsStandardProcessRouteLineList(routeLineParam);
- /*宸ヨ壓璺嚎Line 鎬诲伐鏃�*/
- BigDecimal totalRouteTime = BigDecimal.ZERO;
- apsStandardProcessRouteLines.forEach(line -> {
- line.setRouteTime(line.getDesignCapacity());
- if (line.getProductivityModel().equals(productivityModel_monopolize)) {
- line.setRouteTime(line.getDesignCapacity().multiply(netRequirement));
- }
- totalRouteTime.add(line.getRouteTime());
- });
- return totalRouteTime;
}
/**
--
Gitblit v1.9.3