From ed1425390c329cd3fb4e2aca8a7e5aa05ddbd16d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期日, 23 八月 2026 12:52:27 +0800
Subject: [PATCH] fix: 领料编号排序修改
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 64 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 23 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 caff402..00a20de 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -442,7 +442,6 @@
productionOrderBomMapper.insert(orderBom);
Map<Long, Long> idMap = new HashMap<>();
- BigDecimal lastProcessDemandedQuantity = orderQuantity;
for (TechnologyBomStructure source : structureList) {
// 瀛愯妭鐐� parentId 闇�瑕佹槧灏勬垚鏂板揩鐓ц妭鐐� id锛屾墠鑳戒繚鐣欏師濮� BOM 灞傜骇銆�
ProductionBomStructure target = new ProductionBomStructure();
@@ -452,11 +451,11 @@
target.setProductModelId(source.getProductModelId());
target.setTechnologyOperationId(source.getOperationId());
target.setUnitQuantity(source.getUnitQuantity());
- target.setDemandedQuantity(lastProcessDemandedQuantity.multiply(source.getUnitQuantity()));
+ target.setDemandedQuantity(defaultDecimal(orderQuantity)
+ .multiply(defaultDecimal(source.getUnitQuantity())));
target.setUnit(source.getUnit());
productionBomStructureMapper.insert(target);
idMap.put(source.getId(), target.getId());
- lastProcessDemandedQuantity = target.getDemandedQuantity();
}
return orderBom;
}
@@ -554,6 +553,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) {
@@ -1074,7 +1107,7 @@
return Collections.emptyList();
}
- // 鏌ヨ瀹屾暣鐨凚OM缁撴瀯锛堝寘鎷牴鑺傜偣锛夛紝鐢ㄤ簬璁＄畻灞傜骇闇�姹傛暟閲�
+ // 鏌ヨ瀹屾暣鐨凚OM缁撴瀯锛堝寘鎷牴鑺傜偣锛夛紝姣忎釜鑺傜偣鐙珛璁＄畻闇�姹傛暟閲�
List<ProductionBomStructureVo> bomStructureList = productionBomStructureMapper.listByBomId(orderBom.getId());
if (bomStructureList == null || bomStructureList.isEmpty()) {
return Collections.emptyList();
@@ -1084,26 +1117,10 @@
ProductionOrder productionOrder = productionOrderMapper.selectById(productionOrderId);
BigDecimal orderQuantity = productionOrder != null ? defaultDecimal(productionOrder.getQuantity()) : BigDecimal.ZERO;
- // 鏋勫缓鏍戝舰缁撴瀯骞惰绠楀眰绾ч渶姹傛暟閲�
- Map<Long, ProductionBomStructureVo> structureByIdMap = bomStructureList.stream()
- .filter(s -> s != null && s.getId() != null)
- .collect(Collectors.toMap(ProductionBomStructureVo::getId, s -> s));
-
- // 鎸夊眰绾ц绠楅渶姹傛暟閲忥細瀛愮骇闇�姹傛暟閲� = 鐖剁骇闇�姹傛暟閲� 脳 瀛愮骇鍗曚綅浜у嚭鎵�闇�鏁伴噺
for (ProductionBomStructureVo structure : bomStructureList) {
- if (structure == null) continue;
-
- if (structure.getParentId() == null || structure.getParentId() == 0) {
- // 鏍硅妭鐐癸細闇�姹傛暟閲� = 璁㈠崟鏁伴噺
- structure.setDemandedQuantity(orderQuantity);
- } else {
- // 瀛愯妭鐐癸細闇�姹傛暟閲� = 鐖剁骇闇�姹傛暟閲� 脳 瀛愮骇鍗曚綅浜у嚭鎵�闇�鏁伴噺
- ProductionBomStructureVo parent = structureByIdMap.get(structure.getParentId());
- if (parent != null) {
- BigDecimal parentDemandedQty = defaultDecimal(parent.getDemandedQuantity());
- BigDecimal unitQuantity = defaultDecimal(structure.getUnitQuantity());
- structure.setDemandedQuantity(parentDemandedQty.multiply(unitQuantity));
- }
+ if (structure != null) {
+ structure.setDemandedQuantity(orderQuantity
+ .multiply(defaultDecimal(structure.getUnitQuantity())));
}
}
@@ -1179,6 +1196,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