|
@@ -315,30 +315,30 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
|
|
purchaseOrder.setId(IdGenerator.generateUUID());
|
|
purchaseOrder.setId(IdGenerator.generateUUID());
|
|
// 操作主表数据
|
|
// 操作主表数据
|
|
boolean one = this.insert(purchaseOrder);
|
|
boolean one = this.insert(purchaseOrder);
|
|
- boolean isStartWorkflow = StringUtils.isBlank(purchaseOrder.getWorkflowId());
|
|
|
|
- // 不是退回的单子
|
|
|
|
- if (isStartWorkflow) {
|
|
|
|
- Workflow workflow = workflowService
|
|
|
|
- .findLatestWorkflowByBusinessCode("PURCHASE-ORDER-APPROVE");
|
|
|
|
- // 没配置审核流程,直接结束并处理信息
|
|
|
|
- if (workflow == null) {
|
|
|
|
- throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
|
|
|
|
- }
|
|
|
|
- // 开启审核流
|
|
|
|
- else {
|
|
|
|
-
|
|
|
|
- // 设置状态 已提交审核
|
|
|
|
- purchaseOrder.setWorkflowId(workflow.getId());
|
|
|
|
- this.updateById(purchaseOrder);
|
|
|
|
- workflowService.startInstance(workflow.getId(), purchaseOrder.getId());
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- // 退回的单子 再启用
|
|
|
|
- else {
|
|
|
|
-
|
|
|
|
- this.updateById(purchaseOrder);
|
|
|
|
- workflowService.activateInstance(purchaseOrder.getWorkflowId(), purchaseOrder.getId());
|
|
|
|
- }
|
|
|
|
|
|
+// boolean isStartWorkflow = StringUtils.isBlank(purchaseOrder.getWorkflowId());
|
|
|
|
+// // 不是退回的单子
|
|
|
|
+// if (isStartWorkflow) {
|
|
|
|
+// Workflow workflow = workflowService
|
|
|
|
+// .findLatestWorkflowByBusinessCode("PURCHASE-ORDER-APPROVE");
|
|
|
|
+// // 没配置审核流程,直接结束并处理信息
|
|
|
|
+// if (workflow == null) {
|
|
|
|
+// throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
|
|
|
|
+// }
|
|
|
|
+// // 开启审核流
|
|
|
|
+// else {
|
|
|
|
+//
|
|
|
|
+// // 设置状态 已提交审核
|
|
|
|
+// purchaseOrder.setWorkflowId(workflow.getId());
|
|
|
|
+// this.updateById(purchaseOrder);
|
|
|
|
+// workflowService.startInstance(workflow.getId(), purchaseOrder.getId());
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// // 退回的单子 再启用
|
|
|
|
+// else {
|
|
|
|
+//
|
|
|
|
+// this.updateById(purchaseOrder);
|
|
|
|
+// workflowService.activateInstance(purchaseOrder.getWorkflowId(), purchaseOrder.getId());
|
|
|
|
+// }
|
|
if (one) {
|
|
if (one) {
|
|
return "OK";
|
|
return "OK";
|
|
}else{
|
|
}else{
|