From 1c5cec37312c58cbc394778bdb649feafd2f8af3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 30 八月 2024 14:00:58 +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/DeliveryService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 c90ba71..7edb8c8 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
@@ -254,7 +254,7 @@
calculateType=orderDetail.getOrder().getCalculateType();
}
double deliveryDetailMoney = 0.0;
-
+ double deliveryDetailArea = 0.0;
BigDecimal getComputeArea= BigDecimal.valueOf(orderDetail.getComputeArea());
BigDecimal getQuantity= BigDecimal.valueOf(orderDetail.getDeliveryDetail().getQuantity());
BigDecimal getPrice= BigDecimal.valueOf(orderDetail.getPrice());
@@ -265,16 +265,20 @@
//鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
if (calculateType==1){
deliveryDetailMoney=singlePieceArea.doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
}else if (calculateType==2){
if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())){
deliveryDetailMoney=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP)
.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
}else{
deliveryDetailMoney=singlePieceArea.doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
}
}else if (calculateType==3){
deliveryDetailMoney=getQuantity.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
}
/*if (calculateType==1){
@@ -322,7 +326,7 @@
//瀵瑰惊鐜槑缁嗙殑鏁版嵁杩涜绱姞
quantity += orderDetail.getDeliveryDetail().getQuantity();
- area += orderDetail.getComputeArea() * orderDetail.getDeliveryDetail().getQuantity();
+ area += deliveryDetailArea;
money += deliveryDetailMoney;
Integer deliveryDetailmaximum = deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber);
@@ -341,9 +345,8 @@
}
});
}
-
//鏂板鍙戣揣鏄庣粏鏁版嵁
- deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney,deliveryDetailotherMoneys);
+ deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney,deliveryDetailotherMoneys,deliveryDetailArea);
//淇敼璁㈠崟鏄庣粏
deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
//淇敼搴撳瓨琛ㄥ嚭搴撴暟閲�
--
Gitblit v1.8.0