From cd4a24e07e643b5be854f0a355e040e382062e2b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 19 七月 2024 11:35:22 +0800
Subject: [PATCH] 添加标签样式需要的字段
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 17 +++++++++++++++--
1 files changed, 15 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 85367cf..99fa912 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,12 +255,12 @@
if(isnull) {
Map<String, Object> moneryItemmap = new HashMap<>();
Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
- 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{
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
return false;
}
}
@@ -321,7 +321,16 @@
} 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;
}
@@ -479,6 +488,10 @@
return deliveryDetailMapper.exportDeliveryDetailProductReport(dates);
}
+ public boolean updateDeliveryPrintNumber(String deliveryId) {
+ return deliveryMapper.updateDeliveryPrintNumber(deliveryId);
+ }
+
--
Gitblit v1.8.0