From 2e4fc5726a1ae46d7c83f7397ad326075a4b194c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 13 六月 2024 14:47:32 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 4e7fd0d..64baf4d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -126,13 +126,12 @@
Map<String,Object> otherColumns = JSON.parseObject(OrderDetails.get(i).getOtherColumns(), new TypeReference<Map<String, Object>>(){});
int finalI = i;
-
if(otherColumns!=null){
otherColumns.forEach((key, value) ->{
- if(value!=null && key.equals("M")) {
+ if(value!=null && key.contains("M")) {
orderOtherMoneyList.forEach(orderOtherMoney -> {
if (orderOtherMoney.getColumn().equals(key)) {
- orderOtherMoney.setQuantity(orderOtherMoney.getQuantity()+((Double) value * OrderDetails.get(finalI).getQuantity()));
+ orderOtherMoney.setQuantity(orderOtherMoney.getQuantity()+(Double.parseDouble((String) value) * OrderDetails.get(finalI).getQuantity()));
}
});
}
--
Gitblit v1.8.0