From f692a364cdb559ddadc4f6dac86c25848a1d4f34 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 03 十一月 2025 16:54:53 +0800
Subject: [PATCH] 修改订单首页流程卡终止状态，以及自定义标签打印
---
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
index 7e57242..e266082 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
@@ -29,6 +29,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import java.util.ArrayList;
@@ -1326,13 +1327,15 @@
availableQuantity += materialInventory.getAvailableQuantity();
totalArea += materialInventory.getTotalArea();
}
+ DecimalFormat df = new DecimalFormat("#.00");
totalSum.put("inventoryQuantity",inventoryQuantity);
totalSum.put("availableQuantity",availableQuantity);
- totalSum.put("totalArea",totalArea);
+ totalSum.put("totalArea", df.format(totalArea));
Map<String, Object> map = new HashMap<>();
map.put("glassStock", materialInventoryList);
+ map.put("totalSum", totalSum);
return map;
}
}
--
Gitblit v1.8.0