审核流

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/StockPurchaseReceiptReportServiceImpl.java

@@ -64,7 +64,7 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
                 * stockPurchaseReceiptReport.getPageSize());
         List<String> businessKeys = null;
         if ("1".equals(stockPurchaseReceiptReport.getSearchType())) {
-            businessKeys = workflowService.getTaskBusinessKeysByCode("STOCK-PROCUREMENT-RECEIPT-REPORT");
+            businessKeys = workflowService.getTaskBusinessKeysByCode("PROCUREMENT-RECEIPT-REPORT");
         }
         List<String> statusSet = new ArrayList<>();
         List<String> resourceIdList = this.getResourceIdList();

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/StockSaleReceiptReportServiceImpl.java

@@ -61,7 +61,7 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
                 * stockSaleReceiptReport.getPageSize());
         List<String> businessKeys = null;
         if ("1".equals(stockSaleReceiptReport.getSearchType())) {
-            businessKeys = workflowService.getTaskBusinessKeysByCode("STOCK-PROCUREMENT-RECEIPT-REPORT");
+            businessKeys = workflowService.getTaskBusinessKeysByCode("SALE-RECEIPT-REPORT");
         }
         List<String> statusSet = new ArrayList<>();
         List<String> resourceIdList = this.getResourceIdList();

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -632,6 +632,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockPurchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
 
                         stockPurchaseReceiptReportService.insert(stockPurchaseReceiptReport);
+                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+                        // 不是退回的单子
+                        if (isStartWorkflow) {
+                            Workflow workflow = workflowService
+                                    .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "PROCUREMENT-RECEIPT-REPORT");
+                            // 没配置审核流程，直接结束并处理信息
+                            if (workflow == null) {
+                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+                            }
+                            // 开启审核流
+                            else {
+                                // 设置状态 已提交审核
+                                stockPurchaseReceiptReport.setWorkflowId(workflow.getId());
+                                stockPurchaseReceiptReportService.updateById(stockPurchaseReceiptReport);
+                                workflowService.startInstance(workflow.getId(), stockPurchaseReceiptReport.getId());
+                            }
+                        }
+                        // 退回的单子 再启用
+                        else {
+                            stockPurchaseReceiptReportService.updateById(stockPurchaseReceiptReport);
+                            workflowService.activateInstance(stockPurchaseReceiptReport.getWorkflowId(), stockPurchaseReceiptReport.getId());
+                        }
                     }
                     //常用库移库入库类型
                     else if ("3".equals(warehouseInOutInfo.getInOutTypeKey())) {
@@ -675,6 +697,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 stockPurchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                                 stockPurchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
                                 stockPurchaseReceiptReportService.insert(stockPurchaseReceiptReport);
+                                boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+                                // 不是退回的单子
+                                if (isStartWorkflow) {
+                                    Workflow workflow = workflowService
+                                            .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "PROCUREMENT-RECEIPT-REPORT");
+                                    // 没配置审核流程，直接结束并处理信息
+                                    if (workflow == null) {
+                                        throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+                                    }
+                                    // 开启审核流
+                                    else {
+                                        // 设置状态 已提交审核
+                                        stockPurchaseReceiptReport.setWorkflowId(workflow.getId());
+                                        stockPurchaseReceiptReportService.updateById(stockPurchaseReceiptReport);
+                                        workflowService.startInstance(workflow.getId(), stockPurchaseReceiptReport.getId());
+                                    }
+                                }
+                                // 退回的单子 再启用
+                                else {
+                                    stockPurchaseReceiptReportService.updateById(stockPurchaseReceiptReport);
+                                    workflowService.activateInstance(stockPurchaseReceiptReport.getWorkflowId(), stockPurchaseReceiptReport.getId());
+                                }
                             }
                         }
                     }
@@ -852,6 +896,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockSaleReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                         stockSaleReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
                         stockSaleReceiptReportService.insert(stockSaleReceiptReport);
+                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockSaleReceiptReport.getWorkflowId());
+                        // 不是退回的单子
+                        if (isStartWorkflow) {
+                            Workflow workflow = workflowService
+                                    .findLatestWorkflowByBusinessCodeByApp(stockSaleReceiptReport.getCompId(), "SALE-RECEIPT-REPORT");
+                            // 没配置审核流程，直接结束并处理信息
+                            if (workflow == null) {
+                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+                            }
+                            // 开启审核流
+                            else {
+                                // 设置状态 已提交审核
+                                stockSaleReceiptReport.setWorkflowId(workflow.getId());
+                                stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
+                                workflowService.startInstance(workflow.getId(), stockSaleReceiptReport.getId());
+                            }
+                        }
+                        // 退回的单子 再启用
+                        else {
+                            stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
+                            workflowService.activateInstance(stockSaleReceiptReport.getWorkflowId(), stockSaleReceiptReport.getId());
+                        }
                         Wrapper wrapper = new EntityWrapper<TranCarInfo>()
                                 .eq("contract_no", warehouseInOutInfo.getContractNo())
                                 .eq("car_no", warehouseInOutInfo.getCarNo())
@@ -947,6 +1013,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockPurchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                         stockPurchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
                         stockPurchaseReceiptReportService.insert(stockPurchaseReceiptReport);
+                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+                        // 不是退回的单子
+                        if (isStartWorkflow) {
+                            Workflow workflow = workflowService
+                                    .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "PROCUREMENT-RECEIPT-REPORT");
+                            // 没配置审核流程，直接结束并处理信息
+                            if (workflow == null) {
+                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+                            }
+                            // 开启审核流
+                            else {
+                                // 设置状态 已提交审核
+                                stockPurchaseReceiptReport.setWorkflowId(workflow.getId());
+                                stockPurchaseReceiptReportService.updateById(stockPurchaseReceiptReport);
+                                workflowService.startInstance(workflow.getId(), stockPurchaseReceiptReport.getId());
+                            }
+                        }
+                        // 退回的单子 再启用
+                        else {
+                            stockPurchaseReceiptReportService.updateById(stockPurchaseReceiptReport);
+                            workflowService.activateInstance(stockPurchaseReceiptReport.getWorkflowId(), stockPurchaseReceiptReport.getId());
+                        }
                         ContractManagementInfo contractManagementInfo1 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("contract_no", contractManagementInfo.getContractNo()).eq("delete_flag","0"));
                         if (contractManagementInfo1 == null) {
@@ -973,6 +1061,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockSaleReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
 
                         stockSaleReceiptReportService.insert(stockSaleReceiptReport);
+                        boolean isStartWorkflow1 = org.apache.commons.lang3.StringUtils.isBlank(stockSaleReceiptReport.getWorkflowId());
+                        // 不是退回的单子
+                        if (isStartWorkflow1) {
+                            Workflow workflow = workflowService
+                                    .findLatestWorkflowByBusinessCodeByApp(stockSaleReceiptReport.getCompId(), "SALE-RECEIPT-REPORT");
+                            // 没配置审核流程，直接结束并处理信息
+                            if (workflow == null) {
+                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+                            }
+                            // 开启审核流
+                            else {
+                                // 设置状态 已提交审核
+                                stockSaleReceiptReport.setWorkflowId(workflow.getId());
+                                stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
+                                workflowService.startInstance(workflow.getId(), stockSaleReceiptReport.getId());
+                            }
+                        }
+                        // 退回的单子 再启用
+                        else {
+                            stockSaleReceiptReportService.updateById(stockSaleReceiptReport);
+                            workflowService.activateInstance(stockSaleReceiptReport.getWorkflowId(), stockSaleReceiptReport.getId());
+                        }
                         Wrapper wrapper = new EntityWrapper<TranCarInfo>()
                                 .eq("contract_no", warehouseInOutInfo.getContractNo())
                                 .eq("car_no", warehouseInOutInfo.getCarNo())