From d3dfcd3e96cb0f2b04cfe973e4f348ee5fe96032 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 26 八月 2024 14:02:22 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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 d63ce0a..1b6323b 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
@@ -232,22 +232,27 @@
}
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.values().removeIf(value -> value == null || value.equals(""));
+ OrderDetails.get(i).setOtherColumns(JSON.toJSONString(otherColumns));
- 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()));
- }
- });
- }
+ 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()));
+ }
+ });
+ }
+
+ });
+ }else{
+ OrderDetails.get(i).setOtherColumns("{}");
+ }
+
}
--
Gitblit v1.8.0