|
|
@@ -504,30 +504,32 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
|
|
|
}
|
|
|
//未付
|
|
|
tranSettlementReport.setAmountNotPayable(tranSettlementReport.getAmountIngPayable());
|
|
|
+ tranSettlementReport.setBatchId(batchReviewInfo.getId());
|
|
|
tranSettlementReportService.insert(tranSettlementReport);
|
|
|
- boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(tranSettlementReport.getWorkflowId());
|
|
|
- // 不是退回的单子
|
|
|
- if (isStartWorkflow) {
|
|
|
- Workflow workflow = workflowService
|
|
|
- .findLatestWorkflowByBusinessCodeByApp(tranSettlementReport.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
|
|
|
- // 没配置审核流程，直接结束并处理信息
|
|
|
- if (workflow == null) {
|
|
|
- throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
|
|
|
- }
|
|
|
- // 开启审核流
|
|
|
- else {
|
|
|
-
|
|
|
- // 设置状态 已提交审核
|
|
|
- tranSettlementReport.setWorkflowId(workflow.getId());
|
|
|
- tranSettlementReportService.updateById(tranSettlementReport);
|
|
|
- workflowService.startInstance(workflow.getId(), tranSettlementReport.getId());
|
|
|
- }
|
|
|
- }
|
|
|
- // 退回的单子 再启用
|
|
|
- else {
|
|
|
- tranSettlementReportService.updateById(tranSettlementReport);
|
|
|
- workflowService.activateInstance(tranSettlementReport.getWorkflowId(), tranSettlementReport.getId());
|
|
|
- }
|
|
|
+ flagBatch="1";
|
|
|
+// boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(tranSettlementReport.getWorkflowId());
|
|
|
+// // 不是退回的单子
|
|
|
+// if (isStartWorkflow) {
|
|
|
+// Workflow workflow = workflowService
|
|
|
+// .findLatestWorkflowByBusinessCodeByApp(tranSettlementReport.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
|
|
|
+// // 没配置审核流程，直接结束并处理信息
|
|
|
+// if (workflow == null) {
|
|
|
+// throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
|
|
|
+// }
|
|
|
+// // 开启审核流
|
|
|
+// else {
|
|
|
+//
|
|
|
+// // 设置状态 已提交审核
|
|
|
+// tranSettlementReport.setWorkflowId(workflow.getId());
|
|
|
+// tranSettlementReportService.updateById(tranSettlementReport);
|
|
|
+// workflowService.startInstance(workflow.getId(), tranSettlementReport.getId());
|
|
|
+// }
|
|
|
+// }
|
|
|
+// // 退回的单子 再启用
|
|
|
+// else {
|
|
|
+// tranSettlementReportService.updateById(tranSettlementReport);
|
|
|
+// workflowService.activateInstance(tranSettlementReport.getWorkflowId(), tranSettlementReport.getId());
|
|
|
+// }
|
|
|
}
|
|
|
}
|
|
|
TranProcessInfo tranProcessInfo1 = this.selectById(tranProcessInfo.getId());
|
