From b7d3d4d8ccbe5a63b9a60b252b9dc6914a734fec Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 08 五月 2025 17:37:37 +0800
Subject: [PATCH] 添加工单ID字段
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 60ed594..d44a30b 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
@@ -203,7 +203,7 @@
/*鏋勫缓闇�姹備俊鎭�*/
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);
@@ -246,7 +246,7 @@
afterStockAmount = remainderStock.subtract(deductionAmount);
require.setNetRequirement(BigDecimal.ZERO);
}
- bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount,require.getId().toString());
+ bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount,require.getId());
}
}
@@ -291,17 +291,18 @@
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*/
+ List<ApsBom> bomLineList = bomLineService.selectApsBomLineList(plant, itemNumber);
+ if (!bomLineList.isEmpty()) {
+ bomLineList.forEach(line -> {
+ getBomRequires(plant, line, batchNum, require.getStartDate(), plan, allRequires, level + 1);
+ });
+ }
}
}
/**
--
Gitblit v1.9.3