From b6ea206938c4f7a318486e6e3a0fff9924a0fbcf Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 01 八月 2024 17:35:08 +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 | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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 1097312..80443e2 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
@@ -160,7 +160,7 @@
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
-
+ try {
String deliveryId="";
String oddNumber;
if (object.get("deliveryId") != null) {
@@ -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);
+ if(deliveryDetailOtherMoney.get("monery")!=null){
+ otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
+ moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
+ moneryList.add(moneryItemmap);
+ }else{
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ return false;
+ }
}
}
@@ -316,7 +321,16 @@
} else {
return false;
}
+ }catch (Exception e) {
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ //灏嗗紓甯镐紶鍏ユ暟鎹簱
+ SysError sysError = new SysError();
+ sysError.setError(e+Arrays.toString(e.getStackTrace()));
+ sysError.setFunc("insertDelivery");
+ sysErrorService.insert(sysError);
+ saveState = false;
+ }
return saveState;
}
@@ -369,8 +383,8 @@
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
- sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setError(e+Arrays.toString(e.getStackTrace()));
+ sysError.setFunc("deleteDelivery");
sysErrorService.insert(sysError);
saveState = false;
@@ -474,6 +488,10 @@
return deliveryDetailMapper.exportDeliveryDetailProductReport(dates);
}
+ public boolean updateDeliveryPrintNumber(String deliveryId) {
+ return deliveryMapper.updateDeliveryPrintNumber(deliveryId);
+ }
+
--
Gitblit v1.8.0