From 70a46cd5e65b1ee16fb4bb4954a01129e6898b6d Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 12 五月 2025 18:29:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 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..f0c7cc8 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
@@ -73,7 +73,7 @@
@Resource
IApsPlateStandardRequireBatchService requireBatchService;
@Autowired
- private ApsPlateStandardRequireBomStockDetailMapper apsPlateStandardRequireBomStockDetailMapper;
+ private IApsMaterialStorageManagementService storageManagementService;
/**
* 鏌ヨ閽ｉ噾宸ュ崟鏍囧噯闇�姹�
@@ -181,6 +181,8 @@
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);
// 鎵归噺鎻掑叆浠ユ彁楂樻�ц兘
@@ -226,6 +228,8 @@
* @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,
@@ -259,9 +263,7 @@
BigDecimal remainderStock = BigDecimal.ZERO;
/*榛樿鍑�闇�姹備负BOM鐢ㄩ噺*/
require.setNetRequirement(require.getBomUseAmount());
- Optional<ApsMaterialStorageManagement> itemStorage = getItemStorage(plant, itemCode);
-
-
+ Optional<ApsMaterialStorageManagement> itemStorage = Optional.of(storageManagementService.getRdsStorage( plant, itemCode));
if (itemStorage.isPresent()) {
ApsMaterialStorageManagement storage = itemStorage.get();
/*鍓╀綑搴撳瓨*/
@@ -284,7 +286,9 @@
require.setNetRequirement(BigDecimal.ZERO);
}
/*璁板綍搴撳瓨鍓╀綑鏁伴噺锛岃褰曞簱瀛樹娇鐢ㄨ褰�*/
- bomStockDetailService.saveStorageAndDetail(storage, plan, bomLineId,itemCode, batchNum, deductionAmount, afterStockAmount,require.getId(),stockDetailsList);
+ bomStockDetailService.saveStorageAndDetail(storage, plan, bomLineId,itemCode, batchNum, deductionAmount
+ , afterStockAmount,require.getId(),stockDetailsList
+ );
}
}
/*鏈尮閰嶆暟閲忥紝榛樿涓哄噣闇�姹�*/
@@ -354,16 +358,7 @@
}
}
}
- /**
- * 鑾峰彇鐗╂枡搴撳瓨淇℃伅
- * */
- private Optional<ApsMaterialStorageManagement> getItemStorage(String plant, String itemNumber) {
- ApsMaterialStorageManagement storageParam = new ApsMaterialStorageManagement();
- storageParam.setItemNumber(itemNumber);
- storageParam.setApplicableFactories(plant);
- return itemStorageMapper.selectApsMaterialStorageManagementList(storageParam).stream()
- .findFirst();
- }
+
/**
* 鑾峰彇閽ｉ噾璁″垝 棰勭暀澶╂暟
--
Gitblit v1.9.3