From 9732b34128a37e509db4eb99da5bf158dc3a049c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 08 七月 2024 18:42:02 +0800
Subject: [PATCH] 修改发货单价
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 5 +++--
1 files changed, 3 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 f6b5d00..1ada0f3 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
@@ -234,11 +234,11 @@
}
double deliveryDetailMoney = 0.0;
if (calculateType==1){
- deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(String.format("%.2f", (orderDetail.getWidth()*orderDetail.getHeight()/1000000)))
+ deliveryDetailMoney=Double.valueOf(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.getWidth()*orderDetail.getHeight()/1000000)*orderDetail.getDeliveryDetail().getQuantity())
+ 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()));
@@ -307,6 +307,7 @@
if (delivery.getFreightPrice()!=null&&delivery.getFreightQuantity()!=null){
freight=delivery.getFreightPrice()*delivery.getFreightQuantity();
}
+
int intMoney= (int) Math.floor(money+freight+otherMoneys);
//淇敼鍙戣揣鏄庣粏绱姞闈㈢Н鏁伴噺閲戦
deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);
--
Gitblit v1.8.0