浏览代码

临时库销售出库自运他运区分

zhangyuewww 2 年之前
父节点
当前提交
ef1b2f4181

文件差异内容过多而无法显示
+ 648 - 342
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java


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

@@ -1737,28 +1737,6 @@ 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());
-//                        }
                     }
                     //查销售合同
                     ContractManagementInfo contractManagementInfoSale = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
@@ -1791,81 +1769,237 @@ 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());
-//                    }
-                    Wrapper<InOutWarehouseTask> inOutWarehouseTaskWrapper = new EntityWrapper<>();
-                    inOutWarehouseTaskWrapper.eq("in_out_flag", "1").eq("delete_flag", "0");
-                    inOutWarehouseTaskWrapper.andNew().eq("move_task_no", warehouseInOutInfo.getContractNo()).or()
-                            .eq("contract_no", warehouseInOutInfo.getContractNo());
-                    InOutWarehouseTask inOutWarehouseTask1 = inOutWarehouseTaskService.selectOne(inOutWarehouseTaskWrapper);
-                    if (inOutWarehouseTask1 != null) {
+                    //自运的销售合同
+                    if ("1".equals(contractManagementInfoSale.getDeliverType())){
                         //自运出库时手动加的车
-                        List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                                .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("tran_type", "1")
-                                .orderBy("create_date", false));
-                        TranCarInfo tranCarInfo = new TranCarInfo();
+                        if ("1".equals(warehouseInOutInfo.getSelfLoading()) || warehouseInOutInfo.getTranCarNo() == null || warehouseInOutInfo.getCarId() == null) {
+                            List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                                    .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("fleet_flag", "0").eq("tran_type", "1")
+                                    .orderBy("create_date", false));
+                            TranCarInfo tranCarInfo = new TranCarInfo();
+                            TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
+                                    .eq("comp_id", warehouseBaseInfo.getCompId())
+                                    .eq("contract_no", warehouseInOutInfo.getContractNo()));
+                            if (tranTaskInfo != null) {
+                                TranProcessInfo tranProcessInfo = tranProcessInfoService.selectOne(new EntityWrapper<TranProcessInfo>()
+                                        .eq("info_id", tranTaskInfo.getId()));
+                                tranCarInfo.setProcessId(tranProcessInfo.getId());
+                                tranCarInfo.setTranPrice(String.valueOf(tranProcessInfo.getTranPrice() != null ? tranProcessInfo.getTranPrice() : 0f));
+                                warehouseInOutInfo.setFreight(tranProcessInfo.getTranPrice());
+                                warehouseInOutInfo.setTaskNo(tranTaskInfo.getTaskNo());
+                                tranCarInfo.setInfoId(tranTaskInfo.getId());
+                            } else {
+                                throw new YException(YExceptionEnum.TRANTASK_NOT_CREATED_ERROR);
+                            }
+                            tranCarInfo.setCompId(warehouseBaseInfo.getCompId());
+                            tranCarInfo.setTranType("1");
+                            tranCarInfo.setSubmit("1");
+                            ContractManagementInfo contractManagementInfo2 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                                    .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("delete_flag", "0"));
+                            if (contractManagementInfo2 != null) {
+                                tranCarInfo.setCost(contractManagementInfo2.getUnitContractPrice());
+                            } else {
+                                //出库时打入成本
+                                CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", warehouseInOutInfo.getBaseId())
+                                        .eq("goods_name", warehouseInOutInfo.getGoodsName()));
+                                if (costManagementInfo != null) {
+                                    tranCarInfo.setCost(costManagementInfo.getCost());
+                                }
+                            }
+                            tranCarInfo.setLoadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            tranCarInfo.setLoadingDate(new Date());
+                            tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
+                            String tranCarNo = "";
+                            if ((tranCarInfoList.size() + 1) < 10) {
+                                tranCarNo = "C00" + (tranCarInfoList.size() + 1);
+                            } else if (tranCarInfoList.size() + 1 < 100) {
+                                tranCarNo = "C0" + (tranCarInfoList.size() + 1);
+                            } else {
+                                tranCarNo = "C" + (tranCarInfoList.size() + 1);
+                            }
+                            tranCarInfo.setTranCarNo(tranCarNo);
+                            tranCarInfo.setId(IdGenerator.generateUUID());
+                            tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
+                            tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
+                            tranCarInfo.setStatus(StatusEnum.LOADED.getName());
+                            tranCarInfo.setFleetName(warehouseInOutInfo.getFleet());
+                            warehouseInOutInfo.setSelfLoading("1");
+                            warehouseInOutInfo.setCarId(tranCarInfo.getId());
+                            warehouseInOutInfo.setTranCarNo(tranCarNo);
+                            warehouseInOutInfoService.updateById(warehouseInOutInfo);
+                            tranCarInfoService.insert(tranCarInfo);
+                        }
+                        //生成汽运报表
+                        TranSettlementReport tranSettlementReport = new TranSettlementReport();
+                        tranSettlementReport.setCompId(warehouseBaseInfo.getCompId());
+                        tranSettlementReport.setCarId(warehouseInOutInfo.getCarId());
+                        tranSettlementReport.setId(IdGenerator.generateUUID());
+                        tranSettlementReport.setTranCarNo(warehouseInOutInfo.getTranCarNo());
+                        if ("汽运".equals(warehouseInOutInfo.getOutType())) {
+                            tranSettlementReport.setTranType("汽运");
+                            tranSettlementReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            tranSettlementReport.setServiceCharge(20d);
+                            tranSettlementReport.setTranTypeKey("1");
+                            TranCarInfo tranCarInfo=tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
+                            if (tranCarInfo!=null){
+                                TranTaskInfo tranTaskInfo=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
+                                tranSettlementReport.setTaskNo(tranTaskInfo.getTaskNo());
+                                tranSettlementReport.setStartAddress(tranTaskInfo.getSendWarehouse());
+                                tranSettlementReport.setBillingMethod(tranCarInfo.getBillingMethod());
+                                TranProcessInfo tranProcessInfo=tranProcessInfoService.selectById(tranCarInfo.getProcessId());
+                                if (tranProcessInfo!=null){
+                                    tranSettlementReport.setGrainPrice(tranProcessInfo.getGoodsValue());
+                                }
+                                //运输单价不为空
+                                if (tranCarInfo.getTranPrice()!=null){
+                                    tranSettlementReport.setTransportPrice(Float.valueOf(tranCarInfo.getTranPrice()));
+                                    tranSettlementReport.setSettlementPrice(Double.valueOf(tranCarInfo.getTranPrice()));
+                                    //按吨计费
+                                    if("1".equals(tranSettlementReport.getBillingMethod())) {
+                                        //应付=单价x结算重量
+                                        tranSettlementReport.setAmountIngPayable(tranSettlementReport.getTransportPrice() * tranSettlementReport.getSettlementWeight());
+                                    }
+                                    //按车
+                                    else{
+                                        //应付
+                                        tranSettlementReport.setAmountIngPayable(tranSettlementReport.getTransportPrice());
+                                    }
+                                    //实付金额
+                                    if(tranSettlementReport.getDeductionAmount() != null){
+                                        tranSettlementReport.setAmountActuallyPaid(tranSettlementReport.getAmountIngPayable()
+                                                - Double.valueOf(tranSettlementReport.getDeductionAmount()) - tranSettlementReport.getServiceCharge());
+                                    }else{
+                                        tranSettlementReport.setAmountActuallyPaid(tranSettlementReport.getAmountIngPayable()
+                                                - tranSettlementReport.getServiceCharge());
+                                    }
+                                    //税点
+                                    tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
+                                    //合计应付
+                                    tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
+                                    //未付
+                                    tranSettlementReport.setAmountNotPayable(Float.valueOf(String.valueOf(tranSettlementReport.getTotalPayable())));
+                                }
+                            }
+                        }
+                        else if ("火运".equals(warehouseInOutInfo.getOutType())) {
+                            tranSettlementReport.setTranType("火运");
+                            TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                    .eq("tran_type","2")
+                                    .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                    .eq("box_no",warehouseInOutInfo.getFireDirection()));
+                            if (tranCarInfo!=null){
+                                TranTaskInfo tranTaskInfo1=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
+                                if (tranTaskInfo1!=null){
+                                    tranSettlementReport.setTaskNo(tranTaskInfo1.getTaskNo());
+                                    TranProcessInfo tranProcessInfo=tranProcessInfoService.selectById(tranCarInfo.getProcessId());
+                                    if (tranProcessInfo!=null){
+                                        tranSettlementReport.setGrainPrice(tranProcessInfo.getGoodsValue());
+                                    }
+                                }
+                            }
+                            tranSettlementReport.setTranTypeKey("2");
+                        }
+                        else {
+                            tranSettlementReport.setTranType("船运");
+                            tranSettlementReport.setTranTypeKey("3");
+                            tranSettlementReport.setShipType(warehouseInOutInfo.getOutType());
+                            TranCarInfo tranCarInfo=tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
+                                    .eq("tran_type","3")
+                                    .eq("contract_no",warehouseInOutInfo.getContractNo())
+                                    .eq("ship_no",warehouseInOutInfo.getShipNumber()));
+                            if (tranCarInfo!=null){
+                                TranTaskInfo tranTaskInfo1=tranTaskInfoService.selectById(tranCarInfo.getInfoId());
+                                if (tranTaskInfo1!=null){
+                                    tranSettlementReport.setTaskNo(tranTaskInfo1.getTaskNo());
+                                    TranProcessInfo tranProcessInfo=tranProcessInfoService.selectById(tranCarInfo.getProcessId());
+                                    if (tranProcessInfo!=null){
+                                        tranSettlementReport.setGrainPrice(tranProcessInfo.getGoodsValue());
+                                    }
+                                }
+                            }
+                        }
+                        tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
+                        tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
+                        tranSettlementReport.setLoadingImg(warehouseInOutInfo.getAddressUrl());
+                        tranSettlementReport.setLoadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                        tranSettlementReport.setStatusFlag(StatusEnum.PENDING_PAY.getFlag());
+                        tranSettlementReport.setStatus(StatusEnum.PENDING_PAY.getName());
+                        tranSettlementReportService.insert(tranSettlementReport);
+                    }
+                    //他运的销售合同
+                    else if ("2".equals(contractManagementInfoSale.getDeliverType())){
                         TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
-                                .eq("comp_id", warehouseBaseInfo.getCompId())
-                                .eq("contract_no", warehouseInOutInfo.getContractNo()));
+                                .eq("contract_no", contractManagementInfoSale.getContractNo())
+                                .eq("comp_id", contractManagementInfoSale.getCompId()));
+                        //查他运运输任务
                         if (tranTaskInfo != null) {
                             TranProcessInfo tranProcessInfo = tranProcessInfoService.selectOne(new EntityWrapper<TranProcessInfo>()
                                     .eq("info_id", tranTaskInfo.getId()));
-                            tranCarInfo.setProcessId(tranProcessInfo.getId());
-                            tranCarInfo.setTranPrice(String.valueOf(tranProcessInfo.getTranPrice() != null ? tranProcessInfo.getTranPrice() : 0f));
-                            tranCarInfo.setInfoId(tranTaskInfo.getId());
-                        } else {
-                            throw new YException(YExceptionEnum.TRANTASK_NOT_CREATED_ERROR);
-                        }
-                        tranCarInfo.setCompId(warehouseBaseInfo.getCompId());
-                        tranCarInfo.setTranType("1");
-                        tranCarInfo.setSubmit("1");
-                        //出库时打入成本
-                        CostManagementInfo costManagementInfo = costManagementInfoService.selectOne(new EntityWrapper<CostManagementInfo>().eq("warehouse_id", warehouseInOutInfo.getBaseId())
-                                .eq("goods_name", warehouseInOutInfo.getGoodsName()));
-                        if (costManagementInfo != null) {
-                            tranCarInfo.setCost(costManagementInfo.getCost());
-                        }
-                        tranCarInfo.setLoadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
-                        tranCarInfo.setLoadingDate(new Date());
-                        tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
-                        String tranCarNo = "";
-                        if ((tranCarInfoList.size() + 1) < 10) {
-                            tranCarNo = "C00" + (tranCarInfoList.size() + 1);
-                        } else if (tranCarInfoList.size() + 1 < 100) {
-                            tranCarNo = "C0" + (tranCarInfoList.size() + 1);
-                        } else {
-                            tranCarNo = "C" + (tranCarInfoList.size() + 1);
+                            if (tranProcessInfo != null) {
+                                if (tranProcessInfo.getThreeTranType() == null) {
+                                    tranProcessInfo.setThreeTranType(warehouseInOutInfo.getOutType());
+
+                                } else if (!tranProcessInfo.getThreeTranType().contains(warehouseInOutInfo.getOutType())) {
+                                    tranProcessInfo.setThreeTranType(tranProcessInfo.getThreeTranType() + "," + warehouseInOutInfo.getOutType());
+                                }
+                                tranProcessInfoService.updateById(tranProcessInfo);
+                                stockSaleReceiptReport.setProcessId(tranProcessInfo.getId());
+                                TranCarInfo tranCarInfo = new TranCarInfo();
+                                tranCarInfo.setId(IdGenerator.generateUUID());
+                                tranCarInfo.setProcessId(tranProcessInfo.getId());
+                                tranCarInfo.setCompId(tranTaskInfo.getCompId());
+                                tranCarInfo.setInfoId(tranProcessInfo.getInfoId());
+                                tranCarInfo.setTranType("4");
+                                tranCarInfo.setSubmit("1");
+                                tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
+                                tranCarInfo.setLoadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
+                                tranCarInfo.setStatus(StatusEnum.LOADED.getName());
+                                if ("汽运".equals(warehouseInOutInfo.getOutType())) {
+                                    tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
+                                    tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                    tranCarInfo.setThreeTranType("汽运");
+                                    tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                    tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                    tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
+                                    stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
+                                    stockSaleReceiptReport.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                    stockSaleReceiptReport.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                    stockSaleReceiptReport.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                    stockSaleReceiptReport.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
+                                } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
+                                    tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
+                                    tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                    tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                    tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                    tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
+                                    tranCarInfo.setThreeTranType("火运");
+                                    stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
+                                    stockSaleReceiptReport.setBoxNo(warehouseInOutInfo.getWingNumber());
+                                } else if ("散船".equals(warehouseInOutInfo.getOutType())) {
+                                    tranCarInfo.setShipName(warehouseInOutInfo.getShipName());
+                                    tranCarInfo.setShipNo(warehouseInOutInfo.getShipNumber());
+                                    tranCarInfo.setThreeTranType("散船");
+                                    tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
+                                    stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
+                                    stockSaleReceiptReport.setShipName(warehouseInOutInfo.getShipName());
+                                    stockSaleReceiptReport.setShipNo(warehouseInOutInfo.getShipNumber());
+                                } else if ("集装箱船".equals(warehouseInOutInfo.getOutType())) {
+                                    tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
+                                    tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                    tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                    tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                    tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
+                                    tranCarInfo.setThreeTranType("集装箱船");
+                                    stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
+                                    stockSaleReceiptReport.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                    stockSaleReceiptReport.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
+                                    stockSaleReceiptReport.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                    stockSaleReceiptReport.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                }
+                                tranCarInfoService.insert(tranCarInfo);
+                            }
                         }
-                        tranCarInfo.setTranCarNo(tranCarNo);
-                        tranCarInfo.setId(IdGenerator.generateUUID());
-                        tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
-                        tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
-                        tranCarInfo.setStatus(StatusEnum.LOADED.getName());
-                        warehouseInOutInfo.setSelfLoading("1");
-                        warehouseInOutInfo.setCarId(tranCarInfo.getId());
-                        warehouseInOutInfo.setTranCarNo(tranCarNo);
-                        warehouseInOutInfoService.updateById(warehouseInOutInfo);
-                        tranCarInfoService.insert(tranCarInfo);
                     }
                 }
             }
@@ -2126,28 +2260,6 @@ 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());
-//                    }
                 }
                 Wrapper<InOutWarehouseTask> inOutWarehouseTaskWrapper = new EntityWrapper<>();
                 inOutWarehouseTaskWrapper.eq("in_out_flag", "1").eq("delete_flag", "0");

部分文件因为文件数量过多而无法显示