bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

库存不足时触发回滚

This commit is contained in:
syruan 2025-12-18 18:51:00 +08:00
parent 0093b9c698
commit aa62bca380
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/service/impl/ApprovalEngineServiceImpl.java
View File

@ -98,8 +98,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
instanceMapper.insertInstance(instance); instanceMapper.insertInstance(instance);
log.info("创建审批实例成功，实例编号：{}，业务类型：{}，业务ID：{}", log.info("创建审批实例成功，实例编号：{}，业务类型：{}，业务ID：{}", instance.getInstanceCode(), businessType, businessId);
instance.getInstanceCode(), businessType, businessId);
// 4. 检查第一个节点是否自动通过 // 4. 检查第一个节点是否自动通过
if ("1".equals(firstNode.getAutoPass())) { if ("1".equals(firstNode.getAutoPass())) {
@ -329,6 +328,7 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
/** /**
* 执行审批回调 * 执行审批回调
* 注意：如果回调执行失败，会抛出异常，触发事务回滚
*/ */
private void executeCallback(ApprovalInstance instance, String status) { private void executeCallback(ApprovalInstance instance, String status) {
try { try {
@ -343,6 +343,8 @@ public class ApprovalEngineServiceImpl implements IApprovalEngineService {
} catch (Exception e) { } catch (Exception e) {
log.error("执行审批回调失败，实例编号：{}，业务类型：{}", log.error("执行审批回调失败，实例编号：{}，业务类型：{}",
instance.getInstanceCode(), instance.getBusinessType(), e); instance.getInstanceCode(), instance.getBusinessType(), e);
// 重新抛出异常，触发事务回滚
throw new RuntimeException("审批回调执行失败：" + e.getMessage(), e);
} }
} }

10
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
View File

@ -352,12 +352,12 @@ public class RepairServiceImpl implements RepairService {
if ("装备".equals(toBeRepair.getType())){ if ("装备".equals(toBeRepair.getType())){
ToBeRepair bean1 = mapper.selectMaDevInfoByTypeIdAndCode(toBeRepair); ToBeRepair bean1 = mapper.selectMaDevInfoByTypeIdAndCode(toBeRepair);
if (bean1==null || !"5".equals(bean1.getStatus())){ if (bean1==null || !"5".equals(bean1.getStatus())){
return AjaxResult.error(toBeRepair.getCode()+"编码设备已经处理过"); throw new RuntimeException(toBeRepair.getCode()+"编码设备已经处理过");
} }
} else if ("工具".equals(toBeRepair.getType())){ } else if ("工具".equals(toBeRepair.getType())){
ToBeRepair bean1 = mapper.selectByTypeIdAndCode(toBeRepair); ToBeRepair bean1 = mapper.selectByTypeIdAndCode(toBeRepair);
if (bean1==null || !"2".equals(bean1.getStatus())){ if (bean1==null || !"2".equals(bean1.getStatus())){
return AjaxResult.error(toBeRepair.getCode()+"编码设备已经处理过"); throw new RuntimeException(toBeRepair.getCode()+"编码设备已经处理过");
} }
} }
} else if ("数量管理".equals(toBeRepair.getManageMode())){ } else if ("数量管理".equals(toBeRepair.getManageMode())){
@ -365,7 +365,7 @@ public class RepairServiceImpl implements RepairService {
//todo 目前数量管理的设备都是工具 //todo 目前数量管理的设备都是工具
ToBeRepair bean1 = mapper.selectByTypeIdAndCode(toBeRepair); ToBeRepair bean1 = mapper.selectByTypeIdAndCode(toBeRepair);
if (bean1==null || bean1.getRepairNum().compareTo(toBeRepair.getRepairNum())<0){ if (bean1==null || bean1.getRepairNum().compareTo(toBeRepair.getRepairNum())<0){
return AjaxResult.error(toBeRepair.getTypeModelName()+"剩余维修设备数量不足"); throw new RuntimeException(toBeRepair.getTypeModelName()+"剩余维修设备数量不足");
} }
} }
if (!StringHelper.isNullOrEmptyString(toBeRepair.getAuditStatus())){ if (!StringHelper.isNullOrEmptyString(toBeRepair.getAuditStatus())){
@ -424,9 +424,7 @@ public class RepairServiceImpl implements RepairService {
} }
return AjaxResult.success("审核成功"); return AjaxResult.success("审核成功");
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); throw new RuntimeException("审批通过回调执行失败：" + e.getMessage());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("审核失败");
} }
} }