Ver Fonte

feature 所有异常都回滚事物

xiahan há 1 ano atrás
pai
commit
c6212c95e0

+ 5 - 5
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -99,7 +99,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
      * @param apsProductionOrderIds
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void orderApsCancel(List<String> apsProductionOrderIds) throws Exception {
         if (apsProductionOrderIds.isEmpty()) {
             log.debug("取消排程参数为空");
@@ -123,7 +123,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void blankApsCancel(List<String> apsBlankIds) {
         if (ObjectUtil.isEmpty(apsBlankIds)) {
             log.debug("坯料计划排程取消参数为空");
@@ -143,7 +143,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public R publish(List<String> blankIds) {
         if (blankIds == null || blankIds.isEmpty()) {
             log.debug("坯料计划为空");
@@ -210,7 +210,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
      * @return
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public R publishCancel(List<String> blankIds) {
         if (blankIds == null || blankIds.isEmpty()) {
             log.debug("坯料计划为空");
@@ -315,7 +315,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
      * @throws Exception
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public R orderLock(OrderLockVo orderLockVo) {
         String lockMark = orderLockVo.getLockMark();
         if (StringUtils.isBlank(lockMark)) {

+ 2 - 2
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -213,7 +213,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
      * @return
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public R changingWires(List<ChangingWiresVo> changingWiresVos) {
         if (changingWiresVos.isEmpty()) {
             log.error("换线作业的工序作业不为空");
@@ -379,7 +379,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
      * @return
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public R changeStartTime(ChangeStartTimeVo changeStartTimeVo) {
         String id = changeStartTimeVo.getId();
         ApsProcessOperationProcessEquDo processEquDo = this.getById(id);

+ 2 - 2
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -44,7 +44,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
      * @return
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public R publish(List<String> productionOrderIds) {
         if(productionOrderIds.isEmpty()){
             return  R.ok();
@@ -86,7 +86,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
      * @return
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public R publishCancel(List<String> productionOrderIds) {
         // 更新工序作业的生产状态和是否锁定=是
         apsProcessOperationDao.publishCancel(productionOrderIds);

+ 1 - 1
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ReportCheckServiceImpl.java

@@ -70,7 +70,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
      * @return
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public R updateRelevantInformation(String id) {
         log.info("保存检验结果后更新相关信息");
         if (StringUtil.isBlank(id)) {