From 07d08f8dc420ba47f66587fdc5038a59fc340c96 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 29 八月 2024 10:33:59 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 881863c..bb89458 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -617,7 +617,7 @@
String count=reportingWorkMapper.getPatchConditionMp(reportingWorkId);
return count;
}
- @Transactional(rollbackFor = Exception.class , noRollbackFor = Error.class)
+ @Transactional(rollbackFor = Exception.class , noRollbackFor = ServiceException.class)
public Boolean mesReportingWorkSv(Map<String,Object> reportingWorkMap) {
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
@@ -635,8 +635,7 @@
);
//鍒ゆ柇鏄惁澶т簬褰撳墠鏁伴噺骞朵笖鎶涘嚭寮傚父
if (processNum < (reportingWorkDetail.getBreakageQuantity() + reportingWorkDetail.getCompletedQuantity())) {
- TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
- throw new ServiceException(Constants.Code_600, "涓婂伐搴忓凡瀹屽伐鏁伴噺灏忎簬鏈伐搴忔姤宸ユ暟閲忥紝璇锋鏌�");
+ return false;
}
@@ -677,11 +676,10 @@
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
- sysError.setError(e +"\n"+Arrays.toString(e.getStackTrace()));
+ sysError.setError(e +Arrays.toString(e.getStackTrace()));
sysError.setFunc("saveOrder");
sysErrorService.insert(sysError);
- //throw new ServiceException(Constants.Code_500, "鏁版嵁璇锋眰寮傚父锛岃妫�鏌�");
- throw new Error();
+ throw new ServiceException(Constants.Code_500, "鏁版嵁璇锋眰寮傚父锛岃妫�鏌�");
}
}
--
Gitblit v1.8.0