fix:给orderbase订单添加(捆绑)invoice和生产科对账单号增加注释,

chenhang4442024
1 parent 1691c6bf
Showing 8 changed files with 97 additions and 63 deletions
src/main/java/com/order/erp/domain/dto/order/OrderBaseInfoDO.java
src/main/java/com/order/erp/domain/vo/order/BusinessProfitRatioResultVO.java
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoQueryVO.java
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoVO.java
src/main/java/com/order/erp/service/order/impl/CalculateProfitServiceImpl.java
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
src/main/java/com/order/erp/service/order/impl/ProducePaymentCheckBillOrderServiceImpl.java
@@ -120,4 +120,14 @@ public class OrderBaseInfoDO extends BaseDO implements Serializable {
      * 是否返单
      */
     private String returnOrder;
+
+    /**
+     * invoice号
+     */
+    private String invoiceNo;
+    /**
+     * 生产科对账单号
+     */
+    private String checkNo;
+
 }
@@ -165,7 +165,7 @@ public class BusinessProfitRatioResultVO implements Serializable {
     private BigDecimal customerTotalPriceUsd;
     /**
-     * 生成科总价$
+     * 生产科总价$
      */
     private BigDecimal  productionDepartmentTotalPriceUsd;
     /**
@@ -188,5 +188,14 @@ public class OrderBaseInfoQueryVO extends BasePageVO implements Serializable {
     private List<Long> exportOrderIds;
+    /**
+     * invoice   首页筛选invoice。
+     */
+    private List<String> invoiceNo;
+
+    /**
+     * checkNo   首页筛选Check。
+     */
+    private List<String> CheckNo;
 }
@@ -25,6 +25,11 @@ public class OrderBaseInfoVO implements Serializable {
      * 发票单号
      */
     private String invoiceNo;
+
+    /**
+     * 生产科对账单号  如果要在首页添加生产科对账单号列数,就需要在这里加上。
+     */
+    private String checkNo;
     /**
      * 客户编码
      */
@@ -67,8 +67,6 @@ public class CalculateProfitServiceImpl {
      */
     public ServerResult businessProfitRatioExport(HttpServletResponse response, BusinessProfitRatioQueryVO queryVO) throws IOException {
         BusinessProfitRatioResultVO resultVO = buildBusinessProfitRatioResultVO(queryVO);
-//        File file = pdfUtils.createBusinessProfitResultPdf(resultVO, "business_profit_ratio.pdf");
-//        FileUtil.downloadFile(request, response, file, true);
         //开始
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("业务净利润分析表");
@@ -205,10 +203,6 @@ public class CalculateProfitServiceImpl {
      */
     public ServerResult innerProfitRatioExport(HttpServletResponse response,InnerProfitRatioQueryVO queryVO) throws IOException {
         InnerProfitRatioResultVO resultVO = buildInnerProfitRatioResultVO(queryVO);
-//        File file = pdfUtils.createInnerProfitResultPdf(resultVO, "inner_profit_ratio.pdf");
-//        FileUtil.downloadFile(request, response, file, true);
-////开始
-//结束
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("内部生产净利润分析表");
         Row row = sheet.createRow(0);
@@ -392,7 +386,7 @@ public class CalculateProfitServiceImpl {
             customerRmbTotalPrice = customerRmbTotalPrice.add(new BigDecimal(profitAnalysisDO.getCustomerRmbTotalPrice()));
             customerTotalPrice=customerTotalPrice.add(new BigDecimal(profitAnalysisDO.getCustomerTotalPrice()));
             productionDepartmentTotalPrice = productionDepartmentTotalPrice.add(new BigDecimal(profitAnalysisDO.getProductionDepartmentTotalPrice()));
-            //这里的包装费用好像为美元。需要采用人民币。
+            //这里得到的包装费用好像为美元。需要采用人民币。所以乘上汇率。
             packetTotalPrice = packetTotalPrice.add(new BigDecimal(profitAnalysisDO.getPacketTotalPrice()).multiply(exchangeRate));
         }
@@ -433,39 +427,45 @@ public class CalculateProfitServiceImpl {
         BigDecimal totalProfitPrice = developProfit.add(actualRatioProfitPrice).add(packetProfitPrice);
         BusinessProfitRatioResultVO resultVO = new BusinessProfitRatioResultVO();
         BeanUtils.copyProperties(queryVO, resultVO);
-        //5
+        //5 客户总金额
         resultVO.setCustomerTotalPrice(customerRmbTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
-        //6
+        //6  生产科总价
         resultVO.setProductionDepartmentTotalPrice(productionDepartmentTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
 //        resultVO.setPacketTotalPrice(packetTotalPrice.multiply(new BigDecimal(10 )).doubleValue());
-        //7
+        //7  包装费用合计金额
         resultVO.setPacketTotalPrice(packetTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+        // 14 包装费用合计    与包装费用合计金额都是一个值。
         resultVO.setPacketTotalPriceCount(packetTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
-        //9  如果没有配置固定成本,就会得到0。
+        //9  如果没有配置固定成本,就会得到0。     固定成本计算￥:开发持续时间*日固定成本（日固定成本需要从系统配置读取）
         resultVO.setFixCost(fixCost.setScale(2, BigDecimal.ROUND_HALF_UP));
-        //10.1
+        //10.1  西班牙团队提成比例:订单总金额*配置比例。
         resultVO.setSpainRatioProfitPrice(spainRatioProfitPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
-        //10.2
+        //10.2  中国团队提成比例:订单总金额*配置比例。
         resultVO.setChinaRatioProfitPrice(chinaRatioProfitPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
-        //11
+        //11  支出合计计算￥：生产科总金额+包装费用总金额+研发开发费+复制费用+固定成本+西班牙提成+中国团队提成
         resultVO.setOutTotalPrice(outTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
-        //13
+        //13  研发贸易净利润￥: 客户金额合计-支出合计（正数黑色字体、负数红色字体并加上-号）
         resultVO.setDevelopProfit(developProfit.setScale(2, BigDecimal.ROUND_HALF_UP));
-        //18
+        //18   包装费用收益计算￥：包装费用合计金额-包装费用实际金额
         resultVO.setPacketProfitPrice(packetProfitPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
-        //19
+        //19  汇率收益计算：实际汇率（财务手动输入）-固定汇率（取系统汇率）*客户金额合计（基础信息汇总）
         resultVO.setActualRatioProfitPrice(actualRatioProfitPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
-        //20
+        //20  综合收益计算￥: 贸易研发净利润+包装费用收益+汇率收益。
         resultVO.setTotalProfitPrice(totalProfitPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
-        // 16
+        // 16  实际跟单单价:包装费用实际金额除订单数量。
         resultVO.setActualRmbPrice(queryVO.getPacketActualTotalPrice().divide(new BigDecimal(sumCount), 2, BigDecimal.ROUND_HALF_UP));
+        // 17 实际跟单单价折算美金：实际跟单单价/汇率（6.2）
         resultVO.setActualPrice((resultVO.getActualRmbPrice().divide(exchangeRate,2, BigDecimal.ROUND_HALF_UP)));
         resultVO.setOrderCount(sumCount);
-        //12
+        //12 毛利润计算:客户总价-生产科总价-包装费用总价。
         resultVO.setGrossProfit(customerRmbTotalPrice.subtract(productionDepartmentTotalPrice).subtract(packetTotalPrice).setScale(2, BigDecimal.ROUND_HALF_UP));
+        // 项目号
         resultVO.setProjectNo(String.join(",",projectList));
+        // 包装费用合计(美元)
         resultVO.setPacketTotalPriceUsd(packetTotalPrice.divide(exchangeRate, 2, RoundingMode.HALF_UP));
+        // 客户总金额(美元)
         resultVO.setCustomerTotalPriceUsd(customerTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+        //生产科总金额合计(美元)
         resultVO.setProductionDepartmentTotalPriceUsd(productionDepartmentTotalPrice.divide(exchangeRate, 2, RoundingMode.HALF_UP));
         return resultVO;
     }
@@ -567,7 +567,7 @@ public class CalculateProfitServiceImpl {
                       .divide(queryVO.getProductionDepartmentPredictPrice(),4,BigDecimal.ROUND_HALF_UP);
           }
         }
-        //如果大于1.05则就把内部生产提成变为0
+        //需求要求:如果计算出来的预算占比大于1.05则就把内部生产提成变为0
         if(predictRatio.compareTo(bigDecimal)>0){
             innerProduceTotalPrice=BigDecimal.ZERO;
         }
@@ -579,22 +579,25 @@ public class CalculateProfitServiceImpl {
         InnerProfitRatioResultVO resultVO = new InnerProfitRatioResultVO();
         BeanUtils.copyProperties(queryVO, resultVO);
+        //生产持续时间。
         resultVO.setProjectDays(projectDays);
+        //数量。
         resultVO.setOrderCount(sumCount);
+        //客户总价。
         resultVO.setCustomerTotalPrice(customerTotalPrice.setScale(2, RoundingMode.HALF_UP).doubleValue());
-        // 5
+        // 5  生产科总价合计
         resultVO.setProductionDepartmentTotalPrice(productionDepartmentTotalPrice.setScale(2, RoundingMode.HALF_UP));
-        // 9
+        // 9  内部生产固定成本:生产持续时间*固定陈本(配置)
         resultVO.setInnerProduceFixProfit(innerProduceFixProfit.setScale(2, RoundingMode.HALF_UP));
-        // 7.1
+        // 7.1预算占比计算:实际发生费用/生产科预算金额。
         resultVO.setPredictRatio(predictRatio.multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP));
-        // 将计算结果乘以 100，并四舍五入到整数
+        // 将计算结果乘以 100，并四舍五入到整数   预算占比与实际占比差:1-预算占比。
         resultVO.setPredictAndActualRatio(predictAndActualRatio.multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP));
-        // 8
+        // 8 内部生产毛利润计算:生产科总价减去实际发生费用。
         resultVO.setGrossProfit(grossProfit.setScale(2, RoundingMode.HALF_UP));
-        // 10
+        // 10 内部生产提成计算:订单数量*生产提成单价
         resultVO.setInnerProduceTotalPrice(innerProduceTotalPrice.setScale(2, RoundingMode.HALF_UP));
-        // 11
+        // 11 内部生产净利润计算:生产科总价-实际发生费用-内部生产提成计算-内部生产固定成本。
         resultVO.setInnerProduceTotalProfit(innerProduceTotalProfit.setScale(2, RoundingMode.HALF_UP));
         //项目号
         resultVO.setProjectNo(String.join(", ", projectNoSet));
@@ -573,13 +573,18 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
             createVO.setId(null);
         }
-        validaBillOrder(createVO);
+        List<OrderBaseInfoDO> orderBaseInfoDOList = validaBillOrder(createVO);
         InvoiceBillOrderDO invoiceBillOrderDO = buildInvoiceBillOrderDO(createVO);
-       boolean success= transactionHelper.run(() -> {
-            save(invoiceBillOrderDO);
+        List<OrderBaseInfoDO> containInvoiceOrderBaseInfoList=orderBaseInfoDOList.stream().map(x->{
+            x.setInvoiceNo(createVO.getInvoiceNo());
+            return  x;
+        }).collect(Collectors.toList());
+        boolean success= transactionHelper.run(() -> {
+            save(invoiceBillOrderDO);
+            orderBaseInfoService.updateBatchById(containInvoiceOrderBaseInfoList);
             invoiceBillMappingService.saveBatch(buildInvoiceBillMappingDOS(createVO, invoiceBillOrderDO));
             return true;
         });
@@ -729,7 +734,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
     /**
      * @param createVO
      */
-    private void validaBillOrder(InvoiceBillCreateVO createVO) {
+    private List<OrderBaseInfoDO> validaBillOrder(InvoiceBillCreateVO createVO) {
         if (CollectionUtils.isEmpty(createVO.getOrderIds())) {
             throw new BusinessException("请勾选订单！");
         }
@@ -781,6 +786,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         if (CollectionUtils.isNotEmpty(invoiceBillMappingDOList)) {
             throw new BusinessException("该勾选的订单已经绑定其他账单了！");
         }
+        return orderBaseInfoDOList;
     }
     /**
@@ -951,6 +957,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      */
     @Override
     public ServerResult deleteById(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
+        //其实是不能批量删除的,前端是一个一个删除按钮点击的,但是这里还是使用数组接受的。这里是传的一个id。
         List<Long> ids = invoiceBillOrderQueryVO.getIds();
         if (CollUtil.isEmpty(ids)) {
             return ServerResult.fail("ids 参数不能为空");
@@ -441,36 +441,31 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 queryWrapper.eq(Objects.nonNull(queryVO.getType()), OrderFieldLockApplyDO::getType, queryVO.getType());
             }
         }
-  /*      //只针对于应收款的过滤信息。这两个搜索框只会在应收款和应付款中进行展示。 还没有测试行不行。
-        if (StringUtils.isNotBlank(queryVO.getInvoiceNo())) {
-            String invoiceNos = queryVO.getInvoiceNo();
-            // 防止空值或分割后的数组为空
-            if (invoiceNos != null && !invoiceNos.trim().isEmpty()) {
-                String[] invoiceNoArray = invoiceNos.split(",");
-                // 确保数组不为空并过滤空白元素
-                String condition = Arrays.stream(invoiceNoArray)
-                        .filter(StringUtils::isNotBlank) // 过滤掉空白字符串
-                        .map(val -> "'" + val.trim() + "'") // 去掉多余空格并加单引号
-                        .collect(Collectors.joining(","));
-                if (!condition.isEmpty()) { // 防止最终拼接的条件为空
-                    queryWrapper.apply("JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceNo')) IN (" + condition + ")");
-                }
+        // 已测试,没问题。用途:在应收款和应付款中,通过输入invoiceNo和checkNo进行筛选查询。  变量名为invoice和checkNo。
+ /*       if (StringUtils.isNotBlank(queryVO.getInvoiceNo())) {
+            // 获取并修整 invoiceNo 字符串
+            String invoiceNos = queryVO.getInvoiceNo().trim();
+            // 检查处理后的字符串是否仍然有效
+            if (!invoiceNos.isEmpty()) {
+                // 使用参数化查询避免 SQL 拼接问题
+                queryWrapper.apply(
+                        "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceBillOrderDO.invoiceNo')) = {0}",
+                        invoiceNos
+                );
             }
         }
-//只针对于应付款的过滤信息。
+
+//只针对于应付款的过滤信息。  前端要设置搜索框的变量为checkNo。
         if (StringUtils.isNotBlank(queryVO.getCheckNo())) {
-            String checkNos = queryVO.getCheckNo();
-            // 防止空值或分割后的数组为空
-            if (checkNos != null && !checkNos.trim().isEmpty()) {
-                String[] checkNoArray = checkNos.split(",");
-                // 确保数组不为空并过滤空白元素
-                String condition = Arrays.stream(checkNoArray)
-                        .filter(StringUtils::isNotBlank) // 过滤掉空白字符串
-                        .map(val -> "'" + val.trim() + "'") // 去掉多余空格并加单引号
-                        .collect(Collectors.joining(","));
-                if (!condition.isEmpty()) { // 防止最终拼接的条件为空
-                    queryWrapper.apply("JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceNo')) IN (" + condition + ")");
-                }
+            // 获取并修整 checkNo字符串
+            String checkNos = queryVO.getCheckNo().trim();
+            // 检查处理后的字符串是否仍然有效
+            if (!checkNos.isEmpty()) {
+                // 使用参数化查询避免 SQL 拼接问题
+                queryWrapper.apply(
+                        "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.checkBillOrderDO.checkNo')) = {0}",
+                        checkNos
+                );
             }
         }*/
         //由于不懂下面的代码,所以我只对我需要的需求进行判断,我只针对我需要的这种情况,其他情况下就不走这种情况。
@@ -533,13 +533,17 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         if (Objects.nonNull(createVO.getId())) {
             createVO.setId(null);
         }
-        validaBillOrder(createVO);
+        List<OrderBaseInfoDO> orderBaseInfoDOList = validaBillOrder(createVO);
         ProducePaymentCheckBillOrderDO checkBillOrderDO = buildCheckBillOrderDO(createVO);
+        List<OrderBaseInfoDO> containCheckOrderBaseInfoList = orderBaseInfoDOList.stream().map(x -> {
+            x.setCheckNo(createVO.getCheckNo());
+            return x;
+        }).collect(Collectors.toList());
         Boolean success = transactionHelper.run(() -> {
             save(checkBillOrderDO);
-
+            orderBaseInfoService.updateBatchById(containCheckOrderBaseInfoList);
             checkBillMappingService.saveBatch(buildCheckBillMappingDOS(createVO, checkBillOrderDO));
             return true;
         });
@@ -693,7 +697,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
     /**
      * @param createVO
      */
-    private void validaBillOrder(ProducePaymentCheckBillCreateVO createVO) {
+    private List<OrderBaseInfoDO> validaBillOrder(ProducePaymentCheckBillCreateVO createVO) {
         if (CollectionUtils.isEmpty(createVO.getOrderIds())) {
             throw new BusinessException("请勾选订单！");
         }
@@ -753,6 +757,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
                 throw  new BusinessException("勾选订单的生产科不一致!");
             }
         }
+        return orderBaseInfoDOList;
     }
     /**