From 71e05a80df83069c9611ba5ef0fdc2a37eb6a3ae Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 09 十月 2026 11:49:21 +0800
Subject: [PATCH] fix: 客户往来金额调整为2位小数
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 4d98b79..defce97 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -805,9 +805,6 @@
BigDecimal percentage = task.getCompletionStatus() == null
? BigDecimal.ZERO
: task.getCompletionStatus();
- if (percentage.compareTo(new BigDecimal("100")) > 0) {
- percentage = new BigDecimal("100");
- }
status.setPercentage(percentage);
statusMap.computeIfAbsent(task.getProductionOrderId(), key -> new ArrayList<>()).add(status);
}
@@ -848,8 +845,17 @@
// 閬嶅巻澶勭悊鏁版嵁骞剁粍瑁呯粨鏋�
: workOrderPage.getRecords().stream()
.filter(Objects::nonNull)
- .sorted(Comparator.comparing(ProductionOperationTaskVo::getId, Comparator.nullsLast(Comparator.naturalOrder())))
.toList();
+ if (!workOrderList.isEmpty()) {
+ // 宸ュ簭杩涘害闇�瑕佹寜宸ヨ壓璺嚎宸ュ簭椤哄簭锛坉rag_sort 鍗囧簭锛変粠宸﹀埌鍙冲睍绀猴紝浠诲姟 id 浠呬綔涓哄厹搴曟帓搴�
+ Map<Long, Integer> routingOperationDragSortMap = loadRoutingOperationDragSortMap(workOrderList);
+ Comparator<ProductionOperationTaskVo> workOrderComparator = Comparator
+ .comparing((ProductionOperationTaskVo task) -> routingOperationDragSortMap.get(task.getProductionOrderRoutingOperationId()),
+ Comparator.nullsLast(Comparator.<Integer>naturalOrder()))
+ .thenComparing(ProductionOperationTaskVo::getId,
+ Comparator.nullsLast(Comparator.<Long>naturalOrder()));
+ workOrderList = workOrderList.stream().sorted(workOrderComparator).toList();
+ }
if (workOrderList.isEmpty()) {
detailVo.setWorkOrderList(Collections.emptyList());
return detailVo;
@@ -998,6 +1004,23 @@
return detailVo;
}
+ /**
+ * 鏌ヨ宸ュ崟瀵瑰簲宸ヨ壓璺嚎宸ュ簭鐨勬嫋鍔ㄦ帓搴忥紝鐢ㄤ簬鎸夊伐搴忓厛鍚庨『搴忓睍绀哄伐搴忚繘搴�
+ */
+ private Map<Long, Integer> loadRoutingOperationDragSortMap(List<ProductionOperationTaskVo> workOrderList) {
+ Set<Long> routingOperationIds = workOrderList.stream()
+ .map(ProductionOperationTaskVo::getProductionOrderRoutingOperationId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+ if (routingOperationIds.isEmpty()) {
+ return Collections.emptyMap();
+ }
+ return productionOrderRoutingOperationMapper.selectBatchIds(routingOperationIds).stream()
+ .filter(Objects::nonNull)
+ .filter(operation -> operation.getId() != null && operation.getDragSort() != null)
+ .collect(Collectors.toMap(ProductionOrderRoutingOperation::getId, ProductionOrderRoutingOperation::getDragSort, (a, b) -> a));
+ }
+
private Long resolveProductionOrderId(ProductionOrderDto dto) {
// 浠庡叆鍙備腑瑙ｆ瀽鐢熶骇璁㈠崟ID骞舵牎楠�
if (dto == null) {
--
Gitblit v1.9.3