From ff756f0d4f7eaac1fdb112dcd00d4d07528b83bc Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 11 七月 2024 13:29:38 +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 | 15 ++++++++++-----
1 files changed, 10 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 3cf1515..85367cf 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
@@ -239,7 +239,7 @@
)*orderDetail.getPrice()));
}else if (calculateType==2){
deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
- String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
+ String.format("%.2f", orderDetail.getComputeGrossArea()/orderDetail.getQuantity()*orderDetail.getDeliveryDetail().getQuantity())
)*orderDetail.getPrice()));
}else if (calculateType==3){
deliveryDetailMoney=Double.valueOf(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
@@ -255,9 +255,14 @@
if(isnull) {
Map<String, Object> moneryItemmap = new HashMap<>();
Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
- otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
- moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
- moneryList.add(moneryItemmap);
+ System.out.println(deliveryDetailOtherMoney.get("monery"));
+ if(deliveryDetailOtherMoney.get("monery")!=null){
+ otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
+ moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
+ moneryList.add(moneryItemmap);
+ }else{
+ return false;
+ }
}
}
@@ -309,7 +314,7 @@
freight=delivery.getFreightPrice()*delivery.getFreightQuantity();
}
- int intMoney= (int) Math.floor(money+freight+otherMoneys);
+ int intMoney= (int) Math.round(money+freight+otherMoneys);
//淇敼鍙戣揣鏄庣粏绱姞闈㈢Н鏁伴噺閲戦
deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);
--
Gitblit v1.8.0