Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -239,6 +239,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
     public String editInfo(ContractManagementInfo contractManagementInfo) {
         // 主表信息编辑
         boolean one = this.updateById(contractManagementInfo);
+        //上传附件flag 1
         if(contractManagementInfo.getFlag()==null) {
             // 更新仓库名
             WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>()
@@ -252,70 +253,70 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 warehouseBaseInfoService.updateById(warehouseBaseInfo);
             }
             // 根据类型进入审核
-            if ("1".equals(contractManagementInfo.getGoodsType())) {
-                if ("1".equals(contractManagementInfo.getContractType())) {
-                    boolean isStartWorkflow = StringUtils.isBlank(contractManagementInfo.getWorkflowId());
-                    // 不是退回的单子
-                    if (isStartWorkflow) {
-                        Workflow workflow = workflowService
-                                .findLatestWorkflowByBusinessCodeByApp(contractManagementInfo.getCompId(), "SALE-CONTRACT-APPROVE");
-                        // 没配置审核流程，直接结束并处理信息
-                        if (workflow == null) {
-                            throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-                        }
-                        // 开启审核流
-                        else {
-
-                            // 设置状态 已提交审核
-                            //状态清空
-                            contractManagementInfo.setStatusFlag("");
-                            contractManagementInfo.setStatus("");
-                            contractManagementInfo.setWorkflowId(workflow.getId());
-                            this.updateById(contractManagementInfo);
-                            workflowService.startInstance(workflow.getId(), contractManagementInfo.getId());
-                        }
-                    }
-                    // 退回的单子 再启用
-                    else {
-                        //状态清空
-                        contractManagementInfo.setStatusFlag("");
-                        contractManagementInfo.setStatus("");
-                        this.updateById(contractManagementInfo);
-                        workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
-                    }
-                } else {
-
-                    boolean isStartWorkflow = StringUtils.isBlank(contractManagementInfo.getWorkflowId());
-                    // 不是退回的单子
-                    if (isStartWorkflow) {
-                        Workflow workflow = workflowService
-                                .findLatestWorkflowByBusinessCodeByApp(contractManagementInfo.getCompId(), "BUY-CONTRACT-APPROVE");
-                        // 没配置审核流程，直接结束并处理信息
-                        if (workflow == null) {
-                            throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-                        }
-                        // 开启审核流
-                        else {
-                            //状态清空
-                            contractManagementInfo.setStatusFlag("");
-                            contractManagementInfo.setStatus("");
-                            // 设置状态 已提交审核
-                            contractManagementInfo.setWorkflowId(workflow.getId());
-                            this.updateById(contractManagementInfo);
-                            workflowService.startInstance(workflow.getId(), contractManagementInfo.getId());
-                        }
-                    }
-                    // 退回的单子 再启用
-                    else {
-                        //状态清空
-                        contractManagementInfo.setStatusFlag("");
-                        contractManagementInfo.setStatus("");
-                        this.updateById(contractManagementInfo);
-                        workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
-                    }
-
-                }
-            }
+//            if ("1".equals(contractManagementInfo.getGoodsType())) {
+//                if ("1".equals(contractManagementInfo.getContractType())) {
+//                    boolean isStartWorkflow = StringUtils.isBlank(contractManagementInfo.getWorkflowId());
+//                    // 不是退回的单子
+//                    if (isStartWorkflow) {
+//                        Workflow workflow = workflowService
+//                                .findLatestWorkflowByBusinessCodeByApp(contractManagementInfo.getCompId(), "SALE-CONTRACT-APPROVE");
+//                        // 没配置审核流程，直接结束并处理信息
+//                        if (workflow == null) {
+//                            throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+//                        }
+//                        // 开启审核流
+//                        else {
+//
+//                            // 设置状态 已提交审核
+//                            //状态清空
+//                            contractManagementInfo.setStatusFlag("");
+//                            contractManagementInfo.setStatus("");
+//                            contractManagementInfo.setWorkflowId(workflow.getId());
+//                            this.updateById(contractManagementInfo);
+//                            workflowService.startInstance(workflow.getId(), contractManagementInfo.getId());
+//                        }
+//                    }
+//                    // 退回的单子 再启用
+//                    else {
+//                        //状态清空
+//                        contractManagementInfo.setStatusFlag("");
+//                        contractManagementInfo.setStatus("");
+//                        this.updateById(contractManagementInfo);
+//                        workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
+//                    }
+//                } else {
+//
+//                    boolean isStartWorkflow = StringUtils.isBlank(contractManagementInfo.getWorkflowId());
+//                    // 不是退回的单子
+//                    if (isStartWorkflow) {
+//                        Workflow workflow = workflowService
+//                                .findLatestWorkflowByBusinessCodeByApp(contractManagementInfo.getCompId(), "BUY-CONTRACT-APPROVE");
+//                        // 没配置审核流程，直接结束并处理信息
+//                        if (workflow == null) {
+//                            throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+//                        }
+//                        // 开启审核流
+//                        else {
+//                            //状态清空
+//                            contractManagementInfo.setStatusFlag("");
+//                            contractManagementInfo.setStatus("");
+//                            // 设置状态 已提交审核
+//                            contractManagementInfo.setWorkflowId(workflow.getId());
+//                            this.updateById(contractManagementInfo);
+//                            workflowService.startInstance(workflow.getId(), contractManagementInfo.getId());
+//                        }
+//                    }
+//                    // 退回的单子 再启用
+//                    else {
+//                        //状态清空
+//                        contractManagementInfo.setStatusFlag("");
+//                        contractManagementInfo.setStatus("");
+//                        this.updateById(contractManagementInfo);
+//                        workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
+//                    }
+//
+//                }
+//            }
             // 货物信息编辑
             contractGoodsInfoService.updateById(contractManagementInfo.getContractGoodsInfo());
             //流程编辑