From 31b9b4cb19fab4f478ff8762ce5742fa1736b1cb Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 06 八月 2024 15:41:10 +0800
Subject: [PATCH] 新增余料管理
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 2240bf7..7d633d6 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
@@ -248,15 +248,21 @@
}
double deliveryDetailMoney = 0.0;
if (calculateType==1){
- deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
)*orderDetail.getPrice()));
}else if (calculateType==2){
- deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
- String.format("%.2f", orderDetail.getComputeGrossArea()/orderDetail.getQuantity()*orderDetail.getDeliveryDetail().getQuantity())
- )*orderDetail.getPrice()));
+ if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())){
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
+ String.format("%.2f", orderDetail.getWidth()*orderDetail.getHeight()*orderDetail.getDeliveryDetail().getQuantity()/1000000)
+ )*orderDetail.getPrice()));
+ }else{
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
+ String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
+ )*orderDetail.getPrice()));
+ }
}else if (calculateType==3){
- deliveryDetailMoney=Double.valueOf(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
}
//鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
--
Gitblit v1.8.0