From dc3130e46457e27b72a70fc1f900f755e39fd3f1 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 31 十二月 2025 14:18:07 +0800
Subject: [PATCH] 已发货状态为1的无法修改
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 c27975a..fa30f4d 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
@@ -522,7 +522,7 @@
List<OrderOtherMoney> orderOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(jsonObject.get("otherMoney")), OrderOtherMoney.class);
if(orderOtherMoneyList != null ){
- orderOtherMoneyList = orderOtherMoneyList.stream().filter(o -> o.getColumn()==null || o.getColumn().indexOf("M")==0).collect(Collectors.toList());
+ orderOtherMoneyList = orderOtherMoneyList.stream().filter(o -> (o.getColumn()==null && o.getDeliveryState()==0 ) || o.getColumn().indexOf("M")==0).collect(Collectors.toList());
}
if(orderOtherMoneyList!=null){
orderOtherMoneyList.forEach(orderOtherMoney -> {
@@ -542,7 +542,10 @@
//鍒犻櫎鍏朵粬閲戦鏄庣粏琛�
- orderOtherMoneyMapper.delete(new LambdaQueryWrapper<OrderOtherMoney>().eq(OrderOtherMoney::getOrderId, order.getOrderId()));
+ orderOtherMoneyMapper.delete(new LambdaQueryWrapper<OrderOtherMoney>()
+ .eq(OrderOtherMoney::getOrderId, order.getOrderId())
+ .eq(OrderOtherMoney::getDeliveryState, 0)
+ );
List<OrderOtherMoney> orderOtherMoneyLists=orderOtherMoneyList;
double money = 0;
--
Gitblit v1.8.0