更新

winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
   profiles:
-    active: test
+    active: prod
   resources:
     static-locations: file:///winsea/static/
   thymeleaf:

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

@@ -590,28 +590,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             purchaseReceiptReport.setCustomerConfirmationStatus("否");
                         }
                         purchaseReceiptReportService.insert(purchaseReceiptReport);
-                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(purchaseReceiptReport.getWorkflowId());
-                        // 不是退回的单子
-                        if (isStartWorkflow) {
-                            Workflow workflow = workflowService
-                                    .findLatestWorkflowByBusinessCodeByApp(purchaseReceiptReport.getCompId(), "PROCUREMENT-RECEIPT-REPORT");
-                            // 没配置审核流程，直接结束并处理信息
-                            if (workflow == null) {
-                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-                            }
-                            // 开启审核流
-                            else {
-                                // 设置状态 已提交审核
-                                purchaseReceiptReport.setWorkflowId(workflow.getId());
-                                purchaseReceiptReportService.updateById(purchaseReceiptReport);
-                                workflowService.startInstance(workflow.getId(), purchaseReceiptReport.getId());
-                            }
-                        }
-                        // 退回的单子 再启用
-                        else {
-                            purchaseReceiptReportService.updateById(purchaseReceiptReport);
-                            workflowService.activateInstance(purchaseReceiptReport.getWorkflowId(), purchaseReceiptReport.getId());
-                        }
+//                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(purchaseReceiptReport.getWorkflowId());
+//                        // 不是退回的单子
+//                        if (isStartWorkflow) {
+//                            Workflow workflow = workflowService
+//                                    .findLatestWorkflowByBusinessCodeByApp(purchaseReceiptReport.getCompId(), "PROCUREMENT-RECEIPT-REPORT");
+//                            // 没配置审核流程，直接结束并处理信息
+//                            if (workflow == null) {
+//                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+//                            }
+//                            // 开启审核流
+//                            else {
+//                                // 设置状态 已提交审核
+//                                purchaseReceiptReport.setWorkflowId(workflow.getId());
+//                                purchaseReceiptReportService.updateById(purchaseReceiptReport);
+//                                workflowService.startInstance(workflow.getId(), purchaseReceiptReport.getId());
+//                            }
+//                        }
+//                        // 退回的单子 再启用
+//                        else {
+//                            purchaseReceiptReportService.updateById(purchaseReceiptReport);
+//                            workflowService.activateInstance(purchaseReceiptReport.getWorkflowId(), purchaseReceiptReport.getId());
+//                        }
                     }
                 }
                 //App线上订单出库
@@ -742,30 +742,30 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         }
                         salesDeliveryReportService.insert(salesDeliveryReport);
 
-                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(salesDeliveryReport.getWorkflowId());
-                        // 不是退回的单子
-                        if (isStartWorkflow) {
-                            Workflow workflow = workflowService
-                                    .findLatestWorkflowByBusinessCodeByApp(salesDeliveryReport.getCompId(), "SALE-RECEIPT-REPORT");
-                            // 没配置审核流程，直接结束并处理信息
-                            if (workflow == null) {
-                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-                            }
-                            // 开启审核流
-                            else {
-
-                                // 设置状态 已提交审核
-                                salesDeliveryReport.setWorkflowId(workflow.getId());
-                                salesDeliveryReportService.updateById(salesDeliveryReport);
-                                workflowService.startInstance(workflow.getId(), salesDeliveryReport.getId());
-                            }
-                        }
-                        // 退回的单子 再启用
-                        else {
-
-                            salesDeliveryReportService.updateById(salesDeliveryReport);
-                            workflowService.activateInstance(salesDeliveryReport.getWorkflowId(), salesDeliveryReport.getId());
-                        }
+//                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(salesDeliveryReport.getWorkflowId());
+//                        // 不是退回的单子
+//                        if (isStartWorkflow) {
+//                            Workflow workflow = workflowService
+//                                    .findLatestWorkflowByBusinessCodeByApp(salesDeliveryReport.getCompId(), "SALE-RECEIPT-REPORT");
+//                            // 没配置审核流程，直接结束并处理信息
+//                            if (workflow == null) {
+//                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+//                            }
+//                            // 开启审核流
+//                            else {
+//
+//                                // 设置状态 已提交审核
+//                                salesDeliveryReport.setWorkflowId(workflow.getId());
+//                                salesDeliveryReportService.updateById(salesDeliveryReport);
+//                                workflowService.startInstance(workflow.getId(), salesDeliveryReport.getId());
+//                            }
+//                        }
+//                        // 退回的单子 再启用
+//                        else {
+//
+//                            salesDeliveryReportService.updateById(salesDeliveryReport);
+//                            workflowService.activateInstance(salesDeliveryReport.getWorkflowId(), salesDeliveryReport.getId());
+//                        }
                     }
                 }
             } else {
@@ -816,28 +816,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(), "STOCK-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());
-                            }
+//                            boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+//                            // 不是退回的单子
+//                            if (isStartWorkflow) {
+//                                Workflow workflow = workflowService
+//                                        .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "STOCK-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());
+//                            }
                         }
                     }
                     //常用库移库入库类型
@@ -900,28 +900,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(), "STOCK-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());
-                                    }
+//                                    boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+//                                    // 不是退回的单子
+//                                    if (isStartWorkflow) {
+//                                        Workflow workflow = workflowService
+//                                                .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "STOCK-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());
+//                                    }
                                 }
                             }
 //                            //常用库之间的移库
@@ -1870,28 +1870,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(), "STOCK-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());
-                            }
+//                            boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+//                            // 不是退回的单子
+//                            if (isStartWorkflow) {
+//                                Workflow workflow = workflowService
+//                                        .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "STOCK-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());
+//                            }
                         }
                         //现货销售出库报表
                         StockSaleReceiptReport stockSaleReceiptReport = new StockSaleReceiptReport();
@@ -1917,28 +1917,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockSaleReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                         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());
-                        }
+//                        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());
+//                        }
                         ContractManagementInfo contractManagementInfo1 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("contract_no", warehouseBaseInfo.getWarehouseName()).eq("delete_flag", "0"));
                         if (contractManagementInfo1 == null) {
@@ -2009,28 +2009,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(), "STOCK-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());
-                            }
+//                            boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+//                            // 不是退回的单子
+//                            if (isStartWorkflow) {
+//                                Workflow workflow = workflowService
+//                                        .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "STOCK-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", warehouseBaseInfo.getWarehouseName()).eq("delete_flag", "0"));
@@ -3166,28 +3166,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             purchaseReceiptReport.setCustomerConfirmationStatus("否");
                         }
                         purchaseReceiptReportService.insert(purchaseReceiptReport);
-                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(purchaseReceiptReport.getWorkflowId());
-                        // 不是退回的单子
-                        if (isStartWorkflow) {
-                            Workflow workflow = workflowService
-                                    .findLatestWorkflowByBusinessCodeByApp(purchaseReceiptReport.getCompId(), "PROCUREMENT-RECEIPT-REPORT");
-                            // 没配置审核流程，直接结束并处理信息
-                            if (workflow == null) {
-                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-                            }
-                            // 开启审核流
-                            else {
-                                // 设置状态 已提交审核
-                                purchaseReceiptReport.setWorkflowId(workflow.getId());
-                                purchaseReceiptReportService.updateById(purchaseReceiptReport);
-                                workflowService.startInstance(workflow.getId(), purchaseReceiptReport.getId());
-                            }
-                        }
-                        // 退回的单子 再启用
-                        else {
-                            purchaseReceiptReportService.updateById(purchaseReceiptReport);
-                            workflowService.activateInstance(purchaseReceiptReport.getWorkflowId(), purchaseReceiptReport.getId());
-                        }
+//                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(purchaseReceiptReport.getWorkflowId());
+//                        // 不是退回的单子
+//                        if (isStartWorkflow) {
+//                            Workflow workflow = workflowService
+//                                    .findLatestWorkflowByBusinessCodeByApp(purchaseReceiptReport.getCompId(), "PROCUREMENT-RECEIPT-REPORT");
+//                            // 没配置审核流程，直接结束并处理信息
+//                            if (workflow == null) {
+//                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+//                            }
+//                            // 开启审核流
+//                            else {
+//                                // 设置状态 已提交审核
+//                                purchaseReceiptReport.setWorkflowId(workflow.getId());
+//                                purchaseReceiptReportService.updateById(purchaseReceiptReport);
+//                                workflowService.startInstance(workflow.getId(), purchaseReceiptReport.getId());
+//                            }
+//                        }
+//                        // 退回的单子 再启用
+//                        else {
+//                            purchaseReceiptReportService.updateById(purchaseReceiptReport);
+//                            workflowService.activateInstance(purchaseReceiptReport.getWorkflowId(), purchaseReceiptReport.getId());
+//                        }
                     }
                 }
                 //App线上订单出库
@@ -3318,30 +3318,30 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         }
                         salesDeliveryReportService.insert(salesDeliveryReport);
 
-                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(salesDeliveryReport.getWorkflowId());
-                        // 不是退回的单子
-                        if (isStartWorkflow) {
-                            Workflow workflow = workflowService
-                                    .findLatestWorkflowByBusinessCodeByApp(salesDeliveryReport.getCompId(), "SALE-RECEIPT-REPORT");
-                            // 没配置审核流程，直接结束并处理信息
-                            if (workflow == null) {
-                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-                            }
-                            // 开启审核流
-                            else {
-
-                                // 设置状态 已提交审核
-                                salesDeliveryReport.setWorkflowId(workflow.getId());
-                                salesDeliveryReportService.updateById(salesDeliveryReport);
-                                workflowService.startInstance(workflow.getId(), salesDeliveryReport.getId());
-                            }
-                        }
-                        // 退回的单子 再启用
-                        else {
-
-                            salesDeliveryReportService.updateById(salesDeliveryReport);
-                            workflowService.activateInstance(salesDeliveryReport.getWorkflowId(), salesDeliveryReport.getId());
-                        }
+//                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(salesDeliveryReport.getWorkflowId());
+//                        // 不是退回的单子
+//                        if (isStartWorkflow) {
+//                            Workflow workflow = workflowService
+//                                    .findLatestWorkflowByBusinessCodeByApp(salesDeliveryReport.getCompId(), "SALE-RECEIPT-REPORT");
+//                            // 没配置审核流程，直接结束并处理信息
+//                            if (workflow == null) {
+//                                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+//                            }
+//                            // 开启审核流
+//                            else {
+//
+//                                // 设置状态 已提交审核
+//                                salesDeliveryReport.setWorkflowId(workflow.getId());
+//                                salesDeliveryReportService.updateById(salesDeliveryReport);
+//                                workflowService.startInstance(workflow.getId(), salesDeliveryReport.getId());
+//                            }
+//                        }
+//                        // 退回的单子 再启用
+//                        else {
+//
+//                            salesDeliveryReportService.updateById(salesDeliveryReport);
+//                            workflowService.activateInstance(salesDeliveryReport.getWorkflowId(), salesDeliveryReport.getId());
+//                        }
                     }
                 }
             }
@@ -3393,28 +3393,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(), "STOCK-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());
-                            }
+//                            boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+//                            // 不是退回的单子
+//                            if (isStartWorkflow) {
+//                                Workflow workflow = workflowService
+//                                        .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "STOCK-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());
+//                            }
                         }
                     }
                     //常用库移库入库类型
@@ -3477,28 +3477,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(), "STOCK-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());
-                                    }
+//                                    boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+//                                    // 不是退回的单子
+//                                    if (isStartWorkflow) {
+//                                        Workflow workflow = workflowService
+//                                                .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "STOCK-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());
+//                                    }
                                 }
                             }
                             //常用库之间移库
@@ -4600,28 +4600,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(), "STOCK-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());
-                            }
+//                            boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+//                            // 不是退回的单子
+//                            if (isStartWorkflow) {
+//                                Workflow workflow = workflowService
+//                                        .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "STOCK-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 contractManagementInfoSale = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
@@ -4649,28 +4649,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockSaleReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                         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());
-                        }
+//                        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());
+//                        }
                         ContractManagementInfo contractManagementInfo1 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("contract_no", warehouseBaseInfo.getWarehouseName()).eq("delete_flag", "0"));
                         if (contractManagementInfo1 == null) {
@@ -4741,28 +4741,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(), "STOCK-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());
-                            }
+//                            boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+//                            // 不是退回的单子
+//                            if (isStartWorkflow) {
+//                                Workflow workflow = workflowService
+//                                        .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "STOCK-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", warehouseBaseInfo.getWarehouseName()).eq("delete_flag", "0"));

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

@@ -1132,28 +1132,28 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                         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(), "STOCK-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());
-                        }
+//                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+//                        // 不是退回的单子
+//                        if (isStartWorkflow) {
+//                            Workflow workflow = workflowService
+//                                    .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "STOCK-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());
+//                        }
                     }
                 }
                 //常用库之间移库
@@ -1538,28 +1538,28 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                         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(), "STOCK-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());
-                        }
+//                        boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+//                        // 不是退回的单子
+//                        if (isStartWorkflow) {
+//                            Workflow workflow = workflowService
+//                                    .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "STOCK-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 contractManagementInfoSale = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
 //                            .eq("contract_no", warehouseInOutInfo.getContractNo())
@@ -1586,28 +1586,28 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                     stockSaleReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                     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());
-                    }
+//                    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<InOutWarehouseTask> inOutWarehouseTaskWrapper = new EntityWrapper<>();
                     inOutWarehouseTaskWrapper.eq("in_out_flag", "1").eq("delete_flag", "0");
                     inOutWarehouseTaskWrapper.andNew().eq("move_task_no", warehouseInOutInfo.getContractNo()).or()
@@ -1921,28 +1921,28 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                     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(), "STOCK-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());
-                    }
+//                    boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(stockPurchaseReceiptReport.getWorkflowId());
+//                    // 不是退回的单子
+//                    if (isStartWorkflow) {
+//                        Workflow workflow = workflowService
+//                                .findLatestWorkflowByBusinessCodeByApp(stockPurchaseReceiptReport.getCompId(), "STOCK-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());
+//                    }
                 }
                 Wrapper<InOutWarehouseTask> inOutWarehouseTaskWrapper = new EntityWrapper<>();
                 inOutWarehouseTaskWrapper.eq("in_out_flag", "1").eq("delete_flag", "0");