From 0dfc38e2c88b430d305a220186daa0105148da0c Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 23 八月 2024 16:27:48 +0800
Subject: [PATCH] 订单创建自定义参数为空则不传入数据库
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 29 ++++++++++++++---------------
1 files changed, 14 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..d63ce0a 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
@@ -25,6 +25,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.sql.SQLOutput;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@@ -231,24 +232,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