From 02a346b1b78c8d2b6b3c298ed2fb8feea8ef96ee Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 31 十二月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 2 +-
1 files changed, 1 insertions(+), 1 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 fa30f4d..ef15938 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
@@ -567,7 +567,7 @@
if(value!=null && !value.equals("") && key.contains("M")) {
orderOtherMoneyLists.forEach(orderOtherMoney -> {
- if (orderOtherMoney.getColumn().equals(key)) {
+ if (orderOtherMoney.getColumn()!=null&&orderOtherMoney.getColumn().equals(key)) {
orderOtherMoney.setQuantity(
orderOtherMoney.getQuantity()+(Double.parseDouble((String) value) * finalOrderDetail.getQuantity()));
}
--
Gitblit v1.8.0