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/WarehouseInOutInfoServiceImpl.java

@@ -1615,54 +1615,53 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 workflowService.activateInstance(stockPurchaseReceiptReport.getWorkflowId(), stockPurchaseReceiptReport.getId());
                             }
                         }
+                        //现货销售出库报表
+                        StockSaleReceiptReport stockSaleReceiptReport = new StockSaleReceiptReport();
+                        stockSaleReceiptReport.setId(IdGenerator.generateUUID());
+                        stockSaleReceiptReport.setCompId(warehouseBaseInfo.getCompId());
+                        stockSaleReceiptReport.setWarehouseRecordId(warehouseInOutInfo.getId());
+                        stockSaleReceiptReport.setContractNo(contractManagementInfo.getContractNo());
+                        stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
+                        stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
+                        stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
+                        stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
+                        stockSaleReceiptReport.setNetWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                        stockSaleReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                        stockSaleReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(warehouseInOutInfo.getCost())));
+                        stockSaleReceiptReport.setAmountEdReceivable(0.0d);
+                        stockSaleReceiptReport.setDeliveryDate(warehouseInOutInfo.getInOutDate());
+                        stockSaleReceiptReport.setAmountIngReceivable(stockSaleReceiptReport.getSettlementPrice() * warehouseInOutInfo.getNetWeight());
+                        stockSaleReceiptReport.setAmountNotReceivable(stockSaleReceiptReport.getAmountIngReceivable());
+                        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());
+                        }
                         ContractManagementInfo contractManagementInfo1 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("contract_no", contractManagementInfo.getContractNo()).eq("delete_flag", "0"));
                         if (contractManagementInfo1 == null) {
                             throw new YException(YExceptionEnum.CONTRACT_NO_NOT_EXSITS_ERROR);
                         }
-                        //现货销售出库报表
-//                        StockSaleReceiptReport stockSaleReceiptReport = new StockSaleReceiptReport();
-//                        stockSaleReceiptReport.setId(IdGenerator.generateUUID());
-//                        stockSaleReceiptReport.setCompId(warehouseBaseInfo.getCompId());
-//                        stockSaleReceiptReport.setContractNo(warehouseInOutInfo.getContractNo());
-//                        stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
-//                        stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
-//                        stockSaleReceiptReport.setGrossWeight(warehouseInOutInfo.getGrossWeight());
-//                        stockSaleReceiptReport.setTare(warehouseInOutInfo.getTare());
-//                        stockSaleReceiptReport.setNetWeight(warehouseInOutInfo.getNetWeight());
-//                        stockSaleReceiptReport.setDeliveryDate(warehouseInOutInfo.getInOutDate());
-//                        stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
-//
-//                        stockSaleReceiptReport.setAmountIngReceivable(warehouseInOutInfo.getNetWeight() *
-//                                (Float.valueOf(String.valueOf(contractManagementInfo1.getUnitContractPrice()))));
-//                        stockSaleReceiptReport.setAmountEdReceivable(0.0f);
-//                        stockSaleReceiptReport.setAmountNotReceivable(stockSaleReceiptReport.getAmountIngReceivable());
-//                        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 wrapper = new EntityWrapper<TranCarInfo>()
                                 .eq("contract_no", warehouseInOutInfo.getContractNo())
                                 .eq("car_no", warehouseInOutInfo.getCarNo())
@@ -3846,6 +3845,48 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 workflowService.activateInstance(stockPurchaseReceiptReport.getWorkflowId(), stockPurchaseReceiptReport.getId());
                             }
                         }
+                        //现货销售出库报表
+                        StockSaleReceiptReport stockSaleReceiptReport = new StockSaleReceiptReport();
+                        stockSaleReceiptReport.setId(IdGenerator.generateUUID());
+                        stockSaleReceiptReport.setCompId(warehouseBaseInfo.getCompId());
+                        stockSaleReceiptReport.setWarehouseRecordId(warehouseInOutInfo.getId());
+                        stockSaleReceiptReport.setContractNo(contractManagementInfo.getContractNo());
+                        stockSaleReceiptReport.setWarehouseName(warehouseInOutInfo.getWarehouseName());
+                        stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
+                        stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
+                        stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
+                        stockSaleReceiptReport.setNetWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                        stockSaleReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                        stockSaleReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(warehouseInOutInfo.getCost())));
+                        stockSaleReceiptReport.setAmountEdReceivable(0.0d);
+                        stockSaleReceiptReport.setDeliveryDate(warehouseInOutInfo.getInOutDate());
+                        stockSaleReceiptReport.setAmountIngReceivable(stockSaleReceiptReport.getSettlementPrice() * warehouseInOutInfo.getNetWeight());
+                        stockSaleReceiptReport.setAmountNotReceivable(stockSaleReceiptReport.getAmountIngReceivable());
+                        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());
+                        }
                         ContractManagementInfo contractManagementInfo1 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("contract_no", contractManagementInfo.getContractNo()).eq("delete_flag", "0"));
                         if (contractManagementInfo1 == null) {