From 7e983e4d3b7d7c24e11913075a68a607e61a7d23 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 四月 2024 09:14:45 +0800
Subject: [PATCH] 修改发货额外金额
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 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 91a3128..e27ceb3 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
@@ -133,7 +133,7 @@
boolean saveState = true;
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
- try{
+
String deliveryId="";
String oddNumber;
@@ -187,8 +187,13 @@
Integer quantity = 0;
double money = 0.0;
AtomicReference<Double> otherMoney = new AtomicReference<>(0.0);
- //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
+ //鍏堟妸鍏朵粬閲戦鍓〃鐨勯噾棰濅笌鏁伴噺缃�0
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney -> {
+ deliveryOtherMoney.setQuantity(0.0);
+ });
+
+ //鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!orderDetaillist.isEmpty()) {
for (OrderDetail orderDetail : orderDetaillist) {
@@ -200,16 +205,16 @@
Map<String,Double> otherColumns = JSON.parseObject(orderDetail.getOtherColumns(), new TypeReference<Map<String, Double>>(){});
if(otherColumns!=null){
otherColumns.forEach((key, value) ->{
- deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
- if(deliveryOtherMoney.getColumn().equals(key)){
- deliveryOtherMoney.setQuantity (otherColumns.get(key)==null?0:otherColumns.get(key));
- deliveryOtherMoney.setQuantity(((value==null?0:value)*orderDetail.getDeliveryDetail().getQuantity()));
- }
- });
+ if(value!=null) {
+ deliveryOtherMoneyList.forEach(deliveryOtherMoney ->{
+ if(deliveryOtherMoney.getColumn().equals(key)){
+ deliveryOtherMoney.setQuantity(deliveryOtherMoney.getQuantity()+(value * orderDetail.getDeliveryDetail().getQuantity()));
+ }
+ });
+ }
});
}
-
//鏂板鍙戣揣鏄庣粏鏁版嵁
deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1);
@@ -235,16 +240,7 @@
} else {
return false;
}
- }catch (Exception e) {
- TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
- //灏嗗紓甯镐紶鍏ユ暟鎹簱
- SysError sysError = new SysError();
- sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
- sysErrorService.insert(sysError);
- saveState = false;
- }
return saveState;
}
--
Gitblit v1.8.0