From cba0b2eecbbf49b91865434173a590754c74ef43 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 26 六月 2024 14:57:03 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index 1edd458..f0525b5 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -237,8 +237,8 @@
//瀵瑰惊鐜槑缁嗙殑鏁版嵁杩涜绱姞
quantity += orderDetail.getDeliveryDetail().getQuantity();
- area += orderDetail.getFinishedGoodsInventory().getActualSignalArea() * orderDetail.getDeliveryDetail().getQuantity();
- money += orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity();
+ area += orderDetail.getComputeArea() * orderDetail.getDeliveryDetail().getQuantity();
+ money += deliveryDetailMoney;
Integer deliveryDetailmaximum = deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber);
//棰濆閲戦淇敼
--
Gitblit v1.8.0