|
@@ -466,12 +466,12 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
|
|
|
if ("T".equals(at.getIffinalItem())) {
|
|
|
fettle = 6L;
|
|
|
// 更新费用明细
|
|
|
- AjaxResult ajaxResult = tFeeServiceImpl.billsfeesFollow(auditItems.getBillId());
|
|
|
+ /*AjaxResult ajaxResult = tFeeServiceImpl.billsfeesFollow(auditItems.getBillId());
|
|
|
String code = ajaxResult.get("code").toString();
|
|
|
if ("500".equals(code)) {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return ajaxResult;
|
|
|
- }
|
|
|
+ }*/
|
|
|
} else if ("F".equals(at.getIffinalItem())) {
|
|
|
fettle = 5L;
|
|
|
}
|
|
@@ -764,6 +764,12 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
|
|
|
}
|
|
|
} else if (auditItems.getActId() >= 430 && auditItems.getActId() <= 450) {
|
|
|
fettle = 3L;
|
|
|
+ String fBillType = null;
|
|
|
+ if (auditItems.getActId() == 450 || auditItems.getActId() == 440){
|
|
|
+ fBillType = "DCRevoke";
|
|
|
+ }else if (auditItems.getActId() == 430){
|
|
|
+ fBillType = "KHDZRevoke";
|
|
|
+ }
|
|
|
// 财务模块
|
|
|
AjaxResult ajaxResult = tFeeServiceImpl.tfeeFollow(auditItems.getBillId(), fettle);
|
|
|
String code = ajaxResult.get("code").toString();
|
|
@@ -771,6 +777,13 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return ajaxResult;
|
|
|
}
|
|
|
+ // 更新费用明细
|
|
|
+ AjaxResult result = tFeeServiceImpl.updateMoney(auditItems.getBillId(),fBillType);
|
|
|
+ String message = result.get("code").toString();
|
|
|
+ if ("500".equals(message)) {
|
|
|
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
+ return result;
|
|
|
+ }
|
|
|
} else if (auditItems.getActId() == 460) {
|
|
|
fettle = 3L;
|
|
|
Integer i = tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle, auditItems.getAuditItem());
|
|
@@ -1000,6 +1013,12 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
|
|
|
}
|
|
|
} else if (auditItems.getActId() >= 430 && auditItems.getActId() <= 450) {
|
|
|
fettle = 2L;
|
|
|
+ String fBillType = null;
|
|
|
+ if (auditItems.getActId() == 450 || auditItems.getActId() == 440){
|
|
|
+ fBillType = "DCRevoke";
|
|
|
+ }else if (auditItems.getActId() == 430){
|
|
|
+ fBillType = "KHDZRevoke";
|
|
|
+ }
|
|
|
// 查询财务状态
|
|
|
TFee tFee = tFeeMapper.selectTFeeById(auditItems.getBillId());
|
|
|
if (!"4".equals(tFee.getfBillstatus())) {
|
|
@@ -1013,6 +1032,13 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return AjaxResult.error("审批撤销失败: 更新审批状态失败");
|
|
|
}
|
|
|
+ // 更新费用明细
|
|
|
+ AjaxResult result = tFeeServiceImpl.updateMoney(auditItems.getBillId(),fBillType);
|
|
|
+ String message = result.get("code").toString();
|
|
|
+ if ("500".equals(message)) {
|
|
|
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
+ return result;
|
|
|
+ }
|
|
|
/*//修改主订单费用信息
|
|
|
if (auditItems.getActId() >= 440 && auditItems.getActId() <= 450) {
|
|
|
tWarehouseBillsService.updateMessage(auditItems.getBillId());
|