From 9e300f3329459d54d1ad2511f64cdc3a60fd5a6c Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 28 八月 2026 20:39:54 +0800
Subject: [PATCH] fix: 入库记录修改为批号倒序
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 134 ++++++++++++++++----------------------------
1 files changed, 49 insertions(+), 85 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
index e3b547d..4d98b79 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -34,6 +34,7 @@
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.pojo.QualityInspectParam;
import com.ruoyi.production.service.ProductionOrderService;
+import com.ruoyi.production.util.TaskPlanQuantityUtil;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.stock.mapper.StockInventoryMapper;
@@ -250,7 +251,7 @@
.eq(TechnologyRoutingOperation::getTechnologyRoutingId, technologyRouting.getId())
.orderByDesc(TechnologyRoutingOperation::getDragSort)
.orderByDesc(TechnologyRoutingOperation::getId));
- // Build task plan quantities from order BOM snapshot demand instead of recomputing from technology BOM units.
+ // 宸ュ崟璁″垝鏁伴噺鐩存帴浣跨敤璁㈠崟 BOM 蹇収涓殑闇�姹傞噺锛岄伩鍏嶄笌 BOM 椤甸潰灞曠ず鍙ｅ緞涓嶄竴鑷淬��
Long rootProductModelId = orderBom != null && orderBom.getProductModelId() != null
? orderBom.getProductModelId()
: productionOrder.getProductModelId();
@@ -261,7 +262,9 @@
.eq(ProductionBomStructure::getProductionOrderBomId, orderBom.getId())
.orderByAsc(ProductionBomStructure::getId));
Map<String, BigDecimal> operationDemandedQuantityMap =
- buildOperationDemandedQuantityMap(orderBomStructureList, rootProductModelId);
+ TaskPlanQuantityUtil.buildOperationDemandedQuantityMap(orderBomStructureList, rootProductModelId);
+ Map<Long, Set<Long>> operationOutputProductModelMap =
+ TaskPlanQuantityUtil.buildOperationOutputProductModelMap(orderBomStructureList, rootProductModelId);
Map<Long, String> operationNameMap = technologyOperationMapper.selectBatchIds(
// 閬嶅巻澶勭悊鏁版嵁骞剁粍瑁呯粨鏋�
routingOperations.stream()
@@ -281,7 +284,12 @@
targetOperation.setProductionOrderId(productionOrder.getId());
targetOperation.setTechnologyRoutingOperationId(sourceOperation.getId());
targetOperation.setOrderRoutingId(orderRouting.getId());
- targetOperation.setProductModelId(sourceOperation.getProductModelId());
+ Long outputProductModelId = TaskPlanQuantityUtil.resolveOperationOutputProductModelId(
+ sourceOperation.getTechnologyOperationId(),
+ sourceOperation.getProductModelId(),
+ operationOutputProductModelMap,
+ rootProductModelId);
+ targetOperation.setProductModelId(outputProductModelId);
targetOperation.setDragSort(sourceOperation.getDragSort());
targetOperation.setIsProduction(sourceOperation.getIsProduction());
targetOperation.setIsQuality(sourceOperation.getIsQuality());
@@ -295,10 +303,10 @@
ProductionOperationTask task = new ProductionOperationTask();
task.setProductionOrderRoutingOperationId(targetOperation.getId());
task.setProductionOrderId(productionOrder.getId());
- task.setPlanQuantity(resolveTaskPlanQuantity(
- sourceOperation,
+ task.setPlanQuantity(TaskPlanQuantityUtil.resolveTaskPlanQuantity(
+ targetOperation,
operationDemandedQuantityMap,
- productionOrder,
+ productionOrder.getQuantity(),
rootProductModelId));
task.setCompleteQuantity(BigDecimal.ZERO);
task.setWorkOrderNo(generateNextTaskNo());
@@ -332,85 +340,6 @@
}
}
return syncedParamCount;
- }
-
- private Map<String, BigDecimal> buildOperationDemandedQuantityMap(List<ProductionBomStructure> bomStructures,
- Long rootProductModelId) {
- if (bomStructures == null || bomStructures.isEmpty()) {
- return Collections.emptyMap();
- }
- Map<Long, ProductionBomStructure> structureById = bomStructures.stream()
- .filter(item -> item != null && item.getId() != null)
- .collect(Collectors.toMap(ProductionBomStructure::getId, item -> item, (left, right) -> left));
- Map<String, BigDecimal> demandedQuantityMap = new HashMap<>();
- Set<String> mergedOutputNodeKeySet = new HashSet<>();
- for (ProductionBomStructure bomStructure : bomStructures) {
- if (bomStructure == null || bomStructure.getTechnologyOperationId() == null) {
- continue;
- }
- // The BOM row points to the producing operation; task quantity should come from that operation's output node.
- ProductionBomStructure outputNode = resolveOperationOutputNode(bomStructure, structureById);
- Long outputProductModelId = resolveOutputProductModelId(outputNode, rootProductModelId);
- if (outputProductModelId == null) {
- continue;
- }
- String mergedOutputNodeKey = buildOperationOutputNodeKey(
- bomStructure.getTechnologyOperationId(),
- outputNode == null ? null : outputNode.getId(),
- outputProductModelId);
- if (!mergedOutputNodeKeySet.add(mergedOutputNodeKey)) {
- continue;
- }
- // demandedQuantity is already the order-level required output quantity for the current output node.
- BigDecimal demandedQuantity = defaultDecimal(outputNode == null ? null : outputNode.getDemandedQuantity());
- String key = buildOperationDemandedQuantityKey(bomStructure.getTechnologyOperationId(), outputProductModelId);
- demandedQuantityMap.merge(key, demandedQuantity, BigDecimal::add);
- }
- return demandedQuantityMap;
- }
-
- private BigDecimal resolveTaskPlanQuantity(TechnologyRoutingOperation sourceOperation,
- Map<String, BigDecimal> operationDemandedQuantityMap,
- ProductionOrder productionOrder,
- Long rootProductModelId) {
- if (sourceOperation == null || operationDemandedQuantityMap == null || operationDemandedQuantityMap.isEmpty()) {
- return defaultDecimal(productionOrder == null ? null : productionOrder.getQuantity());
- }
- Long outputProductModelId = sourceOperation.getProductModelId() != null
- ? sourceOperation.getProductModelId()
- : rootProductModelId;
- String key = buildOperationDemandedQuantityKey(sourceOperation.getTechnologyOperationId(), outputProductModelId);
- BigDecimal planQuantity = operationDemandedQuantityMap.get(key);
- return planQuantity != null ? planQuantity : defaultDecimal(productionOrder == null ? null : productionOrder.getQuantity());
- }
-
- private String buildOperationDemandedQuantityKey(Long operationId, Long outputProductModelId) {
- return String.valueOf(operationId) + "#" + String.valueOf(outputProductModelId);
- }
-
- private String buildOperationOutputNodeKey(Long operationId, Long outputNodeId, Long outputProductModelId) {
- return String.valueOf(operationId) + "#" + String.valueOf(outputNodeId) + "#" + String.valueOf(outputProductModelId);
- }
-
- private ProductionBomStructure resolveOperationOutputNode(ProductionBomStructure bomStructure,
- Map<Long, ProductionBomStructure> structureById) {
- if (bomStructure == null) {
- return null;
- }
- // The root node is the first output node; child rows use their direct parent as the current operation output.
- if (bomStructure.getParentId() == null) {
- return bomStructure;
- }
- ProductionBomStructure parent = structureById.get(bomStructure.getParentId());
- return parent != null ? parent : bomStructure;
- }
-
- private Long resolveOutputProductModelId(ProductionBomStructure outputNode,
- Long rootProductModelId) {
- if (outputNode == null) {
- return rootProductModelId;
- }
- return outputNode.getProductModelId() != null ? outputNode.getProductModelId() : rootProductModelId;
}
private ProductionOrderBom syncProductionOrderBomSnapshot(ProductionOrder productionOrder, TechnologyRouting technologyRouting) {
@@ -553,6 +482,40 @@
private BigDecimal defaultDecimal(BigDecimal value) {
// 灏嗙┖鏁伴噺鍏滃簳涓�0锛岄伩鍏嶇┖鎸囬拡寮傚父
return value == null ? BigDecimal.ZERO : value;
+ }
+
+ /**
+ * 鎵规鍙锋寜鍓嶇紑鏃ユ湡鍗囧簭鎺掑簭锛堟牸寮忓 20260703-ed01-001锛屾棩鏈熸棭鐨勫湪鍓嶏級
+ */
+ private void sortBatchNoList(List<String> batchNoList) {
+ if (batchNoList == null || batchNoList.size() < 2) {
+ return;
+ }
+ batchNoList.sort(Comparator
+ .comparingLong(this::batchDateKey)
+ .thenComparing(batchNo -> batchNo == null ? "" : batchNo));
+ }
+
+ /**
+ * 鎻愬彇鎵规鍙峰紑澶寸殑鏁板瓧浣滀负鎺掑簭閿紙yyyyMMdd锛夛紝鏃犳暟瀛楁椂鏀惧埌鏈�鍚�
+ */
+ private long batchDateKey(String batchNo) {
+ if (batchNo == null) {
+ return Long.MAX_VALUE;
+ }
+ String trimmed = batchNo.trim();
+ int end = 0;
+ while (end < trimmed.length() && Character.isDigit(trimmed.charAt(end))) {
+ end++;
+ }
+ if (end == 0) {
+ return Long.MAX_VALUE;
+ }
+ try {
+ return Long.parseLong(trimmed.substring(0, end));
+ } catch (NumberFormatException e) {
+ return Long.MAX_VALUE;
+ }
}
private void validateAndFillOrder(ProductionOrder productionOrder, ProductionOrder oldOrder) {
@@ -1162,6 +1125,7 @@
List<String> batchNoList = stockBatchNoMap.get(productModelId) == null
? Collections.emptyList()
: new ArrayList<>(stockBatchNoMap.get(productModelId));
+ sortBatchNoList(batchNoList);
vo.setBatchNoList(batchNoList);
vo.setStockQuantity(stockQuantityMap.getOrDefault(productModelId, BigDecimal.ZERO));
vo.setBom(true);
--
Gitblit v1.9.3