From 522ad9d99d4058fb36b28455d6d79774f7d77d7c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 23 八月 2024 16:55:38 +0800
Subject: [PATCH] 提交
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 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 b4125de..2fdc0b0 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
@@ -231,24 +231,22 @@
}
Map<String,Object> otherColumns = JSON.parseObject(OrderDetails.get(i).getOtherColumns(), new TypeReference<Map<String, Object>>(){});
+ otherColumns.values().removeIf(value -> value == null || value.equals(""));
+ OrderDetails.get(i).setOtherColumns(JSON.toJSONString(otherColumns));
+
int finalI = i;
+ otherColumns.forEach((key, value) ->{
- if(otherColumns!=null){
- otherColumns.forEach((key, value) ->{
+ if(value!=null && !value.equals("") && key.contains("M")) {
+ orderOtherMoneyList.forEach(orderOtherMoney -> {
+ if (orderOtherMoney.getColumn().equals(key)) {
+ orderOtherMoney.setQuantity(
+ orderOtherMoney.getQuantity()+(Double.parseDouble((String) value) * OrderDetails.get(finalI).getQuantity()));
+ }
+ });
+ }
- if(value!=null && !value.equals("") && key.contains("M")) {
- orderOtherMoneyList.forEach(orderOtherMoney -> {
- if (orderOtherMoney.getColumn().equals(key)) {
- orderOtherMoney.setQuantity(
- orderOtherMoney.getQuantity()+(Double.parseDouble((String) value) * OrderDetails.get(finalI).getQuantity()));
- }
- });
- }
-
- });
- }else if(OrderDetails.get(i).getOtherColumns()==null){
- OrderDetails.get(i).setOtherColumns("{}");
- }
+ });
}
--
Gitblit v1.8.0