From 3066a8f5c1f475997bfe23857ba4bae9395900c4 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 13 八月 2026 10:19:24 +0800
Subject: [PATCH] fix: 领料功能修改，移除订单领料，添加工序领料功能，支持按工序查询物料与已领料记录
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java | 34 ++--------------------------------
1 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java
index 75d0696..129d7d5 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java
@@ -137,38 +137,8 @@
throw new ServiceException("鐢熶骇璁㈠崟涓嶅瓨鍦�");
}
- // 鑾峰彇璁㈠崟BOM
- ProductionOrderBom orderBom = productionOrderBomMapper.selectOne(
- Wrappers.<ProductionOrderBom>lambdaQuery()
- .eq(ProductionOrderBom::getProductionOrderId, productionOrder.getId()));
-
- // 纭畾鏍逛骇鍝佽鏍糏D
- Long rootProductModelId = orderBom != null && orderBom.getProductModelId() != null
- ? orderBom.getProductModelId()
- : productionOrder.getProductModelId();
-
- // 鑾峰彇BOM缁撴瀯鍒楄〃
- List<ProductionBomStructure> orderBomStructureList = orderBom == null || orderBom.getId() == null
- ? Collections.emptyList()
- : productionBomStructureMapper.selectList(
- Wrappers.<ProductionBomStructure>lambdaQuery()
- .eq(ProductionBomStructure::getProductionOrderBomId, orderBom.getId())
- .orderByAsc(ProductionBomStructure::getId));
-
- // 鏋勫缓宸ュ簭闇�姹傞噺鏄犲皠
- Map<String, BigDecimal> operationDemandedQuantityMap =
- TaskPlanQuantityUtil.buildOperationDemandedQuantityMap(orderBomStructureList, rootProductModelId);
-
- // 鑾峰彇宸ヨ壓璺嚎宸ュ簭锛堢敤浜庤绠楄鍒掓暟閲忥級
- TechnologyRoutingOperation sourceOperation = technologyRoutingOperationMapper.selectById(
- updatedOperation.getTechnologyRoutingOperationId());
- // 灏嗗師鏉ョ殑绉佹湁鏂规硶鏇挎崲涓鸿皟鐢ㄥ伐鍏风被
- BigDecimal planQuantity = TaskPlanQuantityUtil.resolveTaskPlanQuantity(
- sourceOperation,
- operationDemandedQuantityMap,
- productionOrder,
- rootProductModelId);
- task.setPlanQuantity(planQuantity);
+ // 鎵佸钩BOM涓嶉厤缃暟閲忥紝宸ュ崟璁″垝鏁伴噺缁熶竴鍙栬鍗曟暟閲�
+ task.setPlanQuantity(TaskPlanQuantityUtil.resolveTaskPlanQuantity(productionOrder));
task.setCompleteQuantity(BigDecimal.ZERO);
task.setWorkOrderNo(generateNextTaskNo());
task.setStatus(2);
--
Gitblit v1.9.3