From ec4d06c37f948a24f5313b60b4d27327d6975bdc Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 07 七月 2024 18:01:34 +0800
Subject: [PATCH] 修改工程打印以及发货单创建的运费功能添加
---
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 34e4a71..f6b5d00 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
@@ -203,6 +203,7 @@
//鍒犻櫎璁㈠崟棰濆閲戦鐨勬暟鎹�
deliveryOtherMoneyMapper.deleteDeliveryOtherMoney(deliveryId);
oddNumber = deliveryId;
+ deliveryMapper.updateDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
} else {
//鑾峰彇鍗曞彿
oddNumber = orderNumberSetting("鍙戣揣");
@@ -247,7 +248,6 @@
if(orderDetail.getOtherColumns()!="{}"&&orderDetail.getOtherColumns()!=null){
- System.out.println(orderDetail.getOtherColumns());
JSONObject jsonObject = JSON.parseObject(orderDetail.getOtherColumns());
for(String key : jsonObject.keySet()){
boolean isnull = key.contains("M");
@@ -270,13 +270,14 @@
Integer deliveryDetailmaximum = deliveryDetailMapper.getdeliveryDetailmaximum(oddNumber);
//棰濆閲戦淇敼
- Map<String,Double> otherColumns = JSON.parseObject(orderDetail.getOtherColumns(), new TypeReference<Map<String, Double>>(){});
+ Map<String,String> otherColumns = JSON.parseObject(orderDetail.getOtherColumns(), new TypeReference<Map<String, String>>(){});
if(otherColumns!=null){
otherColumns.forEach((key, value) ->{
- if(value!=null) {
+ boolean isnull = key.contains("M");
+ if(isnull){
deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
if(deliveryOtherMoney.getColumn().equals(key)){
- deliveryOtherMoney.setQuantity(deliveryOtherMoney.getQuantity()+(value * orderDetail.getDeliveryDetail().getQuantity()));
+ deliveryOtherMoney.setQuantity(deliveryOtherMoney.getQuantity()+( Double.valueOf(value)* orderDetail.getDeliveryDetail().getQuantity()));
}
});
@@ -302,7 +303,11 @@
deliveryOtherMoneyMapper.insertDeliveryOtherMoney(deliveryOtherMoney);
}
});
- int intMoney= (int) Math.floor(money+otherMoneys);
+ double freight=0.0;
+ 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