添加财务模块,main分支为完整的未添加财务模块之前的线上正常代码

chenhang4442024
1 parent 25b987be
Showing 82 changed files with 7273 additions and 32 deletions
src/main/java/com/order/erp/common/constant/Constant.java
src/main/java/com/order/erp/common/utils/EasyPdfUtils.java
src/main/java/com/order/erp/common/utils/EmailSendUtils.java
src/main/java/com/order/erp/common/utils/OrderFieldUtils.java
src/main/java/com/order/erp/common/utils/RedisUtils.java
src/main/java/com/order/erp/controller/CalculateProfitController.java
src/main/java/com/order/erp/controller/InvoiceBillOrderController.java
src/main/java/com/order/erp/controller/ProducePaymentCheckBillOrderController.java
src/main/java/com/order/erp/domain/ApplyStatusEnum.java
src/main/java/com/order/erp/domain/ApplyTypeEnum.java
src/main/java/com/order/erp/domain/FinanceOverEnum.java
src/main/java/com/order/erp/domain/RoleEnum.java
src/main/java/com/order/erp/domain/dto/order/CheckBillMappingDO.java
src/main/java/com/order/erp/domain/dto/order/InvoiceBillMappingDO.java
src/main/java/com/order/erp/domain/dto/order/InvoiceBillOrderDO.java
src/main/java/com/order/erp/domain/dto/order/OrderFieldLockApplyDO.java
src/main/java/com/order/erp/domain/dto/order/OrderProfitAnalysisDO.java
src/main/java/com/order/erp/domain/dto/order/ProducePaymentCheckBillOrderDO.java
src/main/java/com/order/erp/domain/vo/CostSettingItemVO.java
src/main/java/com/order/erp/domain/vo/SystemSettingResultVO.java
@@ -185,6 +185,8 @@ public class Constant {
     public static final String DELETE_SUCCESS_RESULT_CHARACTER = "删除成功";
+    public static final String REDISKEY = "REDISKEY";
+
     /**
      * token rediskey
@@ -335,4 +337,6 @@ public class Constant {
      */
     public static final  long  REDIS_EMAIL_TIME = 90;
+    public static final String FINANCE_EVENT_TIME = "请自行去系统中查询！";
+
 }
@@ -63,7 +63,8 @@ public class EasyPdfUtils {
     public List<OrderProducePdfVO> build(List<Long> ids) {
         List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(new LambdaQueryWrapper<OrderBaseInfoDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .in(OrderBaseInfoDO::getId, ids));
+                .in(OrderBaseInfoDO::getId, ids)
+                .orderByAsc(OrderBaseInfoDO::getInnerNo));
         Set<String> productionDepartments = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getProductionDepartment).filter(Objects::nonNull)
                 .filter(department -> !department.trim().isEmpty()).collect(Collectors.toSet());
         if (productionDepartments.size() > 1) {
@@ -79,7 +80,7 @@ public class EasyPdfUtils {
         List<String> personList= new ArrayList<>(setPerson);
         Set<Long> orderIds = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toSet());
         List<OrderProfitAnalysisDO> profitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>().in(OrderProfitAnalysisDO::getOrderId, orderIds));
-        Map<Long, OrderProfitAnalysisDO> profitAnalysisDOMap = profitAnalysisDOS.stream().collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity()));
+        Map<Long, OrderProfitAnalysisDO> profitAnalysisDOMap = profitAnalysisDOS.stream().collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity(),(x,y)->x));
         return orderBaseInfoDOList.stream().map(x -> {
             OrderProducePdfVO producePdfVO = new OrderProducePdfVO();
             BeanUtils.copyProperties(x, producePdfVO);
 package com.order.erp.common.utils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.domain.EmailTemplateEnum;
+import com.order.erp.domain.FinanceOverEnum;
+import com.order.erp.domain.vo.order.FinanceEventJobVO;
 import com.order.erp.domain.vo.order.OrderEventJobVO;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
@@ -107,4 +110,41 @@ public class EmailSendUtils {
         }
         javaMailSender.send(mimeMessage);
     }
+
+
+    /**
+     * @Description:    发送财务应收款,应付款过期时间的单据
+     * @param emailTemplateEnum  应收款,应付款邮件事件类型
+     * @param receiveemailList   收件人邮箱
+     * @param    orderEventJobVO 应收款,应付款订单。
+     * @throws IOException
+     */
+
+    public  void sendEmail(FinanceOverEnum emailTemplateEnum, List<String> receiveemailList, FinanceEventJobVO orderEventJobVO)  {
+        if(CollectionUtils.isEmpty(receiveemailList) && emailTemplateEnum ==null && ObjectUtils.isNull(orderEventJobVO)){
+            throw new BusinessException(ServerResultCode.PARAM_ERROR);
+        }
+        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
+        MimeMessageHelper helper= null;
+        //设置收件人
+        String[] receiveemailListArray = receiveemailList.toArray(new String[receiveemailList.size()]);
+        try {
+            helper = new MimeMessageHelper(mimeMessage);
+            //设置邮件的主题
+            helper.setSubject(emailTemplateEnum.getTitle());
+            //设置发件人
+            helper.setFrom(sendEmail);
+            helper.setTo(receiveemailListArray);
+            helper.setSentDate(new Date());
+            if(FinanceOverEnum.INVOICE_OVERTIME==emailTemplateEnum){
+                helper.setText(emailTemplateEnum.getDesc()+orderEventJobVO.getInvoiceBillOrderDO().getInvoiceNo()+"  "+ Constant.FINANCE_EVENT_TIME);
+            }else if(FinanceOverEnum.PRODUCE_PAYMENT_CHECK_OVERTIME==emailTemplateEnum){
+                helper.setText(emailTemplateEnum.getDesc()+orderEventJobVO.getProducePaymentCheckBillOrderDO().getCheckNo()+"  "+Constant.FINANCE_EVENT_TIME);
+            }
+        } catch ( MessagingException e) {
+            throw new RuntimeException("邮件发送失败！", e);
+        }
+        javaMailSender.send(mimeMessage);
+    }
+
 }
 \ No newline at end of file
@@ -38,9 +38,9 @@ public class OrderFieldUtils {
      * @param orderId
      * @return
      */
-    public static OrderFieldLockApplyDO generatorBaseInfoFieldLockApplyDO(OrderBaseFieldVO baseFields, Long userId, Long orderId) {
+    public static OrderFieldLockApplyDO generatorBaseInfoFieldLockApplyDO(OrderUnlockFieldApplyVO fieldVO, Long userId, Long orderId) {
         OrderLockFieldVO lockFieldVO = new OrderLockFieldVO();
-        lockFieldVO.setBaseFields(baseFields);
+        lockFieldVO.setBaseFields(fieldVO.getBaseFields());
         OrderFieldLockApplyDO applyDO = OrderFieldLockApplyDO.builder()
                 .applyUserId(userId)
                 .auditUserId(null)
@@ -49,12 +49,14 @@ public class OrderFieldUtils {
                 .remark(ApplyTypeEnum.FIELD_EDIT_APPLY.getDesc())
                 .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
                 .build();
-        if (Objects.nonNull(baseFields) && checkOrderBaseField4apply(baseFields)) {
+        if (Objects.nonNull(fieldVO.getBaseFields()) && checkOrderBaseField4apply(fieldVO.getBaseFields())) {
             lockFieldVO.setInspectionStageFields(initInspectionStageField(OrderLockFieldEnum.LOCKED));
             lockFieldVO.setProfitAnalysisFields(initProfitAnalysisField(OrderLockFieldEnum.LOCKED));
             lockFieldVO.setReportFields(initReportField(OrderLockFieldEnum.LOCKED));
             lockFieldVO.setTrackStageFields(initTrackStageField(OrderLockFieldEnum.LOCKED));
             applyDO.setFields(JSONObject.toJSONString(lockFieldVO));
+            //在这里增加字段的描述。   applyDO.setXxxx("xxxx原因。");
+            applyDO.setApplyRemark(fieldVO.getApplyRemark());
             applyDO.setAuditRoleCodes(RoleEnum.BUSINESS_USER.getCode() + Constant.COMMA_CHARACTER + RoleEnum.ADMIN.getCode());
             return applyDO;
         } else {
@@ -97,7 +99,7 @@ public class OrderFieldUtils {
      */
     public static List<OrderFieldLockApplyDO> initOrderFieldLockApplyDOS(OrderUnlockFieldApplyVO fieldVO, Long userId) {
         List<OrderFieldLockApplyDO> resultList = new ArrayList<>();
-        OrderFieldLockApplyDO baseLockApply = generatorBaseInfoFieldLockApplyDO(fieldVO.getBaseFields(), userId, fieldVO.getOrderId());
+        OrderFieldLockApplyDO baseLockApply = generatorBaseInfoFieldLockApplyDO(fieldVO, userId, fieldVO.getOrderId());
         if (Objects.nonNull(baseLockApply)) {
             resultList.add(baseLockApply);
         }
@@ -167,11 +167,17 @@ public class RedisUtils {
      * @param keys
      * @return
      */
-    public List<Object> multiGet(List<String> keys) {
-        Object obj = redisTemplate.opsForValue().multiGet(Collections.singleton(keys));
-        return null;
+    public List<Object> multiGet(List<Object> keys) {
+        try {
+            List<Object> values = redisTemplate.opsForValue().multiGet(keys);
+            return values != null ? values : Collections.emptyList();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Collections.emptyList();
+        }
     }
+
     /**
      * 普通缓存放入
      *
@@ -643,4 +649,41 @@ public class RedisUtils {
             return 0;
         }
     }
+    /**
+     * set方式设置值
+     *
+     * @param key   键
+     * @param count 移除多少个
+     * @param value 值
+     * @return 移除的个数
+     */
+    public boolean saddWithExpiry(String key, Object value, long time, TimeUnit timeUnit) {
+        try {
+            redisTemplate.opsForSet().add(key, value);
+            if (time > 0) {
+                redisTemplate.expire(key, time, timeUnit);
+            }
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+    /**
+     * set方式获取多个值
+     *
+     * @param key   键
+     * @param count 移除多少个
+     * @param value 值
+     * @return 移除的个数
+     */
+    public Set<Object> getSetValues(String key) {
+        try {
+            return redisTemplate.opsForSet().members(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
 }
+package com.order.erp.controller;
+
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.vo.order.BusinessProfitRatioQueryVO;
+import com.order.erp.domain.vo.order.InnerProfitRatioQueryVO;
+import com.order.erp.service.order.impl.CalculateProfitServiceImpl;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)表控制层
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@RestController
+@RequestMapping("/order/erp/calculate_profit")
+public class CalculateProfitController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private CalculateProfitServiceImpl calculateProfitService;
+
+    /**
+     * 业务/研发净利润分析
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/business_profit_ratio")
+    public ServerResult businessProfitRatio(@RequestBody @Validated BusinessProfitRatioQueryVO queryVO) {
+        return calculateProfitService.businessProfitRatio(queryVO);
+    }
+
+    /**
+     * 业务/研发净利润分析-导出
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/business_profit_ratio_export")
+    public void businessProfitRatioExport(HttpServletResponse response, @RequestBody @Validated BusinessProfitRatioQueryVO queryVO) throws IOException {
+        calculateProfitService.businessProfitRatioExport(response, queryVO);
+    }
+
+    /**
+     * 内部生产净利润分析表
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/inner_profit_ratio")
+    public ServerResult innerProfitRatio(@RequestBody @Validated InnerProfitRatioQueryVO queryVO) {
+        return calculateProfitService.innerProfitRatio(queryVO);
+    }
+
+    /**
+     * 内部生产净利润分析表-导出
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/inner_profit_ratio_export")
+    public void innerProfitRatioExport(HttpServletResponse response,@RequestBody @Validated InnerProfitRatioQueryVO queryVO) throws IOException {
+        calculateProfitService.innerProfitRatioExport(response,queryVO);
+    }
+}
+
+package com.order.erp.controller;
+
+import com.order.erp.common.annotation.AnonymousAccess;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.excel4j.exceptions.Excel4JException;
+import com.order.erp.common.jsr303.OperateGroup;
+import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
+import com.order.erp.domain.vo.order.*;
+import com.order.erp.service.order.InvoiceBillOrderService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)表控制层
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@RestController
+@RequestMapping("/order/erp/invoice_bill")
+public class InvoiceBillOrderController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private InvoiceBillOrderService invoiceBillOrderService;
+
+    /**
+     * 分页查询
+     *
+     * @param invoiceBillOrderQueryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/list_by_page")
+    public ServerResult listByPage(@RequestBody @Validated({OperateGroup.List.class}) InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
+        return invoiceBillOrderService.listByPage(invoiceBillOrderQueryVO);
+    }
+
+    /**
+     * 基础订单查询
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/list_base_order_info_by")
+    public ServerResult listBaseOrderInfoBy(@RequestBody @Validated InvoiceBaseOrderQueryVO queryVO) {
+        return invoiceBillOrderService.listBaseOrderInfoBy(queryVO);
+    }
+
+    /**
+     * 分析列表
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/list_analysis_by")
+    public ServerResult listAnalysisBy(@RequestBody @Validated({OperateGroup.List.class}) InvoiceBillAnalysisVO queryVO) {
+        return invoiceBillOrderService.listAnalysisBy(queryVO);
+    }
+
+    /**
+     * 导出分析列表
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping(value = "/export")
+    @ApiOperation("导出分析列表")
+    @AnonymousAccess
+    public void export(HttpServletResponse response, @RequestBody @Validated InvoiceBillAnalysisVO queryVO) throws IOException, Excel4JException {
+        invoiceBillOrderService.export(response, queryVO);
+    }
+
+    /**
+     * 创建invoice单据
+     *
+     * @param createVO 数据VO
+     * @return 新增结果
+     */
+    @PostMapping("/create")
+    public ServerResult create(@RequestBody InvoiceBillCreateVO createVO) {
+        return invoiceBillOrderService.create(createVO);
+    }
+
+    /**
+     * 获取必须回款日期
+     *
+     * @param createVO 数据VO
+     * @return 新增结果
+     */
+    @PostMapping("/get_back_refund_date")
+    public ServerResult getBackRefundDate(@RequestBody InvoiceBillCreateVO createVO) {
+        return invoiceBillOrderService.getBackRefundDate(createVO);
+    }
+
+    /**
+     * 更新扣款信息
+     *
+     * @param deductInfoVO 数据VO
+     * @return 编辑结果
+     */
+    @PostMapping("/update_deduct_info")
+    public ServerResult updateDeductInfo(@RequestBody InvoiceBillDeductInfoVO deductInfoVO) {
+        return invoiceBillOrderService.updateDeductInfo(deductInfoVO);
+    }
+
+    /**
+     * 更新其他金额信息
+     *
+     * @param amountInfoVO 数据VO
+     * @return 编辑结果
+     */
+    @PostMapping("/update_amount_info")
+    public ServerResult updateAmountInfo(@RequestBody InvoiceBillAmountInfoVO amountInfoVO) {
+        return invoiceBillOrderService.updateAmountInfo(amountInfoVO);
+    }
+
+    /**
+     * 提交审核
+     *
+     * @param commitApplyVO 数据VO
+     * @return 编辑结果
+     */
+    @PostMapping("/commit_apply")
+    public ServerResult commitApply(@RequestBody InvoiceBillCommitApplyVO commitApplyVO) {
+        return invoiceBillOrderService.commitApply(commitApplyVO);
+    }
+
+    /**
+     * 删除数据
+     *
+     * @param invoiceBillOrderQueryVO 查询条件
+     * @return 删除是否成功
+     */
+    @PostMapping("/delete_by_id")
+    public ServerResult deleteById(@RequestBody InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
+        return invoiceBillOrderService.deleteById(invoiceBillOrderQueryVO);
+    }
+    /**
+     * 获取扣款单
+     *
+     * @param invoiceBillOrderQueryVO 查询条件
+     * @return 扣款单
+     */
+    @PostMapping("/getDeductUrl_by_id")
+    public ServerResult getDeductUrl(@RequestBody InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
+        return invoiceBillOrderService.getDeductUrlById(invoiceBillOrderQueryVO);
+    }
+    /**
+     * 重新上传报关单
+     *
+     * @param bgUrl 报关单
+     * @return 
+     */
+    @PostMapping("/reUploadBgUrl")
+    public ServerResult getDeductUrl(@RequestBody InvoiceBillCreateVO bgUrl) {
+        return invoiceBillOrderService.reUploadBgurl(bgUrl);
+    }
+
+    /**
+     * 审核时导出的付款单
+     * @param queryVO 报关单
+     * @return
+     */
+    @PostMapping("/exportReceipt")
+    @AnonymousAccess
+    public void exportReceipt(HttpServletResponse response, @RequestBody InvoiceBillOrderDO queryVO) throws IOException {
+        invoiceBillOrderService.exportReceipt(response,queryVO);
+    }
+
+}
+
+package com.order.erp.controller;
+
+import com.order.erp.common.annotation.AnonymousAccess;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.excel4j.exceptions.Excel4JException;
+import com.order.erp.common.jsr303.OperateGroup;
+import com.order.erp.domain.dto.order.ProducePaymentCheckBillOrderDO;
+import com.order.erp.domain.vo.order.*;
+import com.order.erp.service.order.ProducePaymentCheckBillOrderService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)表控制
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@RestController
+@RequestMapping("/order/erp/check_bill/")
+public class ProducePaymentCheckBillOrderController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private ProducePaymentCheckBillOrderService producePaymentCheckBillOrderService;
+
+    /**
+     * 分页查询
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/list_by_page")
+    public ServerResult listByPage(@RequestBody @Validated({OperateGroup.List.class}) ProducePaymentCheckBillOrderQueryVO queryVO) {
+        return producePaymentCheckBillOrderService.listByPage(queryVO);
+    }
+
+    /**
+     * 基础订单查询
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/list_base_order_info_by")
+    public ServerResult listBaseOrderInfoBy(@RequestBody @Validated ProducePaymentBaseOrderQueryVO queryVO) {
+        return producePaymentCheckBillOrderService.listBaseOrderInfoBy(queryVO);
+    }
+
+    /**
+     * 分析列表
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/list_analysis_by")
+    public ServerResult listAnalysisBy(@RequestBody @Validated({OperateGroup.List.class}) ProducePaymentCheckBillOrderQueryVO queryVO) {
+        return producePaymentCheckBillOrderService.listAnalysisBy(queryVO);
+    }
+
+    /**
+     * 导出分析列表
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping(value = "/export")
+    @ApiOperation("导出分析列表")
+    @AnonymousAccess
+    public void export(HttpServletResponse response, @RequestBody @Validated ProducePaymentCheckBillOrderQueryVO queryVO) throws IOException, Excel4JException {
+        producePaymentCheckBillOrderService.export(response, queryVO);
+    }
+
+    /**
+     * 创建生产科应付单据
+     *
+     * @param createVO 数据VO
+     * @return 新增结果
+     */
+    @PostMapping("/create")
+    public ServerResult create(@RequestBody ProducePaymentCheckBillCreateVO createVO) {
+        return producePaymentCheckBillOrderService.create(createVO);
+    }
+
+    /**
+     * 获取生产科应回款日期
+     *
+     * @param createVO 数据VO
+     * @return 新增结果
+     */
+    @PostMapping("/get_payed_date")
+    public ServerResult getPayedDate(@RequestBody ProducePaymentCheckBillCreateVO createVO) {
+        return producePaymentCheckBillOrderService.getPayedDate(createVO);
+    }
+
+    /**
+     * 更新扣款信息
+     *
+     * @param deductInfoVO 数据VO
+     * @return 编辑结果
+     */
+    @PostMapping("/update_deduct_info")
+    public ServerResult updateDeductInfo(@RequestBody ProducePaymentCheckBillDeductInfoVO deductInfoVO) {
+        return producePaymentCheckBillOrderService.updateDeductInfo(deductInfoVO);
+    }
+
+    /**
+     * 更新其他金额信息
+     *
+     * @param amountInfoVO 数据VO
+     * @return 编辑结果
+     */
+    @PostMapping("/update_amount_info")
+    public ServerResult updateAmountInfo(@RequestBody ProducePaymentCheckBillAmountInfoVO amountInfoVO) {
+        return producePaymentCheckBillOrderService.updateAmountInfo(amountInfoVO);
+    }
+
+    /**
+     * 更新发票信息
+     *
+     * @param invoiceInfoVO 数据VO
+     * @return 编辑结果
+     */
+    @PostMapping("/update_invoice_info")
+    public ServerResult updateInvoiceInfo(@RequestBody ProducePaymentCheckBillInvoiceInfoVO invoiceInfoVO) {
+        return producePaymentCheckBillOrderService.updateInvoiceInfo(invoiceInfoVO);
+    }
+
+    /**
+     * 提交审核
+     *
+     * @param commitApplyVO 数据VO
+     * @return 编辑结果
+     */
+    @PostMapping("/commit_apply")
+    public ServerResult commitApply(@RequestBody ProducePaymentCheckBillCommitApplyVO commitApplyVO) {
+        return producePaymentCheckBillOrderService.commitApply(commitApplyVO);
+    }
+
+    /**
+     * 删除数据
+     *
+     * @param producePaymentCheckBillOrderQueryVO 查询条件
+     * @return 删除是否成功
+     */
+    @PostMapping("/delete_by_id")
+    public ServerResult deleteById(@RequestBody ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
+        return producePaymentCheckBillOrderService.deleteById(producePaymentCheckBillOrderQueryVO);
+    }
+    /**
+     * 获取扣款单
+     *
+     * @param producePaymentCheckBillOrderQueryVO 查询条件
+     * @return 扣款单
+     */
+    @PostMapping("/getDeductUrl_by_id")
+    public ServerResult getDeductUrl(@RequestBody ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
+        //一定要保证文件中包含？和/.这样才不会报错。
+        return producePaymentCheckBillOrderService.getDeductUrlById(producePaymentCheckBillOrderQueryVO);
+    }
+    /**
+     * 获取生产科发票
+     *
+     * @param producePaymentCheckBillOrderQueryVO 查询条件
+     * @return 扣款单
+     */
+    @PostMapping("/getInvoiceUrl_by_id")
+    public ServerResult getInvoiceUrl(@RequestBody ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
+        return producePaymentCheckBillOrderService.getInvoiceUrlById(producePaymentCheckBillOrderQueryVO);
+    }
+    /**
+     * 审核付款单导出
+     *
+     * @param queryVO 查询条件
+     * @return 扣款单
+     */
+    @PostMapping("/exportReceipt")
+    @AnonymousAccess
+    public void exportReceipt(HttpServletResponse response, @RequestBody ProducePaymentCheckBillOrderDO queryVO) throws IOException {
+        producePaymentCheckBillOrderService.exportReceipt(response,queryVO);
+    }
+}
+
@@ -13,6 +13,8 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum ApplyStatusEnum {
+    NO_COMMIT(-1, "未提交审核"),
+
     WAIT_AUDIT(0, "待审批"),
     AUDIT_PASS(10, "已通过"),
@@ -18,6 +18,12 @@ public enum ApplyTypeEnum {
     ORDER_PROFIT_APPLY(10, "利润分析申请"),
     ORDER_REPORT_APPLY(20, "项目报告书申请"),
+
+    INVOICE_BILL_APPLY(30, "应收账单申请"),
+
+    CHECK_BILL_APPLY(40, "应付账单申请"),
+
+    DEPARTMENT_INVOICE_APPLY(50,"生产科发票申请"),
     ;
     private Integer type;
+package com.order.erp.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum FinanceOverEnum {
+    INVOICE_OVERTIME("你有invoice应收款未提交,请查收","Hi All  你以下invoice已超过回款日期,仍未生成应收款对账单提交审核,麻烦财务查询是否已打款,如未打款请业务员及时跟进\n。Invoice号为:"),
+    PRODUCE_PAYMENT_CHECK_OVERTIME("你有生产科对账单未提交,请查收","Hi All 你以下生产科对账单已超过应付款日期,麻烦财务查询是否已打款,如未打款请说明原因,如未收到发票,请业务员及时跟进\n。生产科对账单号为:"),
+    ;
+
+    private String title;
+    private String desc;
+
+}
@@ -19,6 +19,7 @@ public enum RoleEnum {
     INSPECT_USER("inspect_user", 4L, "质检员"),
     DATA_REPORT_USER("data_report_user", 5L, "数据分析员"),
     PRODUCE_USER("produce_user", 6L, "生产科"),
+    FINANCE_USER("finance_user", 7L, "财务"),
     ;
     private String code;
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.order.erp.domain.dto.BaseDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 生产科对账单应收账单映射表(CheckBillMapping)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:36
+ */
+@TableName("check_bill_mapping")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class CheckBillMappingDO extends BaseDO implements Serializable {
+    private static final long serialVersionUID = 199786248752278040L;
+
+    private Long id;
+    /**
+     * 生产科对账单号
+     */
+    private String checkNo;
+    /**
+     * check账单id
+     */
+    private Long checkBillId;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+}
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.order.erp.domain.dto.BaseDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 应收款账单关联订单映射表(InvoiceBillMapping)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:36
+ */
+@TableName("invoice_bill_mapping")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillMappingDO extends BaseDO implements Serializable {
+
+    private Long id;
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+    /**
+     * invoice账单id
+     */
+    private Long invoiceBillId;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+}
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.order.erp.domain.dto.BaseDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@TableName("invoice_bill_order")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillOrderDO extends BaseDO implements Serializable {
+
+    private Long id;
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+    /**
+     * 报关单url地址
+     */
+    private String bgUrl;
+    /**
+     * 必须回款日期
+     */
+    private String backRefundDate;
+    /**
+     * 实际回款日期
+     */
+    private String actualRefundDate;
+
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal deductAmount;
+    /**
+     * 扣款单url地址
+     */
+    private String deductUrl;
+    /**
+     * 实际应收金额
+     */
+    private BigDecimal actualReceivableAmount;
+    /**
+     * 实际应付金额1
+     */
+    private BigDecimal actualPayedAmount1;
+    /**
+     * 实际应付金额2
+     */
+    private BigDecimal actualPayedAmount2;
+    /**
+     * 实际应付金额3
+     */
+    private BigDecimal actualPayedAmount3;
+    /**
+     * 其他费用金额
+     */
+    private BigDecimal otherAmount;
+    /**
+     * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer status;
+    //需要在表中添加字段。
+    /**
+     * 客户总价金额汇总
+     * */
+    private BigDecimal totalCustomerAmount;
+
+    /**
+     * 实际付款金额汇总
+     * */
+    private BigDecimal totalPayAmount;
+    /**
+     * 业务员
+     * */
+    private String businesPerson;
+    /**
+     * 收款单位
+     * */
+    private String payee;
+    /**
+     * 财务 --审核时使用。
+     * */
+    private String financePerson;
+
+}
@@ -62,5 +62,9 @@ public class OrderFieldLockApplyDO extends BaseDO implements Serializable {
      * 拒绝原因备注
      */
     private String refuseRemark;
+    /**
+     * 申请原因备注
+     */
+    private String  applyRemark;
 }
@@ -70,7 +70,7 @@ public class OrderProfitAnalysisDO extends BaseDO implements Serializable {
      */
     private Double packetPrice;
     /**
-     * 包装费用合计￥
+     * 包装费用合计$
      */
     private Double packetTotalPrice;
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.order.erp.domain.dto.BaseDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@TableName("produce_payment_check_bill_order")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProducePaymentCheckBillOrderDO extends BaseDO implements Serializable {
+
+    private Long id;
+    /**
+     * 生产科对账单
+     */
+    private String checkNo;
+    /**
+     * 发票url地址
+     */
+    private String invoiceUrl;
+    /**
+     * 扣款单url地址
+     */
+    private String deductUrl;
+    /**
+     * 生产科应付款日期
+     */
+    private String payedDate;
+
+    /**
+     * 生产科实际付款日期
+     */
+    private String actualPayedDate;
+
+    /**
+     * 生产科扣款责任部门
+     */
+    private String deductDept;
+    /**
+     * 生产科扣款金额
+     */
+    private BigDecimal deductAmount;
+    /**
+     * 实际应付金额
+     */
+    private BigDecimal actualPayedAmount;
+    /**
+     * 实际应付金额1
+     */
+    private BigDecimal actualPayedAmount1;
+    /**
+     * 实际应付金额2
+     */
+    private BigDecimal actualPayedAmount2;
+    /**
+     * 实际应付金额3
+     */
+    private BigDecimal actualPayedAmount3;
+    /**
+     * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer status;
+    //需要在表中添加三个字段。
+    /**
+     * 生产科发票审核状态 0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer departmentInvoiceStatus;
+
+    /**
+     * 生产科总金额汇总
+     * */
+    private BigDecimal totalProductionAmount;
+    /**
+     * 实际付款金额汇总
+     * */
+    private BigDecimal totalActualPayedAmount;
+    /**
+     * 创建生产科对账单号选择的生产科
+     * */
+    private String productionName;
+    /**
+     * 未付金额
+     * */
+    private BigDecimal unPayedAmount;
+    /**
+     * 业务员
+     * */
+    private String businesPerson;
+    /**
+     * 财务 --审核时使用。
+     * */
+    private String financePerson;
+
+
+}
+package com.order.erp.domain.vo;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 系统配置(SystemSetting)实体类
+ *
+ * @author makejava
+ * @since 2023-12-05 13:44:01
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class CostSettingItemVO implements Serializable {
+
+    /**
+     * 关联code
+     */
+    private String relationCode;
+    /**
+     * 名称
+     */
+    private String relationName;
+    /**
+     * 值
+     */
+    private String relationValue;
+
+
+}
@@ -4,6 +4,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
+import java.util.List;
 /**
  * @author makejava
@@ -47,5 +48,9 @@ public class SystemSettingResultVO implements Serializable {
      */
     private String relationValue;
+    /**
+     * 成本配置
+     */
+    private List<CostSettingItemVO> costSettingItemVOS;
 }
@@ -4,6 +4,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
+import java.util.List;
 /**
  * 系统配置(SystemSetting)实体类
@@ -49,5 +50,8 @@ public class SystemSettingVO implements Serializable {
      */
     private String relationValue;
-
+    /**
+     * 成本配置
+     */
+    private List<CostSettingItemVO> costSettingItemVOS;
 }
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 业务/研发净利润分析
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class BusinessProfitRatioQueryVO extends BasePageVO implements Serializable {
+    /**
+     * ids
+     */
+    @NotEmpty(message = "选择订单不能为空")
+    private List<Long> ids;
+
+    /**
+     * 客户编码
+     */
+    @NotEmpty(message = "客户编码不能为空")
+    private String customerCode;
+
+    /**
+     * 项目号
+     */
+    @NotEmpty(message = "项目号不能为空")
+    private List<String> projectNo;
+
+    /**
+     * 项目开发开始时间
+     */
+    @NotEmpty(message = "项目开发开始时间不能为空")
+    private String projectStartTime;
+
+    /**
+     * 项目开发结束时间
+     */
+    @NotEmpty(message = "项目开发结束时间不能为空")
+    private String projectEndTime;
+
+    /**
+     * 生产进行开始时间   这个没有使用过,应该不需要,所以应该不需要校验。
+     */
+    @NotEmpty(message = "生产进行开始时间不能为空")
+    private String produceStartTime;
+
+    /**
+     * 生产进行结束时间     这个没有使用过,应该不需要,所以应该不需要校验。
+     */
+    @NotEmpty(message = "生产进行结束时间不能为空")
+    private String produceEndTime;
+
+
+    /**
+     * 研发开发费合计
+     */
+    @NotNull(message = "研发开发费合计不能为空")
+    private BigDecimal developTotalPrice;
+
+    /**
+     * 复制费合计
+     */
+    @NotNull(message = "复制费合计不能为空")
+    private BigDecimal copyTotalPrice;
+
+
+    /**
+     * 西班牙提成比例   这个没有使用过,采用的是从系统中取出来的值。  应该可以删除。
+     */
+//    @NotNull(message = "西班牙提成比例不能为空")
+    private Double spainRatio;
+
+    /**
+     * 中国团队提成比例   这个没有使用过,采用的是从系统中取出来的值。  应该可以删除。
+     */
+//    @NotNull(message = "中国团队提成比例不能为空")
+    private Double chinaRatio;
+
+
+    /**
+     * 包装费用实际金额由财务手动输入
+     */
+    @NotNull(message = "包装费用实际金额不能为空")
+    private BigDecimal packetActualTotalPrice;
+
+
+    /**
+     * 实际跟单单价=实际跟单费用/件数（人民币格式）
+     */
+//    @NotNull(message = "实际跟单单价不能为空")
+    private Double actualRmbPrice;
+
+    /**
+     * 实际跟单单价折算美金：人民币单价/汇率（6.2）
+     */
+//    @NotNull(message = "实际跟单单价折算美金不能为空")
+    private Double actualPrice;
+
+    /**
+     * 实际汇率（财务手动输入）
+     */
+    @NotNull(message = "实际汇率不能为空")
+    private BigDecimal actualRatio;
+    /**
+     * 实际跟单费用（财务手动输入）
+     */
+//    @NotNull(message = "实际跟单费用不能为空")
+    private Double actualdocumentaryPrice;
+
+}
+
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 业务/研发净利润分析
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class BusinessProfitRatioResultVO implements Serializable {
+
+
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+
+    /**
+     * 项目号
+     */
+    private String projectNo;
+
+    /**
+     * 项目开发开始时间
+     */
+    private String projectStartTime;
+
+    /**
+     * 项目开发结束时间
+     */
+    private String projectEndTime;
+
+    /**
+     * 生产进行开始时间
+     */
+    private String produceStartTime;
+
+    /**
+     * 生产进行结束时间
+     */
+    private String produceEndTime;
+
+    /**
+     * 客户总价$
+     */
+    private BigDecimal customerTotalPrice;
+
+    /**
+     * 生成科总价￥
+     */
+    private BigDecimal  productionDepartmentTotalPrice;
+
+    /**
+     * 包装费用合计￥
+     */
+    private BigDecimal  packetTotalPrice;
+
+    /**
+     * 研发开发费合计
+     */
+    private BigDecimal  developTotalPrice;
+
+    /**
+     * 复制费合计
+     */
+    private BigDecimal  copyTotalPrice;
+
+    /**
+     * 固定成本
+     * 开发持续时间*日固定成本（日固定成本需要从系统配置读取）
+     */
+    private BigDecimal  fixCost;
+
+    /**
+     * 西班牙提成比例
+     */
+    private BigDecimal  spainRatioProfitPrice;
+
+    /**
+     * 中国团队提成比例
+     */
+    private BigDecimal  chinaRatioProfitPrice;
+
+    /**
+     * 支出合计计算：客户总金额+生产科总价+包装费用+研发开发费+复制费用+固定成本+西班牙提成+中国团队提成
+     */
+    private BigDecimal  outTotalPrice;
+
+    /**
+     * 毛利润
+     * 订单收入-Loca费用-跟单费用（正数黑色字体、负数红色字体并加上-号）
+     */
+    private BigDecimal  grossProfit;
+
+    /**
+     * 研发贸易利润
+     * 客户金额合计-支出合计（正数黑色字体、负数红色字体并加上-号）
+     */
+    private BigDecimal  developProfit;
+
+    /**
+     * 包装费用实际金额由财务手动输入
+     */
+    private BigDecimal  packetActualTotalPrice;
+
+    /**
+     * 订单总数量
+     * 订单总数量计算项目号的数量合计
+     */
+    private Integer orderCount;
+
+    /**
+     * 实际跟单单价=实际跟单费用/件数（人民币格式）
+     */
+    private BigDecimal  actualRmbPrice;
+
+    /**
+     * 实际跟单单价折算美金：人民币单价/汇率（6.2）
+     */
+    private BigDecimal  actualPrice;
+
+    /**
+     * 包装费用收益计算：包装费用合计金额-包装费用实际金额
+     */
+    private BigDecimal  packetProfitPrice;
+
+    /**
+     * 实际汇率（财务手动输入）
+     */
+    private BigDecimal  actualRatio;
+
+    /**
+     * 汇率收益计算：实际汇率（财务手动输入）-固定汇率（取系统汇率）*客户金额合计（基础信息汇总）
+     */
+    private BigDecimal  actualRatioProfitPrice;
+
+    /**
+     * 综合收益计算
+     * 易研发净利润+包装费用收益+汇率收益
+     */
+    private BigDecimal  totalProfitPrice;
+    /**
+     * 包装费用合计金额
+     * 包装费用 * 汇率 (6.2)
+     */
+    private BigDecimal  packetTotalPriceCount;
+    /**
+     * 实际跟单费用
+     */
+    private BigDecimal  actualdocumentaryPrice;
+}
+
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应付款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class CheckBillAnalysisExportVO implements Serializable {
+
+    private Long id;
+
+    /**
+     * checkNo
+     */
+    private String checkNo;
+
+
+    /**
+     * 生产科
+     */
+    private String productionDepartment;
+
+    /**
+     * 生产科总价汇总
+     */
+    private BigDecimal productionDepartmentTotalPrice;
+
+    /**
+     * 生产科扣款金额汇总
+     */
+    private BigDecimal deductAmount;
+
+
+    /**
+     * 实际付款金额汇总
+     */
+    private BigDecimal actualPayedAmount;
+
+    /**
+     * 应付金额 - 扣款金额
+     * 生产科实际应付金额
+     */
+    private BigDecimal calculateActualPayedAmount;
+
+    /**
+     * 实际应付金额 - 实际付款金额
+     * 未付金额金额
+     */
+    private BigDecimal unPayedAmount;
+
+    /**
+     * 生产科应付款日期
+     */
+    private String payedDate;
+
+    /**
+     * 生产科实际付款日期
+     */
+    private String actualPayedDate;
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 应付款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class CheckBillAnalysisResultVO implements Serializable {
+
+
+    /**
+     * 导出列表
+     */
+    private List<CheckBillAnalysisExportVO> exportVOS;
+
+    /**
+     * 合计数据
+     */
+
+    /**
+     * 生产科总价汇总
+     */
+    private BigDecimal productionDepartmentTotalPrice;
+
+    /**
+     * 生产科扣款金额汇总
+     */
+    private BigDecimal deductAmount;
+
+
+    /**
+     * 实际付款金额汇总
+     */
+    private BigDecimal actualPayedAmount;
+
+    /**
+     * 应付金额 - 扣款金额
+     * 生产科实际应付金额
+     */
+    private BigDecimal calculateActualPayedAmount;
+
+    /**
+     * 实际应付金额 - 实际付款金额
+     * 未付金额金额
+     */
+    private BigDecimal unPayedAmount;
+
+    /**
+     * 合计数据
+     */
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 生产科对账单应收账单映射表(CheckBillMapping)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:37
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class CheckBillMappingQueryVO extends BasePageVO implements Serializable {
+
+    private List<Long> ids;
+
+
+    private Long id;
+    /**
+     * 生产科对账单号
+     */
+    private String checkNo;
+    /**
+     * check账单id
+     */
+    private Long checkBillId;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+
+}
+
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 生产科对账单应收账单映射表(CheckBillMapping)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:37
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class CheckBillMappingVO implements Serializable {
+
+    private Long id;
+    /**
+     * 生产科对账单号
+     */
+    private String checkNo;
+    /**
+     * check账单id
+     */
+    private Long checkBillId;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class CheckBillOrdeBaseResultVO {
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+    /**
+     * 项目号
+     */
+    private String projectNo;
+    /**
+     * 内部编号
+     */
+    private String innerNo;
+    /**
+     * 客户po号
+     */
+    private String customerPo;
+    /**
+     * 客户STYLE#
+     */
+    private String customerStyle;
+    /**
+     * Modelo(REFERENCE)
+     */
+    private String modeleLo;
+    /**
+     * 缩略图片地址     这里不确认前端拿到的数据是缩略图url还是图片url,先采用缩略图url。
+     */
+    private String smallPicUrl;
+    /**
+     * 数量
+     */
+    private Integer orderCount;
+    /**
+     * 生产科单价
+     */
+    private Double productionDepartmentPrice;
+    /**
+     * 生产科总价
+     */
+    private Double productionDepartmentTotalPrice;
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.dto.order.OrderBaseInfoDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 应付账单 -- holdTime
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class CheckHoldTimeItemVO implements Serializable {
+
+    /**
+     * 生产科
+     */
+    private String productionDepartment;
+
+    /**
+     * 订单hold时间
+     */
+    private String holdTime;
+
+    /**
+     * 基础订单信息
+     */
+    private OrderBaseInfoDO baseInfoDO;
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应付款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class CheckOrderBaseItemVO implements Serializable {
+
+    private Long orderId;
+
+    /**
+     * checkNo编码
+     */
+    private String checkNo;
+
+    /**
+     * 生产科
+     */
+    private String productionDepartment;
+
+    /**
+     * 生成科总价
+     */
+    private BigDecimal productionDepartmentTotalPrice;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
+import com.order.erp.domain.dto.order.ProducePaymentCheckBillOrderDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class FinanceEventJobVO {
+
+    //应收款。
+    private InvoiceBillOrderDO invoiceBillOrderDO;
+    //未收款。
+    private ProducePaymentCheckBillOrderDO producePaymentCheckBillOrderDO;
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 内部生产净利润分析表
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InnerProfitRatioQueryVO extends BasePageVO implements Serializable {
+
+    /**
+     * ids
+     */
+    @NotEmpty(message = "选择订单不能为空")
+    private List<Long> ids;
+    /**
+     * 客户编码
+     */
+    @NotEmpty(message = "客户编码不能为空")
+    private String customerCode;
+
+    /**
+     * 项目号
+     */
+    @NotEmpty(message = "项目号不能为空")
+    private List<String> projectNo;
+
+    /**
+     * 项目开发开始时间
+     */
+    @NotEmpty(message = "项目开发开始时间不能为空")
+    private String projectStartTime;
+
+    /**
+     * 项目开发结束时间
+     */
+    @NotEmpty(message = "项目开发结束时间不能为空")
+    private String projectEndTime;
+
+    /**
+     * 生产科预算金额由财务手动输入
+     */
+    @NotNull(message = "生产科预算金额不能为空")
+    private BigDecimal productionDepartmentPredictPrice;
+
+
+    /**
+     * 实际发生费用 手动输入
+     */
+    @NotNull(message = "实际发生费用不能为空")
+    private BigDecimal productionActualPrice;
+}
+
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 业务/研发净利润分析
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InnerProfitRatioResultVO implements Serializable {
+
+
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+
+    /**
+     * 项目号
+     */
+    private String projectNo;
+
+    /**
+     * 项目开发开始时间
+     */
+    private String projectStartTime;
+
+    /**
+     * 项目开发结束时间
+     */
+    private String projectEndTime;
+
+    /**
+     * 生产持续时间
+     */
+    private Integer projectDays;
+
+    /**
+     * 订单数量
+     */
+    private Integer orderCount;
+
+    /**
+     * 客户总价$
+     */
+    private Double customerTotalPrice;
+
+
+    /**
+     * 生产科预算金额由财务手动输入
+     */
+    private BigDecimal productionDepartmentPredictPrice;
+
+
+    /**
+     * 实际发生费用 手动输入
+     */
+    private BigDecimal  productionActualPrice;
+
+    /**
+     * 生产科总价合计
+     */
+    private BigDecimal  productionDepartmentTotalPrice;
+
+
+    /**
+     * 预算占比
+     * 预算占比计算（实际发生费用/预算金额
+     */
+    private BigDecimal  predictRatio;
+
+    /**
+     * 预算占比与实际占比差
+     * 预算占比与实际占比差计算（1-预算占比）
+     */
+    private BigDecimal  predictAndActualRatio;
+
+
+    /**
+     * 内部生产毛利润计算：生产科总价-实际发生费用就是得出
+     */
+    private BigDecimal  grossProfit;
+
+    /**
+     * 内部生产固定成本
+     * 内部生产固定成本计算：生产持续时间*每天的固定成本（固定成本从系统配置中进行获取）
+     */
+    private BigDecimal  innerProduceFixProfit;
+
+    /**
+     * 内部生产提成计算：订单数量*单价（单价从系统配置中进行获取）
+     */
+    private BigDecimal  innerProduceTotalPrice;
+
+    /**
+     * 内部生产净利润计算：生产科总价-实际发生费用-内部生产提成
+     */
+    private BigDecimal  innerProduceTotalProfit;
+
+}
+
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBaseOrderQueryVO extends BasePageVO implements Serializable {
+
+    /**
+     * 发票单号
+     */
+    @NotBlank(message = "发票单号不能为空")
+    private String invoiceNo;
+}
+
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单 -- 其他金额信息
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillAmountInfoVO implements Serializable {
+
+    private Long id;
+
+    /**
+     * 报关单url地址
+     */
+    private String bgUrl;
+
+    /**
+     * 实际应收金额
+     */
+    private BigDecimal actualReceivableAmount;
+    /**
+     * 实际应付金额1
+     */
+    private BigDecimal actualPayedAmount1;
+    /**
+     * 实际应付金额2
+     */
+    private BigDecimal actualPayedAmount2;
+    /**
+     * 实际应付金额3
+     */
+    private BigDecimal actualPayedAmount3;
+    /**
+     * 其他费用金额
+     */
+    private BigDecimal otherAmount;
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillAnalysisExportVO implements Serializable {
+
+    private Long id;
+
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+
+    /**
+     * 客户总价$
+     */
+    private BigDecimal customerTotalPrice;
+
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal deductAmount;
+
+    /**
+     * 实际应收金额
+     */
+    private BigDecimal actualReceivableAmount;
+
+    /**
+     * 实际应付金额
+     */
+    private BigDecimal actualPayedAmount;
+
+    /**
+     * 实际应收 - 实际应付
+     * 其他费用金额汇总
+     */
+    private BigDecimal otherAmount;
+
+    /**
+     * 未付金额
+     */
+    private BigDecimal otherTotalAmount;
+
+    /**
+     * 必须回款日期
+     */
+    private String backRefundDate;
+
+    /**
+     * 实际回款日期
+     */
+    private String actualRefundDate;
+//
+//    /**
+//     * 其他金额汇总
+//     */
+//    private BigDecimal unPayedAmount;
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillAnalysisResultVO implements Serializable {
+
+
+    /**
+     * 导出列表
+     */
+    private List<InvoiceBillAnalysisExportVO> exportVOS;
+
+    /**
+     * 合计数据
+     */
+
+    /**
+     * 客户总价$
+     */
+    private BigDecimal customerTotalPrice;
+
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal deductAmount;
+
+    /**
+     * 实际应收金额总计  实际应收1+2+3
+     */
+    private BigDecimal actualReceivableAmount;
+
+    /**
+     * 未收金额合计 实际应收-发生扣款金额总计
+     */
+    private BigDecimal actualPayedAmount;
+
+    /**
+     * 客户总金额-发生扣款金额总计
+     * 实际应收
+     */
+    private BigDecimal otherAmount;
+
+    /**
+     * 未付金额合计
+     */
+    private BigDecimal otherTotalAmount;
+
+    /**
+     * 合计数据
+     */
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 应收款账单 -- 分析
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillAnalysisVO extends InvoiceBillOrderQueryVO implements Serializable {
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 应收款账单 -- 提交审核
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillCommitApplyVO implements Serializable {
+
+    private Long id;
+    private String actualRefundDate;
+    private String payee;
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillCreateVO implements Serializable {
+    private static final long serialVersionUID = 543899167451834300L;
+
+    private Long id;
+
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+
+    /**
+     * 报关单url地址
+     */
+    private String bgUrl;
+
+    /**
+     * 必须回款日期
+     */
+    private String backRefundDate;
+
+    /**
+     * 订单id集合
+     */
+    private List<Long> orderIds;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单 -- 扣款信息
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillDeductInfoVO implements Serializable {
+
+    private Long id;
+
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal deductAmount;
+
+    /**
+     * 扣款单url地址
+     */
+    private String deductUrl;
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 应收款账单关联订单映射表(InvoiceBillMapping)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:36
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillMappingQueryVO extends BasePageVO implements Serializable {
+    private static final long serialVersionUID = -10772282327497511L;
+
+    private List<Long> ids;
+
+
+    private Long id;
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+    /**
+     * invoice账单id
+     */
+    private Long invoiceBillId;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+
+}
+
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 应收款账单关联订单映射表(InvoiceBillMapping)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:36
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillMappingVO implements Serializable {
+    private static final long serialVersionUID = -55765026730369748L;
+
+    private Long id;
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+    /**
+     * invoice账单id
+     */
+    private Long invoiceBillId;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillOrdeBaserResultVO {
+
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+    /**
+     * 项目号
+     */
+    private String projectNo;
+    /**
+     * 内部编号
+     */
+    private String innerNo;
+    /**
+     * 客户po号
+     */
+    private String customerPo;
+    /**
+     * 客户STYLE#
+     */
+    private String customerStyle;
+    /**
+     * Modelo(REFERENCE)
+     */
+    private String modeleLo;
+    /**
+     * 缩略图片地址     这里不确认前端拿到的数据是缩略图url还是图片url,先采用缩略图url。
+     */
+    private String smallPicUrl;
+    /**
+     * 数量
+     */
+    private Integer orderCount;
+    /**
+     * 客户单价 $
+     */
+    private Double customerPrice;
+    /**
+     * 客户总价 $
+     */
+    private Double customerTotalPrice;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillOrderQueryVO extends BasePageVO implements Serializable {
+
+    private List<Long> ids;
+    private Long id;
+
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+
+    /**
+     * 总经理审核状态 -1，未提交审核，0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer status;
+
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+
+    /**
+     * 项目号
+     */
+    private String projectNo;
+
+    /**
+     * 生产科
+     */
+    private String productionDepartment;
+
+    /**
+     * 内部编号
+     */
+    private String innerNo;
+
+    /**
+     * 客户po号
+     */
+    private String customerPo;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+}
+
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillOrderVO implements Serializable {
+    private static final long serialVersionUID = 543899167451834300L;
+
+    private Long id;
+
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+
+    /**
+     * 报关单url地址
+     */
+    private String bgUrl;
+
+    /**
+     * 必须回款日期
+     */
+    private String backRefundDate;
+
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal deductAmount;
+
+    /**
+     * 扣款单url地址
+     */
+    private String deductUrl;
+
+    /**
+     * 实际应收金额
+     */
+    private BigDecimal actualReceivableAmount;
+
+    /**
+     * 实际应付金额1
+     */
+    private BigDecimal actualPayedAmount1;
+
+    /**
+     * 实际应付金额2
+     */
+    private BigDecimal actualPayedAmount2;
+
+    /**
+     * 实际应付金额3
+     */
+    private BigDecimal actualPayedAmount3;
+
+    /**
+     * 其他费用金额
+     */
+    private BigDecimal otherAmount;
+
+    /**
+     * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer status;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.dto.order.OrderBaseInfoDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 应收款账单 -- holdTime
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceHoldTimeItemVO implements Serializable {
+
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+
+    /**
+     * 订单hold时间
+     */
+    private String holdTime;
+
+    /**
+     * 基础订单信息
+     */
+    private OrderBaseInfoDO baseInfoDO;
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceOrderBaseItemVO implements Serializable {
+
+    private Long orderId;
+
+    /**
+     * invoice编码
+     */
+    private String invoiceCode;
+
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+
+    /**
+     * 客户总价$
+     */
+    private BigDecimal customerTotalPrice;
+
+
+}
@@ -110,5 +110,10 @@ public class OrderApplyResultVO implements Serializable {
      */
     private OrderInspectionStageVO inspectionStageInfo;
+    /**
+     * 申请原因备注
+     */
+    private String  applyRemark;
+
 }
 package com.order.erp.domain.vo.order;
+import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
+import com.order.erp.domain.dto.order.ProducePaymentCheckBillOrderDO;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
@@ -44,6 +46,16 @@ public class OrderLockFieldVO implements Serializable {
     private OrderInspectionStageFieldVO inspectionStageFields;
     /**
+     * 应收款账单字段
+     */
+    private InvoiceBillOrderDO invoiceBillOrderDO;
+
+    /**
+     * 应付款账单字段
+     */
+    private ProducePaymentCheckBillOrderDO checkBillOrderDO;
+
+    /**
      * 导出指定订单id集合
      */
     private List<Long> orderIds;
@@ -45,5 +45,9 @@ public class OrderUnlockFieldApplyVO implements Serializable {
      * 质检字段
      */
     private OrderInspectionStageFieldVO inspectionStageFields;
+    /**
+     * 申请描述。
+     */
+    private String applyRemark;
 }
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProducePaymentBaseOrderQueryVO extends BasePageVO implements Serializable {
+
+    /**
+     * 生产科对账单
+     */
+    private String checkNo;
+
+}
+
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProducePaymentBillOrderAnalysisVO extends BasePageVO implements Serializable {
+
+    /**
+     * 生产科对账单
+     */
+    private String checkNo;
+
+}
+
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProducePaymentCheckBillAmountInfoVO implements Serializable {
+
+    private Long id;
+
+    /**
+     * 实际应收金额
+     */
+    private BigDecimal actualPayedAmount;
+    /**
+     * 实际应付金额1
+     */
+    private BigDecimal actualPayedAmount1;
+    /**
+     * 实际应付金额2
+     */
+    private BigDecimal actualPayedAmount2;
+    /**
+     * 实际应付金额3
+     */
+    private BigDecimal actualPayedAmount3;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProducePaymentCheckBillCommitApplyVO implements Serializable {
+
+    private Long id;
+
+    private String actualPayedDate;
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProducePaymentCheckBillCreateVO implements Serializable {
+
+    private Long id;
+    /**
+     * 生产科对账单
+     */
+    private String checkNo;
+
+    /**
+     * 生产科应付款日期
+     */
+    private String payedDate;
+
+    /**
+     * 订单id集合
+     */
+    private List<Long> orderIds;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProducePaymentCheckBillDeductInfoVO implements Serializable {
+
+    private Long id;
+    /**
+     * 生产科对账单
+     */
+    private String checkNo;
+
+    /**
+     * 生产科扣款责任部门
+     */
+    private String deductDept;
+
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal deductAmount;
+
+    /**
+     * 扣款单url地址
+     */
+    private String deductUrl;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProducePaymentCheckBillInvoiceInfoVO implements Serializable {
+
+    private Long id;
+
+    /**
+     * 发票url地址
+     */
+    private String invoiceUrl;
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProducePaymentCheckBillOrderQueryVO extends BasePageVO implements Serializable {
+
+    private List<Long> ids;
+
+
+    private Long id;
+    /**
+     * 生产科对账单
+     */
+    private String checkNo;
+    /**
+     * 总经理审核状态 -1，未提交审核，0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer status;
+
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+
+    /**
+     * 项目号
+     */
+    private String projectNo;
+
+    /**
+     * 生产科
+     */
+    private String productionDepartment;
+
+    /**
+     * 内部编号
+     */
+    private String innerNo;
+
+    /**
+     * 客户po号
+     */
+    private String customerPo;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+}
+
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProducePaymentCheckBillOrderVO implements Serializable {
+    private static final long serialVersionUID = 239047702576286556L;
+
+    private Long id;
+    /**
+     * 生产科对账单
+     */
+    private String checkNo;
+    /**
+     * 发票url地址
+     */
+    private String invoiceUrl;
+    /**
+     * 扣款单url地址
+     */
+    private String deductPdfUrl;
+    /**
+     * 生产科应付款日期
+     */
+    private String payedDate;
+    /**
+     * 生产科扣款责任部门
+     */
+    private String deductDept;
+    /**
+     * 生产科扣款金额
+     */
+    private Double deductAmount;
+    /**
+     * 实际应付金额
+     */
+    private Double actualPayedAmount;
+    /**
+     * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer status;
+
+
+}
+package com.order.erp.job;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.utils.EmailSendUtils;
+import com.order.erp.common.utils.RedisUtils;
+import com.order.erp.domain.ApplyStatusEnum;
+import com.order.erp.domain.FinanceOverEnum;
+import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.admin.AdminUserDO;
+import com.order.erp.domain.dto.admin.AdminUserRoleDO;
+import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
+import com.order.erp.domain.dto.order.ProducePaymentCheckBillOrderDO;
+import com.order.erp.domain.vo.order.FinanceEventJobVO;
+import com.order.erp.service.admin.AdminUserRoleService;
+import com.order.erp.service.admin.AdminUserService;
+import com.order.erp.service.order.InvoiceBillOrderService;
+import com.order.erp.service.order.ProducePaymentCheckBillOrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.util.Strings;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class FinanceJob {
+    @Resource
+    private EmailSendUtils emailSendUtils;
+    @Resource
+    private InvoiceBillOrderService invoiceBillOrderService;
+    @Resource
+    private ProducePaymentCheckBillOrderService producePaymentCheckBillOrderService;
+    @Resource
+    private AdminUserRoleService adminUserRoleService;
+    @Resource
+    private AdminUserService adminUserService;
+    @Resource
+    private RedisUtils redisService;
+    //每天的7:15执行一次
+//    @Scheduled(cron = "0 15 7 * * ?", zone = "Asia/Shanghai")
+
+    //每分钟执行一次
+    @Scheduled(cron = "0 * * * * ?", zone = "Asia/Shanghai")
+    public void financeJob() {
+        List<InvoiceBillOrderDO> eventInvoiceBillOrderDO=invoiceBillOrderService.getOverEvnetList();
+        List<ProducePaymentCheckBillOrderDO> eventProducePaymentCheckBillOrderDO= producePaymentCheckBillOrderService.getOverEventList();
+       LocalDate today = LocalDate.now();
+        List<InvoiceBillOrderDO> invoiceBillOrderDOList = eventInvoiceBillOrderDO.stream().filter(invoice -> invoice.getBackRefundDate() != null && Strings.isNotEmpty(invoice.getBackRefundDate()))
+                .collect(Collectors.toList());
+        Set<String> emailList= new HashSet<>();
+        Set<String> twoEmail = new HashSet<>();
+        //获取所有用户。
+        List<AdminUserDO> allUser = adminUserService.list(new LambdaQueryWrapper<AdminUserDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN));
+        Map<Long, AdminUserDO> adminUserDOMap = allUser.stream().collect(Collectors.toMap(AdminUserDO::getId, AdminUserDO -> AdminUserDO, (existing, replacement) -> existing));
+        Map<String, AdminUserDO> userName = allUser.stream().collect(Collectors.toMap(AdminUserDO::getUserName, AdminUserDO -> AdminUserDO, (existing, replacement) -> existing));
+        //获取财务邮箱。
+        List<AdminUserRoleDO> list = adminUserRoleService.list(new LambdaQueryWrapper<AdminUserRoleDO>()
+                .eq(AdminUserRoleDO::getRoleId, Constant.SEVEN));
+        Set<Long> userIds= list.stream().map(AdminUserRoleDO::getUserId).collect(Collectors.toSet());
+        List<String> financeEmailList = userIds.stream()
+                .map(userId -> Optional.ofNullable(adminUserDOMap.get(userId))
+                        .map(AdminUserDO::getEmail)
+                        .filter(Strings::isNotEmpty)
+                        .orElse(null))
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+
+        if(CollectionUtils.isNotEmpty(invoiceBillOrderDOList)){
+           invoiceBillOrderDOList.forEach(invoiceBillOrderDO -> {
+               if(today.toString().equals(invoiceBillOrderDO.getBackRefundDate())) {
+                   emailList.clear();
+                   String redisKey = "invoice:" + invoiceBillOrderDO.getId()+invoiceBillOrderDO.getInvoiceNo();
+                   //判断redis中是否有这个值,如果没有就发送邮件,如果有的话就不用发送邮件。
+                   if(!redisService.hasKey(redisKey)){
+                       if (CollectionUtils.isNotEmpty(financeEmailList)) {
+                           emailList.addAll(financeEmailList);
+                       }
+                       Set<String> userSet = new HashSet<>();
+                       userSet.add(invoiceBillOrderDO.getCreateBy());
+                       userSet.add(invoiceBillOrderDO.getBusinesPerson());
+                       List<String> emails = userSet.stream()
+                               .map(userName::get)
+                               .filter(Objects::nonNull)  // 确保 AdminUserDO 不为 null
+                               .map(AdminUserDO::getEmail) // 获取邮箱
+                               .filter(Strings::isNotEmpty) // 确保邮箱不为空
+                               .collect(Collectors.toList());
+                       if (CollectionUtils.isNotEmpty(emails)) {
+                           emailList.addAll(emails);
+                       }
+                       FinanceEventJobVO eventJobVO = new FinanceEventJobVO();
+                       eventJobVO.setInvoiceBillOrderDO(invoiceBillOrderDO);
+                       emailSendUtils.sendEmail(FinanceOverEnum.INVOICE_OVERTIME, new ArrayList<>(emailList), eventJobVO);
+                       boolean set = redisService.set(redisKey, invoiceBillOrderDO, Constant.TWENTY_FIRST, TimeUnit.DAYS);// 设置为21天后过期
+                       if(set){
+                           redisService.saddWithExpiry(Constant.REDISKEY,redisKey, Constant.TWENTY_FIRST, TimeUnit.DAYS);
+                       }
+                   }
+               }
+           });
+       }
+      List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOList= eventProducePaymentCheckBillOrderDO.stream().filter(producePaymentCheckBillOrderDO -> producePaymentCheckBillOrderDO.getPayedDate()!=null && Strings.isNotEmpty(producePaymentCheckBillOrderDO.getPayedDate()))
+               .collect(Collectors.toList());
+       if(CollectionUtils.isNotEmpty(producePaymentCheckBillOrderDOList)){
+           producePaymentCheckBillOrderDOList.forEach(producePaymentCheckBillOrderDO -> {
+               if(today.toString().equals(producePaymentCheckBillOrderDO.getPayedDate())){
+                   emailList.clear();  // 每次清除 uniqueEmails
+                   String redisKey = "check:" + producePaymentCheckBillOrderDO.getId()+producePaymentCheckBillOrderDO.getCheckNo();
+                   if(!redisService.hasKey(redisKey)) {
+                       if (CollectionUtils.isNotEmpty(financeEmailList)) {
+                           emailList.addAll(financeEmailList);
+                       }
+                       //发送邮件
+                       Set<String> userSet = new HashSet<>();
+                       //获取业务,财务,管理员
+                       userSet.add(producePaymentCheckBillOrderDO.getCreateBy());
+                       userSet.add(producePaymentCheckBillOrderDO.getBusinesPerson());
+                       List<String> emails = userSet.stream()
+                               .map(userName::get)
+                               .filter(Objects::nonNull)  // 确保 AdminUserDO 不为 null
+                               .map(AdminUserDO::getEmail) // 获取邮箱
+                               .filter(Strings::isNotEmpty) // 确保邮箱不为空
+                               .collect(Collectors.toList());
+
+                       if (CollectionUtils.isNotEmpty(emails)) {
+                           emailList.addAll(emails);
+                       }
+                       FinanceEventJobVO eventJobVO = new FinanceEventJobVO();
+                       eventJobVO.setProducePaymentCheckBillOrderDO(producePaymentCheckBillOrderDO);
+                       emailSendUtils.sendEmail(FinanceOverEnum.PRODUCE_PAYMENT_CHECK_OVERTIME, new ArrayList<>(emailList), eventJobVO);
+                       boolean set = redisService.set(redisKey, producePaymentCheckBillOrderDO, Constant.TWENTY_FIRST, TimeUnit.DAYS);// 设置为21天后过期
+                       if(set){
+                           redisService.saddWithExpiry(Constant.REDISKEY,redisKey, Constant.TWENTY_FIRST, TimeUnit.DAYS);
+                       }
+                   }
+                   }
+           });
+       }
+
+        Map<String, List<Long>> stringListMap = byKeysGetValue();
+        if (stringListMap != null) {
+            // 获取 InvoiceBillOrderDO 类型的 ID 列表
+            List<Long> invoiceBillOrderIds = stringListMap.get("InvoiceBillOrderDO");
+            if (invoiceBillOrderIds != null && !invoiceBillOrderIds.isEmpty()) {
+                List<InvoiceBillOrderDO> invoiceBillOrderDOS = invoiceBillOrderService.listByIds(invoiceBillOrderIds);
+                invoiceBillOrderDOS.forEach(x->{
+                    if(ApplyStatusEnum.NO_COMMIT.getStatus()==x.getStatus() || ApplyStatusEnum.AUDIT_REFUSE.getStatus()==x.getStatus()){
+                        twoEmail.clear();
+                        twoEmail.addAll(financeEmailList);
+                    Set<String> userSet = new HashSet<>();
+                    userSet.add(x.getCreateBy());
+                    userSet.add(x.getBusinesPerson());
+                    List<String> emails = userSet.stream()
+                            .map(userName::get)
+                            .filter(Objects::nonNull)  // 确保 AdminUserDO 不为 null
+                            .map(AdminUserDO::getEmail) // 获取邮箱
+                            .filter(Strings::isNotEmpty) // 确保邮箱不为空
+                            .collect(Collectors.toList());
+
+                    if (CollectionUtils.isNotEmpty(emails)) {
+                       twoEmail.addAll(emails);
+                    }
+                    FinanceEventJobVO eventJobVO = new FinanceEventJobVO();
+                    eventJobVO.setInvoiceBillOrderDO(x);
+                    emailSendUtils.sendEmail(FinanceOverEnum.INVOICE_OVERTIME, new ArrayList<>(twoEmail), eventJobVO);
+                    }
+                });
+            }
+            // 获取 ProducePaymentCheckBillOrderDO 类型的 ID 列表
+            List<Long> producePaymentCheckBillIds = stringListMap.get("ProducePaymentCheckBillOrderDO");
+            if (producePaymentCheckBillIds != null && !producePaymentCheckBillIds.isEmpty()) {
+                List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOS = producePaymentCheckBillOrderService.listByIds(producePaymentCheckBillIds);
+                producePaymentCheckBillOrderDOS.forEach(x->{
+                    if(ApplyStatusEnum.NO_COMMIT.getStatus()==x.getStatus() || ApplyStatusEnum.AUDIT_REFUSE.getStatus()==x.getStatus()){
+                        twoEmail.clear();
+                        twoEmail.addAll(financeEmailList);
+                    Set<String> userSet = new HashSet<>();
+                    userSet.add(x.getCreateBy());
+                    userSet.add(x.getBusinesPerson());
+                    List<String> emails = userSet.stream()
+                            .map(userName::get)
+                            .filter(Objects::nonNull)  // 确保 AdminUserDO 不为 null
+                            .map(AdminUserDO::getEmail) // 获取邮箱
+                            .filter(Strings::isNotEmpty) // 确保邮箱不为空
+                            .collect(Collectors.toList());
+                    if (CollectionUtils.isNotEmpty(emails)) {
+                        twoEmail.addAll(emails);
+                    }
+                    FinanceEventJobVO eventJobVO = new FinanceEventJobVO();
+                    eventJobVO.setProducePaymentCheckBillOrderDO(x);
+                    emailSendUtils.sendEmail(FinanceOverEnum.PRODUCE_PAYMENT_CHECK_OVERTIME, new ArrayList<>(twoEmail), eventJobVO);
+                    }
+                });
+            }
+        }
+    }
+
+    public Map<String, List<Long>> byKeysGetValue() {
+        Map<String, List<Long>> resultMap = new HashMap<>();
+        List<Long> producePaymentCheckBillIds = new ArrayList<>();
+        List<Long> invoiceBillOrderIds = new ArrayList<>();
+        // 获取所有的 keys对应的value。
+        Set<Object> redisKeySet = redisService.getSetValues(Constant.REDISKEY);
+        if (CollectionUtils.isNotEmpty(redisKeySet)) {
+            List<Object> validKeys = new ArrayList<>();
+
+            // 遍历所有 keys，检查每个 key 的过期时间
+            for (Object key :redisKeySet) {
+                Long expireTime = redisService.getExpire(key); // 获取过期时间（单位：秒）
+
+                if (expireTime != null && expireTime > 0) { // 确保 expireTime 有值且大于 0
+                    long daysRemaining = TimeUnit.SECONDS.toDays(expireTime);
+                    // 如果剩余时间为14天7天或1天，则符合条件
+                    if (daysRemaining==14 || daysRemaining == 7 || daysRemaining == 1) {
+                        validKeys.add(key); // 满足条件，加入有效的 keys 列表
+                    }
+                }
+            }
+            // 如果存在有效的 keys，获取其对应的值
+            if (CollectionUtils.isNotEmpty(validKeys)) {
+                List<Object> values = redisService.multiGet(validKeys);
+                if (CollectionUtils.isNotEmpty(values)) {
+                    // 遍历每个 value，按类型分别收集 ID
+                    for (Object item : values) {
+                        if (item instanceof ProducePaymentCheckBillOrderDO) {
+                            ProducePaymentCheckBillOrderDO producePaymentCheckBillOrderDO = (ProducePaymentCheckBillOrderDO) item;
+                            producePaymentCheckBillIds.add(producePaymentCheckBillOrderDO.getId());
+                        } else if (item instanceof InvoiceBillOrderDO) {
+                            InvoiceBillOrderDO invoiceBillOrderDO = (InvoiceBillOrderDO) item;
+                            invoiceBillOrderIds.add(invoiceBillOrderDO.getId());
+                        }
+                    }
+                }
+                // 将结果放入 resultMap
+                resultMap.put("ProducePaymentCheckBillOrderDO", producePaymentCheckBillIds);
+                resultMap.put("InvoiceBillOrderDO", invoiceBillOrderIds);
+            }
+        }
+        return resultMap;
+    }
+
+}
+package com.order.erp.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.order.erp.domain.dto.order.CheckBillMappingDO;
+
+/**
+ * 生产科对账单应收账单映射表(CheckBillMapping)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:37
+ */
+public interface CheckBillMappingMapper extends BaseMapper<CheckBillMappingDO> {
+
+
+}
+
+package com.order.erp.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.order.erp.domain.dto.order.InvoiceBillMappingDO;
+
+/**
+ * 应收款账单关联订单映射表(InvoiceBillMapping)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:36
+ */
+public interface InvoiceBillMappingMapper extends BaseMapper<InvoiceBillMappingDO> {
+
+
+}
+
+package com.order.erp.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+public interface InvoiceBillOrderMapper extends BaseMapper<InvoiceBillOrderDO> {
+@Select("SELECT * FROM invoice_bill_order WHERE status in('-1','20') and enable_flag=10 and DATE_SUB(CURDATE(), INTERVAL 1 YEAR) <= date(create_time);")
+List<InvoiceBillOrderDO> getOverEventList();
+
+}
+
+package com.order.erp.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.order.erp.domain.dto.order.ProducePaymentCheckBillOrderDO;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+public interface ProducePaymentCheckBillOrderMapper extends BaseMapper<ProducePaymentCheckBillOrderDO> {
+    @Select("SELECT * FROM produce_payment_check_bill_order WHERE status in('-1','20') and enable_flag=10 and DATE_SUB(CURDATE(), INTERVAL 1 YEAR) <= date(create_time);")
+    List<ProducePaymentCheckBillOrderDO> getOverEventList();
+
+
+}
+
@@ -346,6 +346,9 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
             if(RoleEnum.PRODUCE_USER.getId().equals(x.getRoleId())){
                 result.set(RoleEnum.PRODUCE_USER);
             }
+            if (RoleEnum.FINANCE_USER.getId().equals(x.getRoleId())) {
+                result.set(RoleEnum.FINANCE_USER);
+            }
         });
         return ServerResult.success(result.get());
     }
@@ -2,6 +2,7 @@ package com.order.erp.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,8 +12,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.exception.BusinessException;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.SystemSettingDO;
+import com.order.erp.domain.vo.CostSettingItemVO;
 import com.order.erp.domain.vo.SystemSettingQueryVO;
 import com.order.erp.domain.vo.SystemSettingResultVO;
 import com.order.erp.domain.vo.SystemSettingVO;
@@ -84,6 +87,9 @@ public class SystemSettingServiceImpl extends ServiceImpl&lt;SystemSettingMapper, S
             List<SystemSettingResultVO> queryVos = systemSettingDOS.stream().map(x -> {
                 SystemSettingResultVO resultVO = new SystemSettingResultVO();
                 BeanUtils.copyProperties(x, resultVO);
+                if (x.getSettingType() == Constant.THREE && StringUtils.isNotBlank(x.getRelationValue())) {
+                    resultVO.setCostSettingItemVOS(JSONArray.parseArray(x.getRelationValue(), CostSettingItemVO.class));
+                }
                 return resultVO;
             }).collect(Collectors.toList());
             webVOPage.setRecords(queryVos);
@@ -117,6 +123,23 @@ public class SystemSettingServiceImpl extends ServiceImpl&lt;SystemSettingMapper, S
         if (Objects.nonNull(systemSettingVO.getId())) {
             systemSettingVO.setId(null);
         }
+        if (systemSettingVO.getSettingType() == Constant.THREE || systemSettingVO.getSettingType() == Constant.FOUR) {
+            if (CollectionUtils.isEmpty(systemSettingVO.getCostSettingItemVOS())) {
+                throw new BusinessException("成本配置项不能为空");
+            }
+            if(StringUtils.isNotBlank(systemSettingVO.getSettingValue())){
+                SystemSettingDO systemSettingDO = getOne(new LambdaQueryWrapper<SystemSettingDO>()
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .eq(SystemSettingDO::getSettingValue, systemSettingVO.getSettingValue())
+                        .eq(SystemSettingDO::getSettingType,systemSettingVO.getSettingType()));
+                if(Objects.nonNull(systemSettingDO)){
+                    throw new BusinessException("已配置"+systemSettingVO.getSettingValue()+"的提成数据！");
+                }
+            }
+//            systemSettingVO.setRelationCode("costSettingItem");
+//            systemSettingVO.setRelationName("成本配置项集合");
+            systemSettingVO.setRelationValue(JSONArray.toJSONString(systemSettingVO.getCostSettingItemVOS()));
+        }
         SystemSettingDO systemSettingDo = BeanUtil.copyProperties(systemSettingVO, SystemSettingDO.class);
         save(systemSettingDo);
@@ -136,6 +159,14 @@ public class SystemSettingServiceImpl extends ServiceImpl&lt;SystemSettingMapper, S
         if (Objects.isNull(systemSettingVO.getId())) {
             return ServerResult.fail("id 不能为空");
         }
+        if (Objects.nonNull(systemSettingVO.getSettingType()) && (systemSettingVO.getSettingType() == Constant.THREE || systemSettingVO.getSettingType() == Constant.FOUR)) {
+            if (CollectionUtils.isEmpty(systemSettingVO.getCostSettingItemVOS())) {
+                throw new BusinessException("成本配置项不能为空");
+            }
+//            systemSettingVO.setRelationCode("costSettingItem");
+//            systemSettingVO.setRelationName("成本配置项集合");
+            systemSettingVO.setRelationValue(JSONArray.toJSONString(systemSettingVO.getCostSettingItemVOS()));
+        }
         SystemSettingDO systemSettingDo = BeanUtil.copyProperties(systemSettingVO, SystemSettingDO.class);
         updateById(systemSettingDo);
+package com.order.erp.service.order;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.order.CheckBillMappingDO;
+import com.order.erp.domain.vo.order.CheckBillMappingQueryVO;
+import com.order.erp.domain.vo.order.CheckBillMappingVO;
+
+/**
+ * 生产科对账单应收账单映射表(CheckBillMapping)表服务接口
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:37
+ */
+public interface CheckBillMappingService extends IService<CheckBillMappingDO> {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param checkBillMappingQueryVO 主键
+     * @return 实例对象
+     */
+    ServerResult queryById(CheckBillMappingQueryVO checkBillMappingQueryVO);
+
+    /**
+     * 分页查询
+     *
+     * @param checkBillMappingQueryVO 筛选条件
+     * @return 查询结果
+     */
+    ServerResult list(CheckBillMappingQueryVO checkBillMappingQueryVO);
+
+    /**
+     * 新增数据
+     *
+     * @param checkBillMappingVO 数据VO
+     * @return 新增结果
+     */
+    ServerResult add(CheckBillMappingVO checkBillMappingVO);
+
+    /**
+     * 修改数据
+     *
+     * @param checkBillMappingVO 数据VO
+     * @return 编辑结果
+     */
+    ServerResult edit(CheckBillMappingVO checkBillMappingVO);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param checkBillMappingQueryVO 筛选条件
+     * @return 是否成功
+     */
+    ServerResult deleteById(CheckBillMappingQueryVO checkBillMappingQueryVO);
+
+}
+package com.order.erp.service.order;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.order.InvoiceBillMappingDO;
+import com.order.erp.domain.vo.order.InvoiceBillMappingQueryVO;
+import com.order.erp.domain.vo.order.InvoiceBillMappingVO;
+
+/**
+ * 应收款账单关联订单映射表(InvoiceBillMapping)表服务接口
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:36
+ */
+public interface InvoiceBillMappingService extends IService<InvoiceBillMappingDO> {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param invoiceBillMappingQueryVO 主键
+     * @return 实例对象
+     */
+    ServerResult queryById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO);
+
+    /**
+     * 分页查询
+     *
+     * @param invoiceBillMappingQueryVO 筛选条件
+     * @return 查询结果
+     */
+    ServerResult list(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO);
+
+    /**
+     * 新增数据
+     *
+     * @param invoiceBillMappingVO 数据VO
+     * @return 新增结果
+     */
+    ServerResult add(InvoiceBillMappingVO invoiceBillMappingVO);
+
+    /**
+     * 修改数据
+     *
+     * @param invoiceBillMappingVO 数据VO
+     * @return 编辑结果
+     */
+    ServerResult edit(InvoiceBillMappingVO invoiceBillMappingVO);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param invoiceBillMappingQueryVO 筛选条件
+     * @return 是否成功
+     */
+    ServerResult deleteById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO);
+
+}
+package com.order.erp.service.order;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
+import com.order.erp.domain.vo.order.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)表服务接口
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+public interface InvoiceBillOrderService extends IService<InvoiceBillOrderDO> {
+
+    /**
+     * 分页查询
+     *
+     * @param invoiceBillOrderQueryVO 筛选条件
+     * @return 查询结果
+     */
+    ServerResult listByPage(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO);
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    ServerResult listBaseOrderInfoBy(InvoiceBaseOrderQueryVO queryVO);
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    ServerResult listAnalysisBy(InvoiceBillAnalysisVO queryVO);
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    ServerResult export(HttpServletResponse response, InvoiceBillAnalysisVO queryVO) throws IOException;
+
+    /**
+     * 新增数据
+     *
+     * @param createVO 数据VO
+     * @return 新增结果
+     */
+    ServerResult create(InvoiceBillCreateVO createVO);
+
+    /**
+     *
+     * @param createVO
+     * @return
+     */
+    ServerResult getBackRefundDate(InvoiceBillCreateVO createVO);
+
+    /**
+     * 更新扣款信息
+     *
+     * @param deductInfoVO 数据VO
+     * @return 编辑结果
+     */
+    ServerResult updateDeductInfo(InvoiceBillDeductInfoVO deductInfoVO);
+
+    /**
+     * 更新其他金额信息
+     *
+     * @param amountInfoVO
+     * @return
+     */
+    ServerResult updateAmountInfo(InvoiceBillAmountInfoVO amountInfoVO);
+
+    /**
+     * 提交审核
+     *
+     * @param commitApplyVO
+     * @return
+     */
+    ServerResult commitApply(InvoiceBillCommitApplyVO commitApplyVO);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param invoiceBillOrderQueryVO 筛选条件
+     * @return 是否成功
+     */
+    ServerResult deleteById(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO);
+
+    /**
+     * 通过主键得到扣款信息。
+     *
+     * @param invoiceBillOrderQueryVO 筛选条件
+     * @return 是否成功
+     */
+    ServerResult getDeductUrlById(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO);
+    /**
+     * 重新更新报关单
+     *
+     * @param bgUrl
+     * @return 是否成功
+     */
+    ServerResult reUploadBgurl(InvoiceBillCreateVO bgUrl);
+
+    /**
+     * 导出审核收款单数据。
+     *
+     * @param queryVO
+     * @return 是否成功
+     */
+    ServerResult exportReceipt(HttpServletResponse response,InvoiceBillOrderDO  queryVO) throws IOException;
+
+    List<InvoiceBillOrderDO>  getOverEvnetList();
+
+}
+package com.order.erp.service.order;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.order.ProducePaymentCheckBillOrderDO;
+import com.order.erp.domain.vo.order.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)表服务接口
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+public interface ProducePaymentCheckBillOrderService extends IService<ProducePaymentCheckBillOrderDO> {
+
+    /**
+     * 分页查询
+     *
+     * @param queryVO 筛选条件
+     * @return 查询结果
+     */
+    ServerResult listByPage(ProducePaymentCheckBillOrderQueryVO queryVO);
+
+    /**
+     * 基础订单查询
+     *
+     * @param queryVO
+     * @return
+     */
+    ServerResult listBaseOrderInfoBy(ProducePaymentBaseOrderQueryVO queryVO);
+
+    /**
+     * 分析列表
+     *
+     * @param analysisVO
+     * @return
+     */
+    ServerResult listAnalysisBy(ProducePaymentCheckBillOrderQueryVO analysisVO);
+
+    /**
+     *
+     * @param analysisVO
+     * @return
+     */
+    ServerResult export(HttpServletResponse response, ProducePaymentCheckBillOrderQueryVO analysisVO) throws IOException;
+
+    /**
+     * 创建生产科应付单据
+     *
+     * @param createVO 数据VO
+     * @return 新增结果
+     */
+    ServerResult create(ProducePaymentCheckBillCreateVO createVO);
+
+    /**
+     * 获取生产科应回款日期
+     *
+     * @param createVO
+     * @return
+     */
+    ServerResult getPayedDate(ProducePaymentCheckBillCreateVO createVO);
+
+    /**
+     * 更新扣款信息
+     *
+     * @param deductInfoVO 数据VO
+     * @return 编辑结果
+     */
+    ServerResult updateDeductInfo(ProducePaymentCheckBillDeductInfoVO deductInfoVO);
+
+    /**
+     * 更新其他金额信息
+     *
+     * @param amountInfoVO
+     * @return
+     */
+    ServerResult updateAmountInfo(ProducePaymentCheckBillAmountInfoVO amountInfoVO);
+
+    /**
+     * 更新发票信息
+     *
+     * @param invoiceInfoVO
+     * @return
+     */
+    ServerResult updateInvoiceInfo(ProducePaymentCheckBillInvoiceInfoVO invoiceInfoVO);
+
+    /**
+     * @param commitApplyVO
+     * @return
+     */
+    ServerResult commitApply(ProducePaymentCheckBillCommitApplyVO commitApplyVO);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param producePaymentCheckBillOrderQueryVO 筛选条件
+     * @return 是否成功
+     */
+    ServerResult deleteById(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO);
+
+    ServerResult getDeductUrlById(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO);
+
+    ServerResult getInvoiceUrlById(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO);
+    ServerResult exportReceipt(HttpServletResponse response, ProducePaymentCheckBillOrderDO queryVO) throws IOException;
+
+    List<ProducePaymentCheckBillOrderDO> getOverEventList();
+}
+package com.order.erp.service.order.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.exception.BusinessException;
+import com.order.erp.common.utils.DateUtils;
+import com.order.erp.common.utils.EasyPdfUtils;
+import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.SystemSettingDO;
+import com.order.erp.domain.dto.order.OrderBaseInfoDO;
+import com.order.erp.domain.dto.order.OrderProfitAnalysisDO;
+import com.order.erp.domain.vo.CostSettingItemVO;
+import com.order.erp.domain.vo.order.BusinessProfitRatioQueryVO;
+import com.order.erp.domain.vo.order.BusinessProfitRatioResultVO;
+import com.order.erp.domain.vo.order.InnerProfitRatioQueryVO;
+import com.order.erp.domain.vo.order.InnerProfitRatioResultVO;
+import com.order.erp.service.SystemSettingService;
+import com.order.erp.service.order.OrderBaseInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author: xms
+ * @description: TODO
+ * @date: 2024/8/26 16:17
+ * @version: 1.0
+ */
+@Slf4j
+@Service
+public class CalculateProfitServiceImpl {
+
+
+    @Resource
+    private OrderBaseInfoService orderBaseInfoService;
+
+    @Resource
+    private OrderProfitAnalysisServiceImpl orderProfitAnalysisService;
+
+    @Resource
+    private EasyPdfUtils pdfUtils;
+    @Resource
+    private SystemSettingService systemSettingService;
+
+    /**
+     * @param response
+     * @param queryVO
+     * @return
+     */
+    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("业务净利润分析表");
+        Row row = sheet.createRow(0);
+        Cell cell = row.createCell(0);
+        cell.setCellValue("业务净利润分析表");
+        sheet.setMargin(sheet.LeftMargin,0.5);
+        sheet.setMargin(sheet.RightMargin,0.5);
+
+        CellStyle titleStyle = workbook.createCellStyle();
+        Font titleFont = workbook.createFont();
+        titleFont.setFontHeightInPoints((short) 26); // 字体大小
+        titleFont.setBold(true); // 加粗
+        titleFont.setFontName("等线");
+        titleStyle.setAlignment(HorizontalAlignment.CENTER); // 水平居中
+        titleStyle.setVerticalAlignment(VerticalAlignment.CENTER); // 垂直居中
+        // 合并单元格（第一行的第一列到第三列）
+        sheet.addMergedRegion(new CellRangeAddress(0, 3, 0, 9));
+        titleStyle.setFont(titleFont);
+        cell.setCellStyle(titleStyle);
+
+        // 第二行
+        createMergedCell(sheet, workbook, 4, 0, 4, 5, 0, 1, "项目号");
+        createMergedCell(sheet, workbook, 4, 2, 4, 5, 2, 4, String.join(",",resultVO.getProjectNo()));
+        createMergedCell(sheet, workbook, 4, 5, 4, 5, 5, 6, "开始时间");
+        createMergedCell(sheet, workbook, 4, 7, 4, 5, 7, 9, "结束时间");
+// 第三行
+        createMergedCell(sheet, workbook, 6, 0, 6, 7, 0, 1, "");
+        createMergedCell(sheet, workbook, 6, 2, 6, 7, 2, 4, "项目开始时间");
+        createMergedCell(sheet, workbook, 6, 5, 6, 7, 5, 6, resultVO.getProjectStartTime());
+        createMergedCell(sheet, workbook, 6, 7, 6, 7, 7, 9, resultVO.getProjectEndTime());
+
+// 第四行
+        createMergedCell(sheet, workbook, 8, 0, 8, 9, 0, 1, "");
+        createMergedCell(sheet, workbook, 8, 2, 8, 9, 2, 4, "生产进行时间");
+        createMergedCell(sheet, workbook, 8, 5, 8, 9, 5, 6, resultVO.getProduceStartTime());
+        createMergedCell(sheet, workbook, 8, 7, 8, 9, 7, 9, resultVO.getProduceEndTime());
+//第五行
+        createMergedCell(sheet, workbook, 10, 0, 10, 11, 0, 1, "客户编码");
+        createMergedCell(sheet, workbook, 10, 2, 10, 11, 2, 4, resultVO.getCustomerCode());
+        createMergedCell(sheet, workbook, 10, 5, 10, 11, 5, 6, "");
+        createMergedCell(sheet, workbook, 10, 7, 10, 11, 7, 9, "备注");
+//第六行
+        createMergedCell(sheet, workbook, 12, 0, 12, 13, 0, 4, "客户总金额计算");
+        createMergedCell(sheet, workbook, 12, 5, 12, 13, 5, 6, "￥"+resultVO.getCustomerTotalPrice());
+        createMergedCell(sheet, workbook, 12, 9, 12, 13, 7, 9, "");
+////第七行
+        createMergedCell(sheet, workbook, 14, 0, 14, 15, 0, 4, "生产科总价合计");
+        createMergedCell(sheet, workbook, 14, 5, 14, 15, 5, 6, "￥"+resultVO.getProductionDepartmentTotalPrice());
+        createMergedCell(sheet, workbook, 14, 7, 14, 15, 7, 9, "");
+////第八行
+        createMergedCell(sheet, workbook, 16, 0, 16, 17, 0, 4, "包装费用合计");
+        createMergedCell(sheet, workbook, 16, 5, 16, 17, 5, 6, "￥"+resultVO.getPacketTotalPrice());
+        createMergedCell(sheet, workbook, 16, 7, 16, 17, 7, 9, "");
+////第九行
+        createMergedCell(sheet, workbook, 18, 0, 18, 19, 0, 4, "研发开发费合计");
+        createMergedCell(sheet, workbook, 18, 5, 18, 19, 5, 6, "￥"+resultVO.getDevelopTotalPrice().setScale(2, RoundingMode.HALF_UP));
+        createMergedCell(sheet, workbook, 18, 7, 18, 19, 7, 9, "");
+////第十行
+        createMergedCell(sheet, workbook, 20, 0, 20, 21, 0, 4, "复制费用合计");
+        createMergedCell(sheet, workbook, 20, 5, 20, 21, 5, 6, "￥"+resultVO.getCopyTotalPrice().setScale(2, RoundingMode.HALF_UP));
+        createMergedCell(sheet, workbook, 20, 7, 20, 21, 7, 9, "");
+//第十一行
+        createMergedCell(sheet, workbook, 22, 0, 22, 23, 0, 4, "固定成本");
+        createMergedCell(sheet, workbook, 22, 5, 22, 23, 5, 6, "￥"+resultVO.getFixCost());
+        createMergedCell(sheet, workbook, 22, 7, 22, 23, 7, 9, "");
+//第十二行
+        createMergedCell(sheet, workbook, 24, 0, 24, 25, 0, 4, "西班牙提成");
+        createMergedCell(sheet, workbook, 24, 5, 24, 25, 5, 6, "￥"+resultVO.getSpainRatioProfitPrice());
+        createMergedCell(sheet, workbook, 24, 7, 24, 25, 7, 9, "");
+//第十三行
+        createMergedCell(sheet, workbook, 26, 0, 26, 27, 0, 4, "中国团队提成");
+        createMergedCell(sheet, workbook, 26, 5, 26, 27, 5, 6, "￥"+resultVO.getChinaRatioProfitPrice());
+        createMergedCell(sheet, workbook, 26, 7, 26, 27, 7, 9, "");
+ //第十四行
+        createMergedCell(sheet, workbook, 28, 0, 28, 29, 0, 4, "支出合计");
+        createMergedCell(sheet, workbook, 28, 5, 28, 29, 5, 6, "￥"+resultVO.getOutTotalPrice());
+        createMergedCell(sheet, workbook, 28, 7, 28, 29, 7, 9, "");
+//第十五行
+        createMergedCell(sheet, workbook, 30, 0, 30, 31, 0, 4, "毛利润");
+        createMergedCell(sheet, workbook, 30, 5, 30, 31, 5, 6, "￥"+resultVO.getGrossProfit());
+        createMergedCell(sheet, workbook, 30, 7, 30, 31, 7, 9, "");
+////第十六行
+        createMergedCell(sheet, workbook, 32, 0, 32, 33, 0, 4, "研发贸易净利润");
+        createMergedCell(sheet, workbook, 32, 5, 32, 33, 5, 6, "￥"+resultVO.getDevelopProfit());
+        createMergedCell(sheet, workbook, 32, 7, 32, 33, 7, 9, "");
+////第十七行
+        createMergedCell(sheet, workbook, 34, 0, 34, 35, 0, 4, "包装费用合计金额");
+        createMergedCell(sheet, workbook, 34, 5, 34, 35, 5, 6, "￥"+resultVO.getPacketTotalPrice());
+        createMergedCell(sheet, workbook, 34, 7, 34, 35, 7, 9, "");
+////第十八行
+        createMergedCell(sheet, workbook, 36, 0, 36, 37, 0, 4, "包装费用实际金额");
+        createMergedCell(sheet, workbook, 36, 5, 36, 37, 5, 6, "￥"+resultVO.getPacketActualTotalPrice().setScale(2, RoundingMode.HALF_UP));
+        createMergedCell(sheet, workbook, 36, 7, 36, 37, 7, 9, "");
+////第十九行
+        createMergedCell(sheet, workbook, 38, 0, 38, 39, 0, 4, "订单总数量");
+        createMergedCell(sheet, workbook, 38, 5, 38, 39, 5, 6, String.valueOf(resultVO.getOrderCount()));
+        createMergedCell(sheet, workbook, 38, 7, 38, 39, 7, 9, "");
+////第二十行
+        createMergedCell(sheet, workbook, 40, 0, 40, 41, 0, 4, "实际跟单单价=实际跟单费用/件数");
+        createMergedCell(sheet, workbook, 40, 5, 40, 41, 5, 6, "￥"+resultVO.getActualRmbPrice());
+        createMergedCell(sheet, workbook, 40, 7, 40, 41, 7, 9, "");
+//第二十一行
+        createMergedCell(sheet, workbook, 42, 0, 42, 43, 0, 4, "实际跟单单价折算美金");
+        createMergedCell(sheet, workbook, 42, 5, 42, 43, 5, 6, "$"+resultVO.getActualPrice());
+        createMergedCell(sheet, workbook, 42, 7, 42, 43, 7, 9, "");
+//第二十二行
+        createMergedCell(sheet, workbook, 44, 0, 44, 45, 0, 4, "包装费用收益");
+        createMergedCell(sheet, workbook, 44, 5, 44, 45, 5, 6, "￥"+resultVO.getPacketProfitPrice());
+        createMergedCell(sheet, workbook, 44, 7, 44, 45, 7, 9, "");
+//第二十三行
+        createMergedCell(sheet, workbook, 46, 0, 46, 47, 0, 4, "实际汇率");
+        createMergedCell(sheet, workbook, 46, 5, 46, 47, 5, 6, "￥"+resultVO.getActualRatio().setScale(2, RoundingMode.HALF_UP));
+        createMergedCell(sheet, workbook, 46, 7, 46, 47, 7, 9, "");
+//第二十四行
+        createMergedCell(sheet, workbook, 48, 0, 48, 49, 0, 4, "汇率收益");
+        createMergedCell(sheet, workbook, 48, 5, 48, 49, 5, 6, "￥"+resultVO.getActualRatioProfitPrice());
+        createMergedCell(sheet, workbook, 48, 7, 48, 49, 7, 9, "");
+//第二十五行
+        createMergedCell(sheet, workbook, 50, 0, 50, 51, 0, 4, "综合收益");
+        createMergedCell(sheet, workbook, 50, 5, 50, 51, 5, 6, "￥"+resultVO.getTotalProfitPrice());
+        createMergedCell(sheet, workbook, 50, 7, 50, 51, 7, 9, "");
+        response.setHeader("Content-Disposition", "attachment; filename=\"-.xlsx\"");
+        workbook.write(response.getOutputStream());
+        workbook.close();
+        //结束
+        return ServerResult.success();
+    }
+
+    /**
+     * @param response
+     * @param queryVO
+     * @return
+     */
+    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);
+        Cell cell = row.createCell(0);
+        cell.setCellValue("内部生产净利润分析表");
+
+        CellStyle titleStyle = workbook.createCellStyle();
+        Font titleFont = workbook.createFont();
+        titleFont.setFontHeightInPoints((short) 26); // 字体大小
+        titleFont.setBold(true); // 加粗
+        titleFont.setFontName("等线");
+        titleStyle.setAlignment(HorizontalAlignment.CENTER); // 水平居中
+        titleStyle.setVerticalAlignment(VerticalAlignment.CENTER); // 垂直居中
+        // 合并单元格（第一行的第一列到第三列）
+        sheet.addMergedRegion(new CellRangeAddress(0, 3, 0, 10));
+        titleStyle.setFont(titleFont);
+        cell.setCellStyle(titleStyle);
+
+        // 第二行
+        createMergedCell(sheet, workbook, 4, 0, 4, 5, 0, 1, "项目号");
+        createMergedCell(sheet, workbook, 4, 2, 4, 5, 2, 3, resultVO.getProjectNo());
+        createMergedCell(sheet, workbook, 4, 4, 4, 5, 4, 5, "开始时间");
+        createMergedCell(sheet, workbook, 4, 6, 4, 5, 6, 7, "结束时间");
+        createMergedCell(sheet, workbook, 4, 8,4, 5, 8, 10, "生产持续时间");
+// 第三行
+        createMergedCell(sheet, workbook, 6, 0, 6, 7, 0, 1, "");
+        createMergedCell(sheet, workbook, 6, 2, 6, 7, 2, 3, "项目开发时间");
+        createMergedCell(sheet, workbook, 6, 4, 6, 7, 4, 5, resultVO.getProjectStartTime());
+        createMergedCell(sheet, workbook, 6, 6, 6, 7, 6, 7, resultVO.getProjectEndTime());
+        createMergedCell(sheet, workbook, 6, 8, 6, 7, 8, 10, String.valueOf(resultVO.getProjectDays()));
+
+// 第四行
+        createMergedCell(sheet, workbook, 8, 0, 8, 9, 0, 1, "客户编码");
+        createMergedCell(sheet, workbook, 8, 2, 8, 9, 2, 3, resultVO.getCustomerCode());
+        createMergedCell(sheet, workbook, 8, 4, 8, 9, 4, 5, "明细");
+        createMergedCell(sheet, workbook, 8, 6, 8, 9, 6, 7, "金额");
+        createMergedCell(sheet, workbook, 8, 8, 8, 9, 8, 10, "订单数量");
+//第五行
+        createMergedCell(sheet, workbook, 10, 0, 10, 11, 0, 3, "生产科总价合计");
+        createMergedCell(sheet, workbook, 10, 4, 10, 11, 4, 5, "￥"+ resultVO.getProductionDepartmentTotalPrice());
+        createMergedCell(sheet, workbook, 10, 6, 10, 11, 6, 7, "￥"+ resultVO.getProductionDepartmentTotalPrice());
+        createMergedCell(sheet, workbook, 10, 8, 10, 11, 8, 10, String.valueOf(resultVO.getOrderCount()));
+//第六行
+        createMergedCell(sheet, workbook, 12, 0, 12, 13, 0, 3, "生产科预算金额");
+        createMergedCell(sheet, workbook, 12, 4, 12, 13, 4, 5, "￥"+ resultVO.getProductionDepartmentPredictPrice().setScale(2, BigDecimal.ROUND_HALF_UP));
+        createMergedCell(sheet, workbook, 12, 6, 12, 13, 6, 7, "预算占比");
+        createMergedCell(sheet, workbook, 12, 8, 12, 13, 8, 10, "预算占比与实际占比差");
+//第七行
+        createMergedCell(sheet, workbook, 14, 0, 14, 15, 0, 3, "实际发生费用");
+        createMergedCell(sheet, workbook, 14, 4, 14, 15, 4, 5, "￥"+ resultVO.getProductionActualPrice().setScale(2, BigDecimal.ROUND_HALF_UP));
+        createMergedCell(sheet, workbook, 14, 6, 14, 15, 6, 7, (resultVO.getPredictRatio())+"%");
+        createMergedCell(sheet, workbook, 14, 8, 14, 15, 8, 10, (resultVO.getPredictAndActualRatio())+"%");
+//第八行
+        createMergedCell(sheet, workbook, 16, 0, 16, 17, 0, 3, "内部生产毛利润");
+        createMergedCell(sheet, workbook, 16, 4, 16, 17, 4, 5, "￥"+ resultVO.getGrossProfit());
+        createMergedCell(sheet, workbook, 16, 6, 16, 17, 6, 7, "");
+        createMergedCell(sheet, workbook, 16, 8, 16, 17, 8, 10, "");
+//第九行
+        createMergedCell(sheet, workbook, 18, 0, 18, 19, 0, 3, "内部生产固定成本");
+        createMergedCell(sheet, workbook, 18, 4, 18, 19, 4, 5, "￥"+ resultVO.getInnerProduceFixProfit());
+        createMergedCell(sheet, workbook, 18, 6, 18, 19, 6, 7, "");
+        createMergedCell(sheet, workbook, 18, 8, 18, 19, 8, 10, "");
+//第十行
+        createMergedCell(sheet, workbook, 20, 0, 20, 21, 0, 3, "内部生产提成");
+        createMergedCell(sheet, workbook, 20, 4, 20, 21, 4, 5, "￥"+ resultVO.getInnerProduceTotalPrice());
+        createMergedCell(sheet, workbook, 20, 6, 20, 21, 6, 7, "");
+        createMergedCell(sheet, workbook, 20, 8, 20, 21, 8, 10, "");
+ //第十一行
+        createMergedCell(sheet, workbook, 22, 0, 22, 23, 0, 3, "内部生产净利润");
+        createMergedCell(sheet, workbook, 22, 4, 22, 23, 4, 5, "￥"+ resultVO.getInnerProduceTotalProfit());
+        createMergedCell(sheet, workbook, 22, 6, 22, 23, 6, 7, "");
+        createMergedCell(sheet, workbook, 22, 8, 22, 23, 8, 10, "");
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; charset=UTF-8");
+        response.setHeader("Content-Disposition", "attachment; filename=\"-.xlsx\"");
+        workbook.write(response.getOutputStream());
+        workbook.close();
+        return ServerResult.success();
+    }
+    public void createMergedCell(Sheet sheet, Workbook workbook, int rowIndex, int colIndex, int startRow, int endRow, int startCol, int endCol, String value) {
+        // 创建或获取当前行
+        Row row = sheet.getRow(rowIndex);
+        if (row == null) {
+            row = sheet.createRow(rowIndex);
+        }
+
+        // 创建第一个单元格并设置值
+        Cell cell = row.createCell(colIndex);
+        cell.setCellValue(value);
+
+        // 创建边框样式
+        CellStyle titleStyle = workbook.createCellStyle();
+        Font titleFont = workbook.createFont();
+        titleFont.setFontHeightInPoints((short) 14); // 字体大小
+        titleFont.setBold(true); // 加粗
+        titleFont.setFontName("等线");
+        titleStyle.setAlignment(HorizontalAlignment.CENTER); // 水平居中
+        titleStyle.setVerticalAlignment(VerticalAlignment.CENTER); // 垂直居中
+        titleStyle.setFont(titleFont);
+
+        // 设置边框样式
+        titleStyle.setBorderTop(BorderStyle.THIN);
+        titleStyle.setBorderBottom(BorderStyle.THIN);
+        titleStyle.setBorderLeft(BorderStyle.THIN);
+        titleStyle.setBorderRight(BorderStyle.THIN);
+
+        // 应用样式到第一个单元格
+        cell.setCellStyle(titleStyle);
+
+        // 合并单元格
+        sheet.addMergedRegion(new CellRangeAddress(startRow, endRow, startCol, endCol));
+
+        // 为合并区域的每个单元格设置相同的样式
+        for (int rowIndexCurrent = startRow; rowIndexCurrent <= endRow; rowIndexCurrent++) {
+            for (int colIndexCurrent = startCol; colIndexCurrent <= endCol; colIndexCurrent++) {
+                Row currentRow = sheet.getRow(rowIndexCurrent);
+                if (currentRow == null) {
+                    currentRow = sheet.createRow(rowIndexCurrent);
+                }
+                Cell currentCell = currentRow.getCell(colIndexCurrent);
+                if (currentCell == null) {
+                    currentCell = currentRow.createCell(colIndexCurrent);
+                }
+                // 只为合并区域内的单元格设置样式
+                if (rowIndexCurrent == startRow && colIndexCurrent == colIndex) {
+                    currentCell.setCellStyle(titleStyle); // 为合并的单元格设置样式
+                } else {
+                    currentCell.setCellStyle(titleStyle); // 为其他合并的单元格设置样式
+                }
+            }
+        }
+    }
+
+
+
+    /**
+     * 业务/研发净利润分析
+     *
+     * @param queryVO
+     * @return
+     */
+    public ServerResult businessProfitRatio(BusinessProfitRatioQueryVO queryVO) {
+        BusinessProfitRatioResultVO resultVO = buildBusinessProfitRatioResultVO(queryVO);
+        return ServerResult.success(resultVO);
+    }
+    //都为人民币。
+    private BusinessProfitRatioResultVO buildBusinessProfitRatioResultVO(BusinessProfitRatioQueryVO queryVO) {
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(queryVO.getIds());
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            throw new BusinessException("订单数量为空");
+        }
+        Set<Long> orderIds = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toSet());
+        List<OrderProfitAnalysisDO> profitAnalysisList = orderProfitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderProfitAnalysisDO::getOrderId, orderIds));
+        List<OrderProfitAnalysisDO> profitAnalysisDOS = profitAnalysisList.stream()
+                .collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity(), (existing, replacement) -> existing))
+                .values()
+                .stream()
+                .collect(Collectors.toList());
+        if(CollectionUtils.isEmpty(profitAnalysisList) ||orderIds.size()!= profitAnalysisDOS.size()){
+            throw new BusinessException("勾选订单的利润信息未填写!");
+        }
+//        for(OrderProfitAnalysisDO analysisDO : profitAnalysisList){
+//            if(analysisDO.getCustomerPrice()==null){
+//                throw new BusinessException("勾选订单的利润信息未填写！");
+//            }
+//        }
+        int sumCount = orderBaseInfoDOList.stream().mapToInt(OrderBaseInfoDO::getOrderCount).sum();
+        Set<String> projectList = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getProjectNo).collect(Collectors.toSet());
+        //得到当前汇率。
+        BigDecimal exchangeRate = new BigDecimal(systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(SystemSettingDO::getSettingCode,"exchangeRate")
+                .last("limit 1")).getSettingValue());
+        BigDecimal spainRatioProfitPrice=new BigDecimal(Constant.ZERO);
+        BigDecimal chinaRatioProfitPrice=new BigDecimal(Constant.ZERO);
+        BigDecimal customerRmbTotalPrice = new BigDecimal(Constant.ZERO);
+        BigDecimal productionDepartmentTotalPrice = new BigDecimal(Constant.ZERO);
+        BigDecimal packetTotalPrice = new BigDecimal(Constant.ZERO);
+        BigDecimal fixCost = new BigDecimal(Constant.ZERO);
+        BigDecimal customerTotalPrice = new BigDecimal(Constant.ZERO);
+        String spainRatio = Constant.ZERO_STRING;
+        String chainRatio= Constant.ZERO_STRING;
+        String dailyCost=Constant.ZERO_STRING;
+        for (OrderProfitAnalysisDO profitAnalysisDO : profitAnalysisDOS) {
+            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));
+        }
+
+        //根据客户编码得到提成配置。
+        SystemSettingDO systemSettingServiceOne = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(SystemSettingDO::getSettingType, Constant.THREE)
+                .eq(SystemSettingDO::getSettingValue, queryVO.getCustomerCode())
+                .last("limit 1"));
+        if(Objects.nonNull(systemSettingServiceOne)){
+            //json反序列化。
+            List<CostSettingItemVO> costSettingItemVOList = JSONObject.parseObject(systemSettingServiceOne.getRelationValue(),  new TypeReference<List<CostSettingItemVO>>() {});
+            if( CollectionUtils.isNotEmpty(costSettingItemVOList)){
+                for (CostSettingItemVO relation : costSettingItemVOList) {
+                    if ("ratio".equals(relation.getRelationCode())) {
+                        chainRatio = relation.getRelationValue();
+                    }if ("spainRatio".equals(relation.getRelationCode())) {
+                        spainRatio = relation.getRelationValue();
+                    }if("fixCost".equals(relation.getRelationCode())){
+                        dailyCost=relation.getRelationValue();
+                    }
+                }
+            }
+        }
+        BigDecimal spainRatioValue = new BigDecimal(spainRatio);
+        BigDecimal chainRatioValue = new BigDecimal(chainRatio);
+        //当前系统配置中的提成比例没有配置时,中国和西班牙的金额就会为对应的o。
+        spainRatioProfitPrice = spainRatioValue.multiply(customerRmbTotalPrice);
+        chinaRatioProfitPrice = chainRatioValue.multiply(customerRmbTotalPrice);
+        BigDecimal dailyCostValue = new BigDecimal(dailyCost);
+        fixCost = dailyCostValue.multiply(new BigDecimal(getProjectDays(queryVO)));
+        BigDecimal outTotalPrice = customerRmbTotalPrice.add(productionDepartmentTotalPrice).add(packetTotalPrice)
+                .add(queryVO.getDevelopTotalPrice()).add(queryVO.getCopyTotalPrice())
+                .add(fixCost).add(spainRatioProfitPrice).add(chinaRatioProfitPrice);
+        BigDecimal developProfit = customerRmbTotalPrice.subtract(outTotalPrice);
+        BigDecimal packetProfitPrice = packetTotalPrice.subtract(queryVO.getPacketActualTotalPrice());
+        BigDecimal actualRatioProfitPrice = queryVO.getActualRatio().subtract(exchangeRate).multiply(customerTotalPrice).setScale(2, BigDecimal.ROUND_HALF_UP);
+        BigDecimal totalProfitPrice = developProfit.add(actualRatioProfitPrice).add(packetProfitPrice);
+        BusinessProfitRatioResultVO resultVO = new BusinessProfitRatioResultVO();
+        BeanUtils.copyProperties(queryVO, resultVO);
+        //5
+        resultVO.setCustomerTotalPrice(customerRmbTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+        //6
+        resultVO.setProductionDepartmentTotalPrice(productionDepartmentTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+//        resultVO.setPacketTotalPrice(packetTotalPrice.multiply(new BigDecimal(10 )).doubleValue());
+        //7
+        resultVO.setPacketTotalPrice(packetTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+        resultVO.setPacketTotalPriceCount(packetTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+        //9  如果没有配置固定成本,就会得到0。
+        resultVO.setFixCost(fixCost.setScale(2, BigDecimal.ROUND_HALF_UP));
+        //10.1
+        resultVO.setSpainRatioProfitPrice(spainRatioProfitPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+        //10.2
+        resultVO.setChinaRatioProfitPrice(chinaRatioProfitPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+        //11
+        resultVO.setOutTotalPrice(outTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+        //13
+        resultVO.setDevelopProfit(developProfit.setScale(2, BigDecimal.ROUND_HALF_UP));
+        //18
+        resultVO.setPacketProfitPrice(packetProfitPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+        //19
+        resultVO.setActualRatioProfitPrice(actualRatioProfitPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+        //20
+        resultVO.setTotalProfitPrice(totalProfitPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+        // 16
+        resultVO.setActualRmbPrice(queryVO.getPacketActualTotalPrice().divide(new BigDecimal(sumCount), 2, BigDecimal.ROUND_HALF_UP));
+        resultVO.setActualPrice((resultVO.getActualRmbPrice().divide(exchangeRate,2, BigDecimal.ROUND_HALF_UP)));
+        resultVO.setOrderCount(sumCount);
+        //12
+        resultVO.setGrossProfit(customerRmbTotalPrice.subtract(productionDepartmentTotalPrice).subtract(packetTotalPrice).setScale(2, BigDecimal.ROUND_HALF_UP));
+        resultVO.setProjectNo(String.join(",",projectList));
+        return resultVO;
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private int getProjectDays(BusinessProfitRatioQueryVO queryVO) {
+        String projectStartTime = queryVO.getProjectStartTime();
+
+        String projectEndTime = queryVO.getProjectEndTime();
+
+        return DateUtils.parseDate(projectEndTime, DateUtils.DATE).getDayOfYear() - DateUtils.parseDate(projectStartTime, DateUtils.DATE).getDayOfYear() + 1;
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private int getProjectDays(InnerProfitRatioQueryVO queryVO) {
+        String projectStartTime = queryVO.getProjectStartTime();
+
+        String projectEndTime = queryVO.getProjectEndTime();
+
+        return DateUtils.parseDate(projectEndTime, DateUtils.DATE).getDayOfYear() - DateUtils.parseDate(projectStartTime, DateUtils.DATE).getDayOfYear() + 1;
+    }
+
+    /**
+     *
+     * @param queryVO
+     * @return
+     */
+    private InnerProfitRatioResultVO buildInnerProfitRatioResultVO(InnerProfitRatioQueryVO queryVO) {
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(queryVO.getIds());
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            throw new BusinessException("订单数量为空");
+        }
+        Set<Long> orderIds = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toSet());
+        List<OrderProfitAnalysisDO> profitAnalysisList = orderProfitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderProfitAnalysisDO::getOrderId, orderIds));
+        //避免,订单重复,有多个orderid重复。
+        List<OrderProfitAnalysisDO> profitAnalysisDOS = profitAnalysisList.stream()
+                .collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity(), (existing, replacement) -> existing))
+                .values()
+                .stream()
+                .collect(Collectors.toList());
+        if(CollectionUtils.isEmpty(profitAnalysisList) || orderIds.size()!=profitAnalysisDOS.size()){
+            throw new BusinessException("勾选订单的利润信息未填写！");
+        }
+        int sumCount = orderBaseInfoDOList.stream().mapToInt(OrderBaseInfoDO::getOrderCount).sum();
+        Set<String> projectNoSet = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getProjectNo).collect(Collectors.toSet());
+        BigDecimal customerTotalPrice = new BigDecimal(Constant.ZERO);
+        BigDecimal productionDepartmentTotalPrice = new BigDecimal(Constant.ZERO);
+        String dailyCost=Constant.ZERO_STRING;
+        String price=Constant.ZERO_STRING;
+        BigDecimal dailyCostValue = new BigDecimal(Constant.ZERO);
+        BigDecimal priceValue = new BigDecimal(Constant.ZERO);
+        for (OrderProfitAnalysisDO profitAnalysisDO : profitAnalysisDOS) {
+            customerTotalPrice = customerTotalPrice.add(new BigDecimal(profitAnalysisDO.getCustomerRmbTotalPrice()));
+            productionDepartmentTotalPrice = productionDepartmentTotalPrice.add(new BigDecimal(profitAnalysisDO.getProductionDepartmentTotalPrice()));
+        }
+
+        SystemSettingDO systemSettingServiceOne = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(SystemSettingDO::getSettingType, Constant.FOUR)
+                .eq(SystemSettingDO::getSettingValue, queryVO.getCustomerCode())
+                .last("limit 1"));
+        if(Objects.nonNull(systemSettingServiceOne)){
+            //json反序列化。
+            List<CostSettingItemVO> costSettingItemVOList = JSONObject.parseObject(systemSettingServiceOne.getRelationValue(),  new TypeReference<List<CostSettingItemVO>>() {});
+            if( CollectionUtils.isNotEmpty(costSettingItemVOList)){
+                for (CostSettingItemVO relation : costSettingItemVOList) {
+                    //这里是系统配置中的得到的,应该是从系统配置中的生产科中得到。  固定成本。
+                   if("fixCost".equals(relation.getRelationCode())){
+                        dailyCost=relation.getRelationValue();
+                    }
+                   //生产提成单价
+                   if("ratio".equals(relation.getRelationCode())){
+                        price=relation.getRelationValue();
+                   }
+                }
+            }
+        }
+        dailyCostValue = new BigDecimal(dailyCost);
+        priceValue = new BigDecimal(price);
+        Integer projectDays = getProjectDays(queryVO);
+        BigDecimal innerProduceFixProfit = dailyCostValue.multiply(new BigDecimal(projectDays));
+        BigDecimal predictRatio=new BigDecimal(Constant.ZERO);
+        BigDecimal bigDecimal = new BigDecimal("1.05");
+        // 10
+        BigDecimal innerProduceTotalPrice = new BigDecimal(sumCount).multiply(priceValue);
+        // 7.1
+        if(Objects.nonNull(queryVO.getProductionDepartmentPredictPrice())  ){
+          if(queryVO.getProductionDepartmentPredictPrice().compareTo(BigDecimal.ZERO) == 0){
+          }else{
+              predictRatio = queryVO.getProductionActualPrice()
+                      .divide(queryVO.getProductionDepartmentPredictPrice(),2,BigDecimal.ROUND_HALF_UP);
+          }
+        }
+        //如果大于1.05则就把内部生产提成变为0
+        if(predictRatio.compareTo(bigDecimal)>0){
+            innerProduceTotalPrice=BigDecimal.ZERO;
+        }
+        // 7.2
+        BigDecimal predictAndActualRatio = new BigDecimal(Constant.ONE).subtract(predictRatio);
+        BigDecimal grossProfit = productionDepartmentTotalPrice.subtract(queryVO.getProductionActualPrice());
+        BigDecimal innerProduceTotalProfit = productionDepartmentTotalPrice.subtract(queryVO.getProductionActualPrice()).subtract(innerProduceTotalPrice).subtract(innerProduceFixProfit);
+
+
+        InnerProfitRatioResultVO resultVO = new InnerProfitRatioResultVO();
+        BeanUtils.copyProperties(queryVO, resultVO);
+        resultVO.setProjectDays(projectDays);
+        resultVO.setOrderCount(sumCount);
+        resultVO.setCustomerTotalPrice(customerTotalPrice.setScale(2, RoundingMode.HALF_UP).doubleValue());
+        // 5
+        resultVO.setProductionDepartmentTotalPrice(productionDepartmentTotalPrice.setScale(2, RoundingMode.HALF_UP));
+        // 9
+        resultVO.setInnerProduceFixProfit(innerProduceFixProfit.setScale(2, RoundingMode.HALF_UP));
+        // 7.1
+        resultVO.setPredictRatio(predictRatio.multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP));
+        // 将计算结果乘以 100，并四舍五入到整数
+        resultVO.setPredictAndActualRatio(predictAndActualRatio.multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP));
+        // 8
+        resultVO.setGrossProfit(grossProfit.setScale(2, RoundingMode.HALF_UP));
+        // 10
+        resultVO.setInnerProduceTotalPrice(innerProduceTotalPrice.setScale(2, RoundingMode.HALF_UP));
+        // 11
+        resultVO.setInnerProduceTotalProfit(innerProduceTotalProfit.setScale(2, RoundingMode.HALF_UP));
+        //项目号
+        resultVO.setProjectNo(String.join(", ", projectNoSet));
+        return resultVO;
+    }
+
+    /**
+     * 内部生产净利润分析表
+     *
+     * @param queryVO
+     * @return
+     */
+    public ServerResult innerProfitRatio(InnerProfitRatioQueryVO queryVO) {
+        InnerProfitRatioResultVO resultVO = buildInnerProfitRatioResultVO(queryVO);
+        return ServerResult.success(resultVO);
+    }
+}
+package com.order.erp.service.order.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.utils.PageUtils;
+import com.order.erp.domain.dto.order.CheckBillMappingDO;
+import com.order.erp.domain.vo.order.CheckBillMappingQueryVO;
+import com.order.erp.domain.vo.order.CheckBillMappingVO;
+import com.order.erp.mapper.order.CheckBillMappingMapper;
+import com.order.erp.service.order.CheckBillMappingService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 生产科对账单应收账单映射表(CheckBillMapping)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:37
+ */
+@Slf4j
+@Service
+public class CheckBillMappingServiceImpl extends ServiceImpl<CheckBillMappingMapper, CheckBillMappingDO> implements CheckBillMappingService {
+
+
+    /**
+     * 通过ID查询单条数据
+     * <p>
+     * checkBillMappingQueryVO 主键
+     *
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult queryById(CheckBillMappingQueryVO checkBillMappingQueryVO) {
+        if (Objects.isNull(checkBillMappingQueryVO.getId())) {
+            return ServerResult.fail("id 不能为空");
+        }
+        CheckBillMappingDO CheckBillMappingDo = getById(checkBillMappingQueryVO.getId());
+        if (Objects.isNull(CheckBillMappingDo)) {
+            return ServerResult.success(null);
+        }
+        return ServerResult.success(BeanUtil.copyProperties(CheckBillMappingDo, CheckBillMappingVO.class));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param checkBillMappingQueryVO 筛选条件
+     * @return 查询结果
+     */
+    @Override
+    public ServerResult list(CheckBillMappingQueryVO checkBillMappingQueryVO) {
+
+        LambdaQueryWrapper<CheckBillMappingDO> queryWapper = new LambdaQueryWrapper<CheckBillMappingDO>()
+                .eq(CheckBillMappingDO::getEnableFlag, Constant.ENABLE_TEN)
+                .orderByDesc(CheckBillMappingDO::getId);
+        Page page = new Page<>(checkBillMappingQueryVO.getPage(), checkBillMappingQueryVO.getPageSize());
+        IPage<CheckBillMappingDO> iPage = page(page, queryWapper);
+        checkBillMappingQueryVO.setTotal(Long.valueOf(iPage.getTotal()).intValue());
+        return ServerResult.success(PageUtils.getPageReturn(null, checkBillMappingQueryVO));
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param checkBillMappingVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult add(CheckBillMappingVO checkBillMappingVO) {
+        //todo 校验
+        if (Objects.nonNull(checkBillMappingVO.getId())) {
+            checkBillMappingVO.setId(null);
+        }
+        CheckBillMappingDO checkBillMappingDo = BeanUtil.copyProperties(checkBillMappingVO, CheckBillMappingDO.class);
+
+        save(checkBillMappingDo);
+
+        return ServerResult.success();
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param checkBillMappingVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult edit(CheckBillMappingVO checkBillMappingVO) {
+        //todo 校验
+        if (Objects.isNull(checkBillMappingVO.getId())) {
+            return ServerResult.fail("id 不能为空");
+        }
+        CheckBillMappingDO checkBillMappingDo = BeanUtil.copyProperties(checkBillMappingVO, CheckBillMappingDO.class);
+
+        updateById(checkBillMappingDo);
+
+        return ServerResult.success();
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param checkBillMappingQueryVO 筛选条件
+     * @return 是否成功
+     */
+    @Override
+    public ServerResult deleteById(CheckBillMappingQueryVO checkBillMappingQueryVO) {
+        List<Long> ids = checkBillMappingQueryVO.getIds();
+        if (CollUtil.isEmpty(ids)) {
+            return ServerResult.fail("ids 参数不能为空");
+        }
+        List<CheckBillMappingDO> checkBillMappingList = listByIds(ids);
+        if (CollUtil.isEmpty(checkBillMappingList)) {
+            return ServerResult.success();
+        }
+        //todo 校验是否可以逻辑删除
+        LambdaUpdateWrapper<CheckBillMappingDO> updateWrapper = new LambdaUpdateWrapper<CheckBillMappingDO>()
+                .in(CheckBillMappingDO::getId, ids)
+                .set(CheckBillMappingDO::getEnableFlag, Constant.UNABLE_TWENTY);
+        update(updateWrapper);
+        return ServerResult.success();
+    }
+}
+package com.order.erp.service.order.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.utils.PageUtils;
+import com.order.erp.domain.dto.order.InvoiceBillMappingDO;
+import com.order.erp.domain.vo.order.InvoiceBillMappingQueryVO;
+import com.order.erp.domain.vo.order.InvoiceBillMappingVO;
+import com.order.erp.mapper.order.InvoiceBillMappingMapper;
+import com.order.erp.service.order.InvoiceBillMappingService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 应收款账单关联订单映射表(InvoiceBillMapping)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:36
+ */
+@Slf4j
+@Service
+public class InvoiceBillMappingServiceImpl extends ServiceImpl<InvoiceBillMappingMapper, InvoiceBillMappingDO> implements InvoiceBillMappingService {
+
+
+    /**
+     * 通过ID查询单条数据
+     * <p>
+     * invoiceBillMappingQueryVO 主键
+     *
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult queryById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO) {
+        if (Objects.isNull(invoiceBillMappingQueryVO.getId())) {
+            return ServerResult.fail("id 不能为空");
+        }
+        InvoiceBillMappingDO InvoiceBillMappingDo = getById(invoiceBillMappingQueryVO.getId());
+        if (Objects.isNull(InvoiceBillMappingDo)) {
+            return ServerResult.success(null);
+        }
+        return ServerResult.success(BeanUtil.copyProperties(InvoiceBillMappingDo, InvoiceBillMappingVO.class));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param invoiceBillMappingQueryVO 筛选条件
+     * @return 查询结果
+     */
+    @Override
+    public ServerResult list(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO) {
+
+        LambdaQueryWrapper<InvoiceBillMappingDO> queryWapper = new LambdaQueryWrapper<InvoiceBillMappingDO>()
+                .eq(InvoiceBillMappingDO::getEnableFlag, Constant.ENABLE_TEN)
+                .orderByDesc(InvoiceBillMappingDO::getId);
+        Page page = new Page<>(invoiceBillMappingQueryVO.getPage(), invoiceBillMappingQueryVO.getPageSize());
+        IPage<InvoiceBillMappingDO> iPage = page(page, queryWapper);
+        invoiceBillMappingQueryVO.setTotal(Long.valueOf(iPage.getTotal()).intValue());
+        return ServerResult.success(PageUtils.getPageReturn(null, invoiceBillMappingQueryVO));
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param invoiceBillMappingVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult add(InvoiceBillMappingVO invoiceBillMappingVO) {
+        //todo 校验
+        if (Objects.nonNull(invoiceBillMappingVO.getId())) {
+            invoiceBillMappingVO.setId(null);
+        }
+        InvoiceBillMappingDO invoiceBillMappingDo = BeanUtil.copyProperties(invoiceBillMappingVO, InvoiceBillMappingDO.class);
+
+        save(invoiceBillMappingDo);
+
+        return ServerResult.success();
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param invoiceBillMappingVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult edit(InvoiceBillMappingVO invoiceBillMappingVO) {
+        //todo 校验
+        if (Objects.isNull(invoiceBillMappingVO.getId())) {
+            return ServerResult.fail("id 不能为空");
+        }
+        InvoiceBillMappingDO invoiceBillMappingDo = BeanUtil.copyProperties(invoiceBillMappingVO, InvoiceBillMappingDO.class);
+
+        updateById(invoiceBillMappingDo);
+
+        return ServerResult.success();
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param invoiceBillMappingQueryVO 筛选条件
+     * @return 是否成功
+     */
+    @Override
+    public ServerResult deleteById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO) {
+        List<Long> ids = invoiceBillMappingQueryVO.getIds();
+        if (CollUtil.isEmpty(ids)) {
+            return ServerResult.fail("ids 参数不能为空");
+        }
+        List<InvoiceBillMappingDO> invoiceBillMappingList = listByIds(ids);
+        if (CollUtil.isEmpty(invoiceBillMappingList)) {
+            return ServerResult.success();
+        }
+        //todo 校验是否可以逻辑删除
+        LambdaUpdateWrapper<InvoiceBillMappingDO> updateWrapper = new LambdaUpdateWrapper<InvoiceBillMappingDO>()
+                .in(InvoiceBillMappingDO::getId, ids)
+                .set(InvoiceBillMappingDO::getEnableFlag, Constant.UNABLE_TWENTY);
+        update(updateWrapper);
+        return ServerResult.success();
+    }
+}
+package com.order.erp.service.order.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.stupdit1t.excel.common.PoiWorkbookType;
+import com.github.stupdit1t.excel.core.ExcelHelper;
+import com.github.stupdit1t.excel.style.CellPosition;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.constant.ServerResultCode;
+import com.order.erp.common.exception.BusinessException;
+import com.order.erp.common.utils.DateUtils;
+import com.order.erp.common.utils.StringUtils;
+import com.order.erp.common.utils.TransactionHelper;
+import com.order.erp.config.DataScope;
+import com.order.erp.domain.ApplyStatusEnum;
+import com.order.erp.domain.ApplyTypeEnum;
+import com.order.erp.domain.RoleEnum;
+import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.SystemSettingDO;
+import com.order.erp.domain.dto.order.*;
+import com.order.erp.domain.vo.order.*;
+import com.order.erp.mapper.order.InvoiceBillOrderMapper;
+import com.order.erp.service.SystemSettingService;
+import com.order.erp.service.order.*;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@Slf4j
+@Service
+public class InvoiceBillOrderServiceImpl extends ServiceImpl<InvoiceBillOrderMapper, InvoiceBillOrderDO> implements InvoiceBillOrderService {
+
+
+    @Resource
+    private OrderBaseInfoService orderBaseInfoService;
+
+    @Resource
+    private OrderProfitAnalysisService profitAnalysisService;
+
+    @Resource
+    private InvoiceBillMappingService invoiceBillMappingService;
+
+    @Resource
+    private OrderFieldLockApplyService orderFieldLockApplyService;
+
+    @Resource
+    private SystemSettingService systemSettingService;
+
+    @Resource
+    private DataScope dataScope;
+
+    @Resource
+    private TransactionHelper transactionHelper;
+
+
+    /**
+     * 分页查询
+     *
+     * @param queryVO 筛选条件
+     * @return 查询结果
+     */
+    @Override
+    public ServerResult listByPage(InvoiceBillOrderQueryVO queryVO) {
+        RoleEnum role = dataScope.getRole();
+        LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
+        //跟单也只能看到自己创建的   业务只能看到自己的
+        if(Objects.nonNull(role) && role.getId().equals(RoleEnum.TRACKER_USER.getId())){
+            queryWrapper.eq(InvoiceBillOrderDO::getCreateBy, dataScope.getLoginUserName());
+        }
+        if(Objects.nonNull(role) && role.getId().equals(RoleEnum.BUSINESS_USER.getId())){
+            queryWrapper.eq(InvoiceBillOrderDO::getBusinesPerson, dataScope.getLoginUserName());
+        }
+        Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
+        IPage<InvoiceBillOrderDO> iPage = page(page, queryWrapper);
+        return ServerResult.success(iPage);
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private LambdaQueryWrapper<InvoiceBillOrderDO> getQueryWrapper(InvoiceBillOrderQueryVO queryVO) {
+        LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = new LambdaQueryWrapper<InvoiceBillOrderDO>()
+                .eq(InvoiceBillOrderDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(StringUtils.isNotBlank(queryVO.getInvoiceNo()), InvoiceBillOrderDO::getInvoiceNo, queryVO.getInvoiceNo())
+                .eq(Objects.nonNull(queryVO.getStatus()), InvoiceBillOrderDO::getStatus, queryVO.getStatus())
+                .ge(StringUtils.isNotBlank(queryVO.getStartTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getStartTime())
+                .le(StringUtils.isNotBlank(queryVO.getEndTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getEndTime())
+                .orderByDesc(InvoiceBillOrderDO::getId);
+        if (CollectionUtils.isNotEmpty(queryVO.getIds())) {
+            queryWrapper.in(InvoiceBillOrderDO::getId, queryVO.getIds());
+        } else {
+            Set<Long> billOrderIds = filterBillOrderIdsBy(queryVO);
+            queryWrapper.in(CollectionUtils.isNotEmpty(billOrderIds), InvoiceBillOrderDO::getId, billOrderIds);
+        }
+        return queryWrapper;
+    }
+
+    @Override
+    public ServerResult listBaseOrderInfoBy(InvoiceBaseOrderQueryVO queryVO) {
+        List<InvoiceBillMappingDO> mappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(InvoiceBillMappingDO::getInvoiceNo, queryVO.getInvoiceNo()));
+        if (CollectionUtils.isEmpty(mappingDOS)) {
+            return ServerResult.success();
+        }
+        Set<Long> orderIds = mappingDOS.stream().map(InvoiceBillMappingDO::getOrderId).collect(Collectors.toSet());
+        //返回数据包含利润信息。
+        //创建返回的数据,里面包含订单信息和利润信息,然后放到list集合中。
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
+        List<OrderProfitAnalysisDO> orderProfitAnalysisDOList = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderProfitAnalysisDO::getOrderId, orderIds));
+        Map<Long, OrderBaseInfoDO> orderBaseInfoDOMap = orderBaseInfoDOList.stream().collect(Collectors.toMap(OrderBaseInfoDO::getId, Function.identity(), (x, y) -> x));
+        Map<Long, OrderProfitAnalysisDO> orderProfitAnalysisDOMap = orderProfitAnalysisDOList.stream().collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity(), (x, y) -> x));
+        List<InvoiceBillOrdeBaserResultVO> list = orderBaseInfoDOList.stream().map(x -> {
+            if (orderBaseInfoDOMap.containsKey(x.getId()) && orderProfitAnalysisDOMap.containsKey(x.getId())) {
+                InvoiceBillOrdeBaserResultVO resultVO = new InvoiceBillOrdeBaserResultVO();
+                resultVO.setCustomerCode(orderBaseInfoDOMap.get(x.getId()).getCustomerCode());
+                resultVO.setProjectNo(orderBaseInfoDOMap.get(x.getId()).getProjectNo());
+                resultVO.setInnerNo(orderBaseInfoDOMap.get(x.getId()).getInnerNo());
+                resultVO.setCustomerPo(orderBaseInfoDOMap.get(x.getId()).getCustomerPo());
+                resultVO.setCustomerStyle(orderBaseInfoDOMap.get(x.getId()).getCustomerStyle());
+                resultVO.setModeleLo(orderBaseInfoDOMap.get(x.getId()).getModeleLo());
+                resultVO.setSmallPicUrl(orderBaseInfoDOMap.get(x.getId()).getSmallPicUrl());
+                resultVO.setOrderCount(orderBaseInfoDOMap.get(x.getId()).getOrderCount());
+                resultVO.setCustomerPrice(orderProfitAnalysisDOMap.get(x.getId()).getCustomerPrice());
+                resultVO.setCustomerTotalPrice(orderProfitAnalysisDOMap.get(x.getId()).getCustomerTotalPrice());
+                return resultVO;
+            }else{
+                return null;
+            }
+        }).filter(Objects::nonNull).collect(Collectors.toList());
+        return ServerResult.success(list);
+    }
+
+    @Override
+    public ServerResult listAnalysisBy(InvoiceBillAnalysisVO queryVO) {
+        return ServerResult.success(getAnalysisResult(queryVO));
+    }
+
+    @Override
+    public ServerResult export(HttpServletResponse response, InvoiceBillAnalysisVO queryVO) throws IOException {
+//        InvoiceBillAnalysisResultVO resultVO = getAnalysisResult(queryVO);
+        //第二版
+       List<InvoiceBillAnalysisResultVO> resultVO = getAnalysisResult(queryVO);
+       //第二版截止。
+        if (Objects.isNull(resultVO)) {
+            throw new BusinessException("数据为空，不能导出！");
+        }
+        List<Map<String, Object>> list = buildExportMapVOS(resultVO);
+        if (CollectionUtils.isNotEmpty(list)) {
+            List<String> keys = new ArrayList<>(list.get(Constant.ZERO).keySet());
+
+            ExcelHelper.opsExport(PoiWorkbookType.XLSX)
+                    .opsSheet(list)
+                    .opsHeader().simple().texts(keys).done()
+                    .opsColumn().fields(keys).done()
+                    .height(CellPosition.CELL, 750)
+                    .done()
+                    .export(response.getOutputStream());
+        }
+        return ServerResult.success();
+    }
+
+    /**
+     * @param resultVO
+     * @return
+     */
+//    private List<Map<String, Object>> buildExportMapVOS(InvoiceBillAnalysisResultVO resultVO)  {
+    //第二版
+    private List<Map<String, Object>> buildExportMapVOS(List<InvoiceBillAnalysisResultVO> resultVO)  {
+/*        List<InvoiceBillAnalysisExportVO> exportVOS = resultVO.getExportVOS();
+        List<Map<String, Object>> list = new ArrayList<>();
+        int i = 0;
+        for (InvoiceBillAnalysisExportVO exportVO : exportVOS) {
+            Map<String, Object> map = new LinkedHashMap<>();
+            map.put("编号", i++);
+            map.put("客户编码", exportVO.getCustomerCode());
+            map.put("INVOICE编码", exportVO.getInvoiceNo());
+            map.put("客户总金额汇总", exportVO.getCustomerTotalPrice());
+            map.put("客户扣款金额汇总", exportVO.getDeductAmount());
+            map.put("实际应收金额", exportVO.getActualReceivableAmount());
+            map.put("实际收款金额汇总", exportVO.getActualPayedAmount());
+            map.put("其他费用金额汇总", exportVO.getOtherAmount());
+            map.put("其他费用合计", exportVO.getOtherTotalAmount());
+            map.put("必须回款日期", exportVO.getBackRefundDate());
+            map.put("实际回款日期", exportVO.getActualRefundDate());
+            list.add(map);
+        }
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("编号", "合计");
+        map.put("客户编码", "");
+        map.put("INVOICE编码", "");
+        map.put("客户总金额汇总", resultVO.getCustomerTotalPrice());
+        map.put("客户扣款金额汇总", resultVO.getDeductAmount());
+        map.put("实际应收金额", resultVO.getActualReceivableAmount());
+        map.put("实际收款金额汇总", resultVO.getActualPayedAmount());
+        map.put("其他费用金额汇总", resultVO.getOtherAmount());
+        map.put("其他费用合计", resultVO.getOtherTotalAmount());
+        map.put("必须回款日期", "");
+        map.put("实际回款日期", "");
+        list.add(map);
+        return list;*/
+
+
+
+
+
+
+//      List<InvoiceBillAnalysisExportVO> exportVOS = resultVO.getExportVOS();
+        //第二版开始
+        List<InvoiceBillAnalysisExportVO> exportVOS = resultVO.stream()
+                .flatMap(X -> X.getExportVOS().stream())  // 展开每个 resultVO 的 exportVOS 列表
+                .collect(Collectors.toList());  // 将所有结果收集到一个列表中
+        //第二版截止
+        List<Map<String, Object>> list = new ArrayList<>();
+        int i = 1; // Start index from 1
+
+        // 根据客户编码分组
+        Map<String, List<InvoiceBillAnalysisExportVO>> customerGroupedMap = exportVOS.stream()
+                .collect(Collectors.groupingBy(InvoiceBillAnalysisExportVO::getCustomerCode));
+
+        boolean multipleCustomerCodes = customerGroupedMap.size() > 1;
+
+        BigDecimal totalCustomerTotalPrice = BigDecimal.ZERO;
+        BigDecimal totalDeductAmount = BigDecimal.ZERO;
+        BigDecimal totalActualReceivableAmount = BigDecimal.ZERO;
+        BigDecimal totalActualPayedAmount = BigDecimal.ZERO;
+        BigDecimal totalOtherAmount = BigDecimal.ZERO;
+        BigDecimal totalOtherTotalAmount = BigDecimal.ZERO;
+
+        for (Map.Entry<String, List<InvoiceBillAnalysisExportVO>> entry : customerGroupedMap.entrySet()) {
+            String customerCode = entry.getKey();
+            List<InvoiceBillAnalysisExportVO> customerItems = entry.getValue();
+
+            BigDecimal subTotalCustomerTotalPrice = BigDecimal.ZERO;
+            BigDecimal subTotalDeductAmount = BigDecimal.ZERO;
+            BigDecimal subTotalActualReceivableAmount = BigDecimal.ZERO;
+            BigDecimal subTotalActualPayedAmount = BigDecimal.ZERO;
+            BigDecimal subTotalOtherAmount = BigDecimal.ZERO;
+            BigDecimal subTotalOtherTotalAmount = BigDecimal.ZERO;
+
+            for (InvoiceBillAnalysisExportVO exportVO : customerItems) {
+                Map<String, Object> map = new LinkedHashMap<>();
+                map.put("编号", i++);
+                map.put("客户编码", exportVO.getCustomerCode());
+                map.put("INVOICE编码", exportVO.getInvoiceNo());
+                map.put("客户总金额汇总", "$"+exportVO.getCustomerTotalPrice());
+                map.put("客户扣款金额汇总", "$"+exportVO.getDeductAmount());
+                map.put("实际应收金额", "$"+exportVO.getActualReceivableAmount());
+                map.put("实际收款金额汇总", "$"+exportVO.getActualPayedAmount());
+                map.put("其他费用金额汇总","$"+exportVO.getOtherAmount());
+                map.put("未收金额合计", "$"+exportVO.getOtherTotalAmount());
+                map.put("必须回款日期", exportVO.getBackRefundDate());
+                map.put("实际回款日期", exportVO.getActualRefundDate());
+                list.add(map);
+
+                // 初始化数据
+                subTotalCustomerTotalPrice = subTotalCustomerTotalPrice.add(exportVO.getCustomerTotalPrice() == null ? BigDecimal.ZERO : exportVO.getCustomerTotalPrice());
+                subTotalDeductAmount = subTotalDeductAmount.add(exportVO.getDeductAmount() == null ? BigDecimal.ZERO : exportVO.getDeductAmount());
+                subTotalActualReceivableAmount = subTotalActualReceivableAmount.add(exportVO.getActualReceivableAmount() == null ? BigDecimal.ZERO : exportVO.getActualReceivableAmount());
+                subTotalActualPayedAmount = subTotalActualPayedAmount.add(exportVO.getActualPayedAmount() == null ? BigDecimal.ZERO : exportVO.getActualPayedAmount());
+                subTotalOtherAmount = subTotalOtherAmount.add(exportVO.getOtherAmount() == null ? BigDecimal.ZERO : exportVO.getOtherAmount());
+                subTotalOtherTotalAmount = subTotalOtherTotalAmount.add(exportVO.getOtherTotalAmount() == null ? BigDecimal.ZERO : exportVO.getOtherTotalAmount());
+            }
+
+            // 如果客户编码有多个就添加小计。
+            if (multipleCustomerCodes) {
+                Map<String, Object> subTotalMap = new LinkedHashMap<>();
+                subTotalMap.put("编号", "小计");
+                subTotalMap.put("客户编码", "");
+                subTotalMap.put("INVOICE编码", "");
+                subTotalMap.put("客户总金额汇总", "$"+subTotalCustomerTotalPrice);
+                subTotalMap.put("客户扣款金额汇总", "$"+subTotalDeductAmount);
+                subTotalMap.put("实际应收金额", "$"+subTotalActualReceivableAmount);
+                subTotalMap.put("实际收款金额汇总", "$"+subTotalActualPayedAmount);
+                subTotalMap.put("其他费用金额汇总", "$"+subTotalOtherAmount);
+                subTotalMap.put("未收金额合计", "$"+subTotalOtherTotalAmount);
+                subTotalMap.put("必须回款日期", "");
+                subTotalMap.put("实际回款日期", "");
+                list.add(subTotalMap);
+            }
+
+            // Calculate totals
+            totalCustomerTotalPrice = totalCustomerTotalPrice.add(subTotalCustomerTotalPrice);
+            totalDeductAmount = totalDeductAmount.add(subTotalDeductAmount);
+            totalActualReceivableAmount = totalActualReceivableAmount.add(subTotalActualReceivableAmount);
+            totalActualPayedAmount = totalActualPayedAmount.add(subTotalActualPayedAmount);
+            totalOtherAmount = totalOtherAmount.add(subTotalOtherAmount);
+            totalOtherTotalAmount = totalOtherTotalAmount.add(subTotalOtherTotalAmount);
+        }
+
+        // 计算总数据。
+        Map<String, Object> totalMap = new LinkedHashMap<>();
+        totalMap.put("编号", "合计");
+        totalMap.put("客户编码", "");
+        totalMap.put("INVOICE编码", "");
+        totalMap.put("客户总金额汇总", "$"+totalCustomerTotalPrice);
+        totalMap.put("客户扣款金额汇总", "$"+totalDeductAmount);
+        totalMap.put("实际应收金额", "$"+totalActualReceivableAmount);
+        totalMap.put("实际收款金额汇总", "$"+totalActualPayedAmount);
+        totalMap.put("其他费用金额汇总", "$"+totalOtherAmount);
+        totalMap.put("未收金额合计", "$"+totalOtherTotalAmount);
+        totalMap.put("必须回款日期", "");
+        totalMap.put("实际回款日期", "");
+        list.add(totalMap);
+
+        return list;
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+//    private InvoiceBillAnalysisResultVO getAnalysisResult(InvoiceBillAnalysisVO queryVO) {
+    //第二版
+    private List<InvoiceBillAnalysisResultVO> getAnalysisResult(InvoiceBillAnalysisVO queryVO) {
+        LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
+        List<InvoiceBillOrderDO> invoiceBillOrderDOS = list(queryWrapper);
+        if (CollectionUtils.isEmpty(invoiceBillOrderDOS)) {
+            return null;
+        }
+        Set<Long> ids = invoiceBillOrderDOS.stream().map(InvoiceBillOrderDO::getId).collect(Collectors.toSet());
+        List<InvoiceBillMappingDO> invoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(InvoiceBillMappingDO::getInvoiceBillId, ids));
+        if (CollectionUtils.isEmpty(invoiceBillMappingDOS)) {
+            return null;
+        }
+        Map<Long, InvoiceBillMappingDO> orderBillMap = invoiceBillMappingDOS.stream().collect(Collectors.toMap(InvoiceBillMappingDO::getOrderId, Function.identity(), (x, y) -> x));
+        List<InvoiceOrderBaseItemVO> itemVOS = getInvoiceOrderBaseItems(orderBillMap);
+        Map<String, InvoiceBillOrderDO> invoiceBillOrderDOMap = invoiceBillOrderDOS.stream().collect(Collectors.toMap(InvoiceBillOrderDO::getInvoiceNo, Function.identity(), (x, y) -> x));
+        Map<String, List<InvoiceOrderBaseItemVO>> baseItemMap = itemVOS.stream().collect(Collectors.groupingBy(InvoiceOrderBaseItemVO::getInvoiceCode));
+        List<InvoiceBillAnalysisExportVO> exportVOS = wrapperAnalysisExport(invoiceBillOrderDOMap, baseItemMap);
+        return wrapperAnalysisResultVO(exportVOS);
+    }
+
+    /**
+     * @param exportVOS
+     * @return
+     */
+//    private InvoiceBillAnalysisResultVO wrapperAnalysisResultVO(List<InvoiceBillAnalysisExportVO> exportVOS) {
+//        if (CollectionUtils.isEmpty(exportVOS)) {
+//            return null;
+//        }
+//        InvoiceBillAnalysisResultVO resultVO = InvoiceBillAnalysisResultVO.builder().exportVOS(exportVOS).build();
+//        BigDecimal customerTotalPrice = new BigDecimal(Constant.ZERO);
+//        BigDecimal deductAmount = new BigDecimal(Constant.ZERO);
+////        BigDecimal actualReceivableAmount = new BigDecimal(Constant.ZERO);
+//        BigDecimal actualPayedAmount = new BigDecimal(Constant.ZERO);
+////        BigDecimal otherAmount = new BigDecimal(Constant.ZERO);
+//        BigDecimal otherTotalAmount = new BigDecimal(Constant.ZERO);
+//        for (InvoiceBillAnalysisExportVO exportVO : exportVOS) {
+//            if (Objects.nonNull(exportVO.getCustomerTotalPrice())) {
+//                customerTotalPrice = customerTotalPrice.add(exportVO.getCustomerTotalPrice());
+//            }
+//            if (Objects.nonNull(exportVO.getDeductAmount())) {
+//                deductAmount = deductAmount.add(exportVO.getDeductAmount());
+//            }
+////            if (Objects.nonNull(exportVO.getActualReceivableAmount())) {
+////                actualReceivableAmount = actualReceivableAmount.add(exportVO.getActualReceivableAmount());
+////            }
+//            if (Objects.nonNull(exportVO.getActualPayedAmount())) {
+//                actualPayedAmount = actualPayedAmount.add(exportVO.getActualPayedAmount());
+//            }
+////            if (Objects.nonNull(exportVO.getOtherAmount())) {
+////                otherAmount = customerTotalPrice.add(exportVO.getOtherAmount());
+////            }
+//            if (Objects.nonNull(exportVO.getOtherTotalAmount())) {
+//                otherTotalAmount = otherTotalAmount.add(exportVO.getOtherTotalAmount());
+//            }
+//        }
+//        //5889---1  正确
+//        resultVO.setCustomerTotalPrice(customerTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+//        //2---2     正确
+//        resultVO.setDeductAmount(deductAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
+//        //3003---4   错误
+////        resultVO.setActualReceivableAmount(actualReceivableAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
+//        resultVO.setActualReceivableAmount(actualPayedAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
+//        //0---5     错误  每个订单的合计的其他费用。  (已改正)
+//        resultVO.setOtherTotalAmount(otherTotalAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
+//        //5890---3  错误  1-2得到
+////        resultVO.setOtherAmount(otherAmount);
+//        //改正后
+//        resultVO.setOtherAmount(resultVO.getCustomerTotalPrice().subtract(resultVO.getDeductAmount()).setScale(2, BigDecimal.ROUND_HALF_UP));
+//        //2997---wu
+////        resultVO.setActualPayedAmount(actualPayedAmount);
+//        //已改正
+//        resultVO.setActualPayedAmount(resultVO.getOtherAmount().subtract(resultVO.getActualReceivableAmount()).subtract(resultVO.getOtherTotalAmount()).setScale(2, BigDecimal.ROUND_HALF_UP));
+//        return resultVO;
+//    }
+
+    //第二版
+    private List<InvoiceBillAnalysisResultVO> wrapperAnalysisResultVO(List<InvoiceBillAnalysisExportVO> exportVOS) {
+        if (CollectionUtils.isEmpty(exportVOS)) {
+            return Collections.emptyList();
+        }
+
+        // 按 customerCode 进行分组
+        Map<String, List<InvoiceBillAnalysisExportVO>> groupedByCustomerCode = exportVOS.stream()
+                .collect(Collectors.groupingBy(InvoiceBillAnalysisExportVO::getCustomerCode));
+
+        List<InvoiceBillAnalysisResultVO> resultList = new ArrayList<>();
+
+        // 遍历分组后的数据
+        groupedByCustomerCode.forEach((customerCode, exportVOList) -> {
+            InvoiceBillAnalysisResultVO resultVO = InvoiceBillAnalysisResultVO.builder().exportVOS(exportVOList).build();
+            BigDecimal customerTotalPrice = new BigDecimal(Constant.ZERO);
+            BigDecimal deductAmount = new BigDecimal(Constant.ZERO);
+            BigDecimal actualPayedAmount = new BigDecimal(Constant.ZERO);
+          BigDecimal otherTotalAmount = new BigDecimal(Constant.ZERO);
+
+            // 对每个 customerCode 对应的 InvoiceBillAnalysisExportVO 列表进行处理
+            for (InvoiceBillAnalysisExportVO exportVO : exportVOList) {
+                if (Objects.nonNull(exportVO.getCustomerTotalPrice())) {
+                    customerTotalPrice = customerTotalPrice.add(exportVO.getCustomerTotalPrice());
+                }
+                if (Objects.nonNull(exportVO.getDeductAmount())) {
+                    deductAmount = deductAmount.add(exportVO.getDeductAmount());
+                }
+                if (Objects.nonNull(exportVO.getActualPayedAmount())) {
+                    actualPayedAmount = actualPayedAmount.add(exportVO.getActualPayedAmount());
+                }
+               if (Objects.nonNull(exportVO.getOtherTotalAmount())) {
+                  otherTotalAmount = otherTotalAmount.add(exportVO.getOtherAmount());
+                }
+            }
+            // 设置计算后的结果
+            resultVO.setCustomerTotalPrice(customerTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+            resultVO.setDeductAmount(deductAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
+            resultVO.setActualReceivableAmount(actualPayedAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
+            resultVO.setOtherTotalAmount(otherTotalAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
+            resultVO.setOtherAmount(resultVO.getCustomerTotalPrice().subtract(resultVO.getDeductAmount()).setScale(2, BigDecimal.ROUND_HALF_UP));
+            //未收金额汇总。
+            resultVO.setActualPayedAmount(resultVO.getOtherAmount().subtract(resultVO.getActualReceivableAmount()).subtract(resultVO.getOtherTotalAmount()).setScale(2, BigDecimal.ROUND_HALF_UP));
+
+            // 添加到结果列表
+            resultList.add(resultVO);
+        });
+
+        return resultList;
+    }
+
+
+    /**
+     * @param invoiceBillOrderDOMap
+     * @param baseItemMap
+     * @return
+     */
+    private List<InvoiceBillAnalysisExportVO> wrapperAnalysisExport(Map<String, InvoiceBillOrderDO> invoiceBillOrderDOMap, Map<String, List<InvoiceOrderBaseItemVO>> baseItemMap) {
+        if (CollectionUtils.isEmpty(invoiceBillOrderDOMap)) {
+            return Collections.emptyList();
+        }
+        List<InvoiceBillAnalysisExportVO> results = new ArrayList<>();
+        for (Map.Entry<String, InvoiceBillOrderDO> entry : invoiceBillOrderDOMap.entrySet()) {
+            InvoiceBillOrderDO invoiceBillOrderDO = entry.getValue();
+            List<InvoiceBillAnalysisExportVO> exportVOS = transfer2analysisExportVO(invoiceBillOrderDO, baseItemMap);
+            if (CollectionUtils.isNotEmpty(exportVOS)) {
+                results.addAll(exportVOS);
+            }
+        }
+        return results;
+    }
+
+    /**
+     * @param invoiceBillOrderDO
+     * @param baseItemMap
+     * @return
+     */
+    private List<InvoiceBillAnalysisExportVO> transfer2analysisExportVO(InvoiceBillOrderDO invoiceBillOrderDO, Map<String, List<InvoiceOrderBaseItemVO>> baseItemMap) {
+        List<InvoiceBillAnalysisExportVO> results = new ArrayList<>();
+        String invoiceNo = invoiceBillOrderDO.getInvoiceNo();
+        if (baseItemMap.containsKey(invoiceNo)) {
+            List<InvoiceOrderBaseItemVO> baseItemVOS = baseItemMap.get(invoiceNo);
+            Map<String, List<InvoiceOrderBaseItemVO>> listMap = baseItemVOS.stream().collect(Collectors.groupingBy(InvoiceOrderBaseItemVO::getCustomerCode));
+            for (Map.Entry<String, List<InvoiceOrderBaseItemVO>> entry : listMap.entrySet()) {
+                String customerCode = entry.getKey();
+                List<InvoiceOrderBaseItemVO> itemVOS = entry.getValue();
+                InvoiceBillAnalysisExportVO exportVO = buildAnalysisExportVO(invoiceBillOrderDO);
+                exportVO.setCustomerCode(customerCode);
+                if (CollectionUtils.isEmpty(itemVOS)) {
+                    exportVO.setCustomerTotalPrice(new BigDecimal(Constant.ZERO).setScale(2, BigDecimal.ROUND_HALF_UP));
+                } else {
+                    BigDecimal customerTotalPrice = new BigDecimal(Constant.ZERO);
+                    for (InvoiceOrderBaseItemVO itemVO : itemVOS) {
+                        customerTotalPrice = customerTotalPrice.add(Objects.nonNull(itemVO.getCustomerTotalPrice()) ? itemVO.getCustomerTotalPrice() : new BigDecimal(Constant.ZERO));
+                    }
+                    exportVO.setCustomerTotalPrice(customerTotalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+                }
+                results.add(exportVO);
+            }
+        }
+        return results;
+    }
+
+    /**
+     * @param invoiceBillOrderDO
+     * @return
+     */
+    private InvoiceBillAnalysisExportVO buildAnalysisExportVO(InvoiceBillOrderDO invoiceBillOrderDO) {
+        InvoiceBillAnalysisExportVO exportVO = new InvoiceBillAnalysisExportVO();
+        BeanUtils.copyProperties(invoiceBillOrderDO, exportVO);
+        BigDecimal actualPayedAmount = new BigDecimal(Constant.ZERO);
+        if (Objects.nonNull(invoiceBillOrderDO.getActualPayedAmount1())) {
+            actualPayedAmount = actualPayedAmount.add(invoiceBillOrderDO.getActualPayedAmount1());
+        }
+        if (Objects.nonNull(invoiceBillOrderDO.getActualPayedAmount2())) {
+            actualPayedAmount = actualPayedAmount.add(invoiceBillOrderDO.getActualPayedAmount2());
+        }
+        if (Objects.nonNull(invoiceBillOrderDO.getActualPayedAmount3())) {
+            actualPayedAmount = actualPayedAmount.add(invoiceBillOrderDO.getActualPayedAmount3());
+        }
+        //   实际收款总金额(补)
+        exportVO.setActualPayedAmount(actualPayedAmount.setScale(2, BigDecimal.ROUND_HALF_UP));
+        //这一段不需要。
+//        BigDecimal otherAmount = (Objects.nonNull(invoiceBillOrderDO.getActualReceivableAmount()) ? invoiceBillOrderDO.getActualReceivableAmount() : new BigDecimal(Constant.ZERO))
+//                .subtract(exportVO.getActualPayedAmount());
+//        exportVO.setOtherAmount(otherAmount);
+        //改为获取订单的其他费用,而不是计算。
+//        BigDecimal otherTotalAmount = (Objects.nonNull(invoiceBillOrderDO.getActualReceivableAmount()) ? invoiceBillOrderDO.getActualReceivableAmount() : new BigDecimal(Constant.ZERO))
+//                .subtract(exportVO.getActualPayedAmount()).subtract(otherAmount);
+//        exportVO.setOtherTotalAmount(otherTotalAmount);
+        //应收金额    实际应收款(补)
+        exportVO.setActualReceivableAmount(invoiceBillOrderDO.getTotalCustomerAmount().subtract(exportVO.getDeductAmount()).setScale(2, BigDecimal.ROUND_HALF_UP));
+        //确实是这个  未收  注意这里是采用了actualReceivableAmount。  千万要改。    未收金额合计(补)
+//        exportVO.setOtherTotalAmount(invoiceBillOrderDO.getActualReceivableAmount().subtract(exportVO.getActualPayedAmount()).subtract(exportVO.getOtherAmount()).setScale(2, BigDecimal.ROUND_HALF_UP));
+        exportVO.setOtherTotalAmount( exportVO.getActualReceivableAmount().subtract(exportVO.getActualPayedAmount()).subtract(exportVO.getOtherAmount()).setScale(2, BigDecimal.ROUND_HALF_UP));
+        //目的是保留小数点后两位。  用户扣款金额(补)
+        exportVO.setDeductAmount(exportVO.getDeductAmount().setScale(2, BigDecimal.ROUND_HALF_UP));
+        exportVO.setActualReceivableAmount(exportVO.getActualReceivableAmount().setScale(2, BigDecimal.ROUND_HALF_UP));
+        //
+        exportVO.setOtherAmount(exportVO.getOtherAmount().setScale(2, BigDecimal.ROUND_HALF_UP));
+        return exportVO;
+    }
+
+    /**
+     * @param mappingDOMap
+     * @return
+     */
+    private List<InvoiceOrderBaseItemVO> getInvoiceOrderBaseItems(Map<Long, InvoiceBillMappingDO> mappingDOMap) {
+        Set<Long> orderIds = mappingDOMap.keySet();
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
+        List<OrderProfitAnalysisDO> profitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderProfitAnalysisDO::getOrderId, orderIds));
+        Map<Long, OrderBaseInfoDO> orderBaseInfoDOMap = orderBaseInfoDOList.stream().collect(Collectors.toMap(OrderBaseInfoDO::getId, Function.identity(), (x, y) -> x));
+        Map<Long, OrderProfitAnalysisDO> profitAnalysisDOMap = profitAnalysisDOS.stream().collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity(), (x, y) -> x));
+        List<InvoiceOrderBaseItemVO> baseItemVOS = new ArrayList<>();
+        for (Map.Entry<Long, OrderBaseInfoDO> entry : orderBaseInfoDOMap.entrySet()) {
+            Long orderId = entry.getKey();
+            OrderBaseInfoDO baseInfoDO = entry.getValue();
+            InvoiceOrderBaseItemVO itemVO = InvoiceOrderBaseItemVO.builder()
+                    .orderId(orderId)
+                    .customerCode(baseInfoDO.getCustomerCode())
+                    .build();
+            if (profitAnalysisDOMap.containsKey(orderId)) {
+                OrderProfitAnalysisDO profitAnalysisDO = profitAnalysisDOMap.get(orderId);
+                itemVO.setCustomerTotalPrice(Objects.isNull(profitAnalysisDO.getCustomerTotalPrice()) ? new BigDecimal(Constant.ZERO) : new BigDecimal(profitAnalysisDO.getCustomerTotalPrice()));
+            } else {
+                itemVO.setCustomerTotalPrice(new BigDecimal(Constant.ZERO));
+            }
+
+            if (mappingDOMap.containsKey(orderId)) {
+                InvoiceBillMappingDO mappingDO = mappingDOMap.get(orderId);
+                itemVO.setInvoiceCode(mappingDO.getInvoiceNo());
+            }
+            baseItemVOS.add(itemVO);
+        }
+        return baseItemVOS;
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private Set<Long> filterBillOrderIdsBy(InvoiceBillOrderQueryVO queryVO) {
+        List<Long> orderIds = filterOrderIdsBy(queryVO);
+        if (CollectionUtils.isEmpty(orderIds)) {
+            return null;
+        }
+        List<InvoiceBillMappingDO> mappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(CollectionUtils.isNotEmpty(orderIds), InvoiceBillMappingDO::getOrderId, orderIds));
+        if (CollectionUtils.isEmpty(mappingDOS)) {
+            Set<Long> ids = new HashSet<>();
+            ids.add(-1L);
+            return ids;
+        }
+        return mappingDOS.stream().map(InvoiceBillMappingDO::getInvoiceBillId).collect(Collectors.toSet());
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private List<Long> filterOrderIdsBy(InvoiceBillOrderQueryVO queryVO) {
+        Boolean flag = false;
+        if (StringUtils.isNotBlank(queryVO.getCustomerCode())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getProductionDepartment())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getCustomerPo())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getInnerNo())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getProjectNo())) {
+            flag = flag | true;
+        }
+        if (!flag) {
+            return null;
+        }
+        LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = new LambdaQueryWrapper<OrderBaseInfoDO>()
+                .eq(OrderBaseInfoDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(StringUtils.isNotBlank(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
+                .eq(StringUtils.isNotBlank(queryVO.getProductionDepartment()), OrderBaseInfoDO::getProductionDepartment, queryVO.getProductionDepartment())
+                .eq(StringUtils.isNotBlank(queryVO.getCustomerPo()), OrderBaseInfoDO::getCustomerPo, queryVO.getCustomerPo())
+                .eq(StringUtils.isNotBlank(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo())
+                .eq(StringUtils.isNotBlank(queryVO.getProjectNo()), OrderBaseInfoDO::getProjectNo, queryVO.getProjectNo());
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(queryWrapper);
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            List<Long> orderIds = new ArrayList<>();
+            orderIds.add(-1L);
+            return orderIds;
+        }
+        return orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toList());
+    }
+
+    /**
+     * 创建invoice单据
+     *
+     * @param createVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult create(InvoiceBillCreateVO createVO) {
+        if (Objects.nonNull(createVO.getId())) {
+            createVO.setId(null);
+        }
+
+        validaBillOrder(createVO);
+
+        InvoiceBillOrderDO invoiceBillOrderDO = buildInvoiceBillOrderDO(createVO);
+
+       boolean success= transactionHelper.run(() -> {
+            save(invoiceBillOrderDO);
+
+            invoiceBillMappingService.saveBatch(buildInvoiceBillMappingDOS(createVO, invoiceBillOrderDO));
+            return true;
+        });
+       if(success) {
+           //在创建时获取到客户总金额。
+           List<InvoiceBillMappingDO> invoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
+                   .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                   .eq(InvoiceBillMappingDO::getInvoiceNo, invoiceBillOrderDO.getInvoiceNo()));
+           if (CollectionUtils.isNotEmpty(invoiceBillMappingDOS)) {
+               List<Long> orderIds = invoiceBillMappingDOS.stream().map(InvoiceBillMappingDO::getOrderId).collect(Collectors.toList());
+               List<OrderProfitAnalysisDO> orderProfitAnalysisList = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                       .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                       .in(OrderProfitAnalysisDO::getOrderId, orderIds));
+               List<OrderProfitAnalysisDO> orderProfitAnalysisDOS = orderProfitAnalysisList.stream()
+                       .collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity(), (existing, replacement) -> existing))
+                       .values()
+                       .stream()
+                       .collect(Collectors.toList());
+               if (CollectionUtils.isNotEmpty(orderProfitAnalysisDOS)) {
+                   BigDecimal totalPrice  = orderProfitAnalysisDOS.stream().map(order->BigDecimal.valueOf(order.getCustomerTotalPrice()))
+                           .reduce(BigDecimal.ZERO,BigDecimal::add);
+                   if(Objects.nonNull(totalPrice)){
+                       //客户总价金额汇总。 美元
+                       invoiceBillOrderDO.setTotalCustomerAmount(totalPrice.setScale(2, BigDecimal.ROUND_HALF_UP));
+                       //设置实际应收金额汇总,要是没有发生扣款,也会被设置。
+                       invoiceBillOrderDO.setActualReceivableAmount(invoiceBillOrderDO.getTotalCustomerAmount());
+                   }else{
+                       invoiceBillOrderDO.setTotalCustomerAmount(BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
+                       invoiceBillOrderDO.setActualReceivableAmount(invoiceBillOrderDO.getTotalCustomerAmount());
+                   }
+
+               }
+           }
+           //设置发生扣款金额汇总,避免没有发生扣款金额,也能在审核界面有对应的值。
+           invoiceBillOrderDO.setDeductAmount(BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
+           //设置其他费用汇总,避免没有发生扣款金额,也能在审核界面有对应的值。
+           invoiceBillOrderDO.setOtherAmount(BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
+           //设置实际付款金额。
+           invoiceBillOrderDO.setTotalPayAmount(BigDecimal.ZERO.setScale(2,BigDecimal.ROUND_HALF_UP));
+           updateById(invoiceBillOrderDO);
+       }
+        return ServerResult.success();
+    }
+
+    @Override
+    public ServerResult getBackRefundDate(InvoiceBillCreateVO createVO) {
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(createVO.getOrderIds());
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            throw new BusinessException("勾选的订单信息不存在！");
+        }
+
+        InvoiceHoldTimeItemVO invoiceHoldTimeItemVO = getCustomerHoldTime(orderBaseInfoDOList);
+
+        return ServerResult.success(calculateBackRefundDate(invoiceHoldTimeItemVO));
+    }
+
+    /**
+     * @param invoiceHoldTimeItemVO
+     * @return
+     */
+    private String calculateBackRefundDate(InvoiceHoldTimeItemVO invoiceHoldTimeItemVO) {
+        Integer holdDays = getHoldTimeByCustomerCode(invoiceHoldTimeItemVO.getCustomerCode());
+        LocalDateTime holdTime = DateUtils.parse(invoiceHoldTimeItemVO.getHoldTime(), DateUtils.DATE_TIME).plusDays(holdDays);
+        return DateUtils.format(holdTime, DateUtils.DATE);
+    }
+
+    /**
+     * @param customerCode
+     * @return
+     */
+    private Integer getHoldTimeByCustomerCode(String customerCode) {
+        SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(SystemSettingDO::getSettingCode, "customerCode").eq(SystemSettingDO::getSettingValue, customerCode)
+                .eq(SystemSettingDO::getRelationCode, "orderHodTime").last("limit 1"));
+        if (Objects.isNull(systemSettingDO)) {
+            return Constant.ZERO;
+        }
+        String holdTime = systemSettingDO.getRelationValue();
+        return StringUtils.isBlank(holdTime) ? Constant.ZERO : Integer.parseInt(holdTime);
+    }
+
+    /**
+     * @param orderBaseInfoDOList
+     * @return
+     */
+    private InvoiceHoldTimeItemVO getCustomerHoldTime(List<OrderBaseInfoDO> orderBaseInfoDOList) {
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            return null;
+        }
+
+        Map<String, OrderBaseInfoDO> holdTimeMap = new HashMap<String, OrderBaseInfoDO>();
+        String maxHoldTime = null;
+        for (OrderBaseInfoDO baseInfoDO : orderBaseInfoDOList) {
+            if (StringUtils.isNotBlank(baseInfoDO.getOrderHodTime())) {
+                holdTimeMap.put(baseInfoDO.getOrderHodTime(), baseInfoDO);
+                if (StringUtils.isBlank(maxHoldTime)) {
+                    maxHoldTime = baseInfoDO.getOrderHodTime();
+                } else if (maxHoldTime.compareTo(baseInfoDO.getOrderHodTime()) <= 0) {
+                    maxHoldTime = baseInfoDO.getOrderHodTime();
+                }
+            }
+        }
+        if (StringUtils.isBlank(maxHoldTime)) {
+            return null;
+        }
+        InvoiceHoldTimeItemVO itemVO = new InvoiceHoldTimeItemVO();
+        if (holdTimeMap.containsKey(maxHoldTime)) {
+            OrderBaseInfoDO baseInfoDO = holdTimeMap.get(maxHoldTime);
+            itemVO.setCustomerCode(baseInfoDO.getCustomerCode());
+            itemVO.setHoldTime(maxHoldTime);
+            itemVO.setBaseInfoDO(baseInfoDO);
+        }
+        return itemVO;
+    }
+
+    /**
+     * @param createVO
+     * @return
+     */
+    private InvoiceBillOrderDO buildInvoiceBillOrderDO(InvoiceBillCreateVO createVO) {
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(createVO.getOrderIds());
+        return InvoiceBillOrderDO.builder()
+                .invoiceNo(createVO.getInvoiceNo())
+                .bgUrl(createVO.getBgUrl())
+                .backRefundDate(createVO.getBackRefundDate())
+                .status(ApplyStatusEnum.NO_COMMIT.getStatus())
+                .businesPerson(orderBaseInfoDOList.get(0).getBusinessPerson())
+                .build();
+    }
+
+    /**
+     * @param createVO
+     * @param invoiceBillOrderDO
+     * @return
+     */
+    private List<InvoiceBillMappingDO> buildInvoiceBillMappingDOS(InvoiceBillCreateVO createVO, InvoiceBillOrderDO invoiceBillOrderDO) {
+        return createVO.getOrderIds().stream().map(x -> {
+            return InvoiceBillMappingDO.builder()
+                    .orderId(x)
+                    .invoiceBillId(invoiceBillOrderDO.getId())
+                    .invoiceNo(invoiceBillOrderDO.getInvoiceNo())
+                    .build();
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * @param createVO
+     */
+    private void validaBillOrder(InvoiceBillCreateVO createVO) {
+        if (CollectionUtils.isEmpty(createVO.getOrderIds())) {
+            throw new BusinessException("请勾选订单！");
+        }
+
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(createVO.getOrderIds());
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            throw new BusinessException("勾选的订单信息不存在！");
+        }
+
+        if (orderBaseInfoDOList.size() != createVO.getOrderIds().size()) {
+            throw new BusinessException("勾选的订单信息有误！");
+        }
+        //如果利润信息没有填写或者该订单的利润处于审核中也无法创建。
+        List<OrderProfitAnalysisDO> orderProfitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderProfitAnalysisDO::getOrderId, createVO.getOrderIds()));
+        List<OrderProfitAnalysisDO> profitAnalysisDOS = orderProfitAnalysisDOS.stream()
+                .collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity(), (existing, replacement) -> existing))
+                .values()
+                .stream()
+                .collect(Collectors.toList());
+        if(CollectionUtils.isEmpty(orderProfitAnalysisDOS) || createVO.getOrderIds().size()!=profitAnalysisDOS.size()){
+            throw new BusinessException("勾选的订单利润信息未填写！");
+        }
+//        for (OrderProfitAnalysisDO analysisDO : orderProfitAnalysisDOS) {
+//            if (analysisDO.getCustomerPrice() == null ) {
+//                throw new BusinessException("勾选订单的利润信息未填写！");
+//            }
+//        }
+        List<OrderFieldLockApplyDO> orderFieldLockApplyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderFieldLockApplyDO::getOrderId, createVO.getOrderIds())
+                .eq(OrderFieldLockApplyDO::getType, ApplyTypeEnum.ORDER_PROFIT_APPLY.getType())
+                .eq(OrderFieldLockApplyDO::getStatus,ApplyStatusEnum.WAIT_AUDIT.getStatus()));
+        if(CollectionUtils.isNotEmpty(orderFieldLockApplyDOS)){
+            throw new BusinessException("订单中包含利润未审批的订单,无法创建！");
+        }
+
+        String invoiceNo = createVO.getInvoiceNo();
+
+        List<InvoiceBillOrderDO> invoiceBillOrderDOS = list(new LambdaQueryWrapper<InvoiceBillOrderDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(InvoiceBillOrderDO::getInvoiceNo, invoiceNo));
+        if (CollectionUtils.isNotEmpty(invoiceBillOrderDOS)) {
+            throw new BusinessException("存在相同的invoice订单！");
+        }
+
+        List<InvoiceBillMappingDO> invoiceBillMappingDOList = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(InvoiceBillMappingDO::getOrderId, createVO.getOrderIds()));
+        if (CollectionUtils.isNotEmpty(invoiceBillMappingDOList)) {
+            throw new BusinessException("该勾选的订单已经绑定其他账单了！");
+        }
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param deductInfoVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult updateDeductInfo(InvoiceBillDeductInfoVO deductInfoVO) {
+        if (Objects.isNull(deductInfoVO.getId())) {
+            throw new BusinessException("id 不能为空");
+        }
+        InvoiceBillOrderDO invoiceBillOrderDo = getById(deductInfoVO.getId());
+        if (Objects.isNull(invoiceBillOrderDo)) {
+            throw new BusinessException("应收款单据不存在");
+        }
+        if(Objects.nonNull(invoiceBillOrderDo.getStatus()) && Constant.ENABLE_TEN==invoiceBillOrderDo.getStatus()){
+            throw new BusinessException("应收款单据已审核通过,无法编辑");
+        }
+
+        checkCommitApply(invoiceBillOrderDo.getId());
+
+//        Set<String> deductUrlSet = new HashSet<>(Arrays.asList(
+//               org.apache.commons.lang3.StringUtils.defaultString(invoiceBillOrderDo.getDeductUrl()).split(",")
+//        ));
+//        String newDeductUrl = deductInfoVO.getDeductUrl();
+//        if (StringUtils.isNotBlank(newDeductUrl)) {
+//            // 如果新 URL 不为空且不在现有 URL 中，则添加到 Set 中
+//            if (!deductUrlSet.contains(newDeductUrl)) {
+//                deductUrlSet.add(newDeductUrl);
+//            }
+//        }
+//        String updatedDeductUrl = String.join(",", deductUrlSet);
+//        invoiceBillOrderDo.setDeductUrl(updatedDeductUrl);
+        if(StringUtils.isNotBlank(invoiceBillOrderDo.getDeductUrl())){
+//记住:需要修改数据表对应的字段deduct_url的varchar数据范围,修改为1000左右。
+            if(StringUtils.isNotBlank(deductInfoVO.getDeductUrl())){
+                Set<String> deductUrlSet = new HashSet<>(Arrays.asList(
+               org.apache.commons.lang3.StringUtils.defaultString(invoiceBillOrderDo.getDeductUrl()).split(",")
+        ));
+                if(!deductUrlSet.contains(deductInfoVO.getDeductUrl())){
+                    deductUrlSet.add(deductInfoVO.getDeductUrl());
+                    String updateDeductUrl = String.join(",",deductUrlSet);
+                    invoiceBillOrderDo.setDeductUrl(updateDeductUrl);
+                }
+            }
+        }else{
+            if(StringUtils.isNotBlank(deductInfoVO.getDeductUrl())){
+                invoiceBillOrderDo.setDeductUrl(deductInfoVO.getDeductUrl());
+            }
+        }
+        invoiceBillOrderDo.setDeductAmount((deductInfoVO.getDeductAmount()==null?BigDecimal.ZERO:deductInfoVO.getDeductAmount()).setScale(2, RoundingMode.HALF_UP));
+        //客户总金额减去发生扣款金额。
+        invoiceBillOrderDo.setActualReceivableAmount((invoiceBillOrderDo.getTotalCustomerAmount().subtract(deductInfoVO.getDeductAmount()==null?BigDecimal.ZERO:deductInfoVO.getDeductAmount())).setScale(2, RoundingMode.HALF_UP));
+        updateById(invoiceBillOrderDo);
+        return ServerResult.success();
+    }
+
+    @Override
+    public ServerResult updateAmountInfo(InvoiceBillAmountInfoVO amountInfoVO) {
+        if (Objects.isNull(amountInfoVO.getId())) {
+            throw new BusinessException("id 不能为空");
+        }
+        InvoiceBillOrderDO invoiceBillOrderDo = getById(amountInfoVO.getId());
+        if (Objects.isNull(invoiceBillOrderDo)) {
+            throw new BusinessException("应收款单据不存在");
+        }
+
+        checkCommitApply(invoiceBillOrderDo.getId());
+
+
+        invoiceBillOrderDo.setActualPayedAmount1(amountInfoVO.getActualPayedAmount1() !=null ? amountInfoVO.getActualPayedAmount1() : BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP));
+        invoiceBillOrderDo.setActualPayedAmount2(amountInfoVO.getActualPayedAmount2() !=null ? amountInfoVO.getActualPayedAmount2() : BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP));
+        invoiceBillOrderDo.setActualPayedAmount3(amountInfoVO.getActualPayedAmount3() !=null ? amountInfoVO.getActualPayedAmount3() : BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP));
+        invoiceBillOrderDo.setOtherAmount(amountInfoVO.getOtherAmount() !=null ? amountInfoVO.getOtherAmount() : BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP));
+//        invoiceBillOrderDo.setActualReceivableAmount((invoiceBillOrderDo.getTotalCustomerAmount().subtract(invoiceBillOrderDo.getDeductAmount()).subtract(amountInfoVO.getOtherAmount() !=null ? amountInfoVO.getOtherAmount() : BigDecimal.ZERO)).setScale(2, RoundingMode.HALF_UP));
+        //审核时让前端后获取这个参数,不再获取ActualReceivableAmount对应实际收款金额汇总
+        invoiceBillOrderDo.setTotalPayAmount(invoiceBillOrderDo.getActualPayedAmount1().add(invoiceBillOrderDo.getActualPayedAmount2()).add(invoiceBillOrderDo.getActualPayedAmount3()).setScale(2, RoundingMode.HALF_UP));
+        updateById(invoiceBillOrderDo);
+        return ServerResult.success();
+    }
+
+    /**
+     * @param id
+     */
+    private void checkCommitApply(Long id) {
+        OrderFieldLockApplyDO applyDO = orderFieldLockApplyService.getOne(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                .eq(OrderFieldLockApplyDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderFieldLockApplyDO::getType, ApplyTypeEnum.INVOICE_BILL_APPLY.getType())
+                .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                .eq(OrderFieldLockApplyDO::getOrderId, id).last("limit 1"));
+        if (Objects.nonNull(applyDO)) {
+            throw new BusinessException("该账单还在审批中，请联系总经理审批后操作！");
+        }
+    }
+
+    @Override
+    public ServerResult commitApply(InvoiceBillCommitApplyVO commitApplyVO) {
+        InvoiceBillOrderDO invoiceBillOrderDO = getById(commitApplyVO.getId());
+        if (Objects.isNull(invoiceBillOrderDO)) {
+            throw new BusinessException("账单不存在！");
+        }
+        if(Constant.ENABLE_TEN==invoiceBillOrderDO.getStatus()){
+            throw new BusinessException("该订单已通过审核!");
+        }
+        Long userId = dataScope.getLoginUserId();
+        String loginUserName = dataScope.getLoginUserName();
+        checkApply(commitApplyVO.getId(), userId);
+
+        /*List<InvoiceBillMappingDO> invoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(InvoiceBillMappingDO::getInvoiceNo, invoiceBillOrderDO.getInvoiceNo()));
+        if(CollectionUtils.isNotEmpty(invoiceBillMappingDOS)){
+            List<Long> orderIds = invoiceBillMappingDOS.stream().map(InvoiceBillMappingDO::getOrderId).collect(Collectors.toList());
+            List<OrderProfitAnalysisDO> orderProfitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .in(OrderProfitAnalysisDO::getOrderId, orderIds));
+            if(CollectionUtils.isNotEmpty(orderProfitAnalysisDOS)){
+                List<Double> totalPrice = orderProfitAnalysisDOS.stream().map(OrderProfitAnalysisDO::getCustomerTotalPrice).collect(Collectors.toList());
+                if(CollectionUtils.isNotEmpty(totalPrice)){
+                    double totalSum = totalPrice.stream()
+                            .reduce(0.00, Double::sum);
+                    BigDecimal bigDecimalValue = BigDecimal.valueOf(totalSum);
+                    //客户总价金额汇总。 美元
+                    invoiceBillOrderDO.setTotalCustomerAmount(bigDecimalValue);
+                }else {
+                    invoiceBillOrderDO.setTotalCustomerAmount( BigDecimal.ZERO);
+                }
+            }
+        }
+        if(Objects.isNull(invoiceBillOrderDO.getDeductAmount())){
+            invoiceBillOrderDO.setDeductAmount(BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP));
+        }*/
+        invoiceBillOrderDO.setActualRefundDate(commitApplyVO.getActualRefundDate());
+        invoiceBillOrderDO.setPayee(commitApplyVO.getPayee());
+        invoiceBillOrderDO.setFinancePerson(loginUserName);
+        OrderFieldLockApplyDO applyDO = initOrderFieldLockApplyDO(invoiceBillOrderDO, userId);
+        transactionHelper.run(() -> {
+            orderFieldLockApplyService.save(applyDO);
+            invoiceBillOrderDO.setStatus(ApplyStatusEnum.WAIT_AUDIT.getStatus());
+            updateById(invoiceBillOrderDO);
+        });
+        return ServerResult.success();
+    }
+
+    /**
+     * @param id
+     * @param userId
+     */
+    private void checkApply(Long id, Long userId) {
+        List<OrderFieldLockApplyDO> applyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderFieldLockApplyDO::getOrderId, id)
+                .eq(OrderFieldLockApplyDO::getApplyUserId, userId)
+                .eq(OrderFieldLockApplyDO::getType, ApplyTypeEnum.INVOICE_BILL_APPLY.getType())
+                .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));
+        if (CollectionUtils.isNotEmpty(applyDOS)) {
+            throw new BusinessException(ServerResultCode.APPLY_UNLOCK_FIELD_EXIST);
+        }
+    }
+
+    /**
+     * @param ids
+     * @param userId
+     */
+    private void checkApplyByIds(List<Long> ids, Long userId) {
+        List<OrderFieldLockApplyDO> applyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderFieldLockApplyDO::getOrderId, ids)
+                .eq(OrderFieldLockApplyDO::getApplyUserId, userId)
+                .eq(OrderFieldLockApplyDO::getType, ApplyTypeEnum.INVOICE_BILL_APPLY.getType())
+                .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));
+        if (CollectionUtils.isNotEmpty(applyDOS)) {
+            throw new BusinessException(ServerResultCode.APPLY_UNLOCK_FIELD_EXIST);
+        }
+    }
+
+    /**
+     * @param invoiceBillOrderDO
+     * @param userId
+     * @return
+     */
+    private OrderFieldLockApplyDO initOrderFieldLockApplyDO(InvoiceBillOrderDO invoiceBillOrderDO, Long userId) {
+        OrderLockFieldVO lockFieldVO = new OrderLockFieldVO();
+        lockFieldVO.setInvoiceBillOrderDO(invoiceBillOrderDO);
+        return OrderFieldLockApplyDO.builder()
+                .applyUserId(userId)
+                .auditUserId(null)
+                .fields(JSONObject.toJSONString(lockFieldVO))
+                .orderId(invoiceBillOrderDO.getId())
+                .type(ApplyTypeEnum.INVOICE_BILL_APPLY.getType())
+                .remark(ApplyTypeEnum.INVOICE_BILL_APPLY.getDesc())
+                .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                .auditRoleCodes(RoleEnum.ADMIN.getCode())
+                .build();
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param invoiceBillOrderQueryVO 筛选条件
+     * @return 是否成功
+     */
+    @Override
+    public ServerResult deleteById(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
+        List<Long> ids = invoiceBillOrderQueryVO.getIds();
+        if (CollUtil.isEmpty(ids)) {
+            return ServerResult.fail("ids 参数不能为空");
+        }
+        List<InvoiceBillOrderDO> invoiceBillOrderList = listByIds(ids);
+        if (CollUtil.isEmpty(invoiceBillOrderList)) {
+            return ServerResult.success();
+        }
+        checkApplyByIds(ids, dataScope.getLoginUserId());
+        invoiceBillOrderList.stream().forEach(invoiceBillOrderDO -> {
+            if(Constant.ENABLE_TEN==invoiceBillOrderDO.getStatus()){
+                throw new BusinessException("该订单已通过审核,无法删除!");
+            }
+        });
+        transactionHelper.run(() -> {
+            removeByIds(ids);
+            invoiceBillMappingService.remove(new LambdaQueryWrapper<InvoiceBillMappingDO>().in(InvoiceBillMappingDO::getInvoiceBillId, ids));
+        });
+
+        return ServerResult.success();
+    }
+
+    @Override
+    public ServerResult getDeductUrlById(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
+        Long id = invoiceBillOrderQueryVO.getId();
+        if (Objects.isNull(id)) {
+            return ServerResult.fail("id 参数不能为空");
+        }
+        InvoiceBillOrderDO  InvoiceBillOrderDO = getById(id);
+        if(Objects.isNull( InvoiceBillOrderDO)){
+            return ServerResult.fail("invoice账单不存在！");
+        }
+        if(StringUtils.isEmpty( InvoiceBillOrderDO.getDeductUrl())){
+            return  ServerResult.fail("扣款单未上传！");
+        }
+        Map<String, String> hashMap = new HashMap<>();
+        //获取每一个url的文件名称
+        Arrays.stream( InvoiceBillOrderDO.getDeductUrl().split(",")).forEach(x->{
+            try{
+            String preUrl = x.split("\\?")[0];
+            String fileName = preUrl.substring(preUrl.lastIndexOf("/") + 1);
+            String decodUrle = URLDecoder.decode(fileName, StandardCharsets.UTF_8.name());
+            hashMap.put(decodUrle,x);
+            }catch (Exception e){
+                throw  new BusinessException("文件名错误!");
+            }
+        });
+        return ServerResult.success(hashMap);
+    }
+
+    @Override
+    public ServerResult reUploadBgurl(InvoiceBillCreateVO bgUrl) {
+        Long id=bgUrl.getId();
+        if(Objects.isNull(id)){
+            return  ServerResult.fail("id 参数不能为空");
+        }
+        InvoiceBillOrderDO invoiceBillOrderDO = getById(id);
+        if(Objects.isNull(invoiceBillOrderDO)){
+            return ServerResult.fail("invoice账单不存在！");
+        }
+        if(StringUtils.isBlank(bgUrl.getBgUrl())){
+            return  ServerResult.fail("上传报关单不能为空");
+        }
+        //重新上传报关单
+        invoiceBillOrderDO.setBgUrl(bgUrl.getBgUrl());
+        updateById(invoiceBillOrderDO);
+        return ServerResult.success();
+    }
+
+    @Override
+    public ServerResult exportReceipt(HttpServletResponse response,InvoiceBillOrderDO  queryVO) throws IOException {
+
+        XSSFWorkbook workbook = new XSSFWorkbook();
+        Sheet sheet = workbook.createSheet("收款单");
+        Row row = sheet.createRow(0);
+        Cell cell = row.createCell(0);
+        cell.setCellValue("收款单");
+        sheet.setMargin(sheet.LeftMargin,0.5);
+        sheet.setMargin(sheet.RightMargin,0.5);
+
+
+        CellStyle titleStyle = workbook.createCellStyle();
+        Font titleFont = workbook.createFont();
+        titleFont.setFontHeightInPoints((short) 20); // 字体大小
+        titleFont.setBold(true); // 加粗
+        titleFont.setFontName("宋体");
+        titleStyle.setAlignment(HorizontalAlignment.CENTER); // 水平居中
+        titleStyle.setVerticalAlignment(VerticalAlignment.CENTER); // 垂直居中
+        // 合并单元格（第一行的第一列到第三列）
+        sheet.addMergedRegion(new CellRangeAddress(0, 2, 0, 9));
+        titleStyle.setFont(titleFont);
+        cell.setCellStyle(titleStyle);
+        //第二行
+        Row row2 = sheet.createRow(3);
+        Cell cell2 = row2.createCell(0);
+        cell2.setCellValue("提交人：");
+        sheet.addMergedRegion(new CellRangeAddress(3, 4, 0, 1));
+        Cell cell3 = row2.createCell(2);
+        cell3.setCellValue("");
+        sheet.addMergedRegion(new CellRangeAddress(3, 4, 2, 7));
+        Cell cell4 = row2.createCell(8);
+        cell4.setCellValue("日期：");
+        sheet.addMergedRegion(new CellRangeAddress(3, 4, 8, 9));
+        //第三行
+        createMergedCell(sheet, workbook, 5, 0, 5, 6, 0, 1, "INVOICE编号");
+        createMergedCell(sheet, workbook, 5, 2, 5, 6, 2, 3, "客户总价金额汇总");
+        createMergedCell(sheet, workbook, 5, 4, 5, 6, 4, 4, "扣款金额汇总");
+        createMergedCell(sheet, workbook, 5, 5, 5, 6, 5, 6, "实际收款金额汇总");
+        createMergedCell(sheet, workbook, 5, 7, 5, 6, 7, 7, "其他费用汇总");
+        createMergedCell(sheet, workbook, 5, 8, 5, 6, 8, 8, "必须回款日期");
+        createMergedCell(sheet, workbook, 5, 9, 5, 6, 9, 9, "实际回款日期");
+        //第四行
+        createMergedCell(sheet, workbook, 7, 0, 7, 8, 0, 1, queryVO.getInvoiceNo() != null ? queryVO.getInvoiceNo() : "");
+        createMergedCell(sheet, workbook, 7, 2, 7, 8, 2, 3, queryVO.getTotalCustomerAmount()!= null ? "$"+queryVO.getTotalCustomerAmount().setScale(2, BigDecimal.ROUND_HALF_UP) : "");
+        createMergedCell(sheet, workbook, 7, 4, 7, 8, 4, 4, queryVO.getDeductAmount()!= null ? "$"+queryVO.getDeductAmount().setScale(2, BigDecimal.ROUND_HALF_UP) : "");
+        createMergedCell(sheet, workbook, 7, 5, 7, 8, 5, 6, queryVO.getTotalPayAmount()!=null ? "$"+queryVO.getTotalPayAmount().setScale(2, BigDecimal.ROUND_HALF_UP) : "");
+        createMergedCell(sheet, workbook, 7, 7, 7, 8, 7, 7, queryVO.getOtherAmount() != null ? "$"+queryVO.getOtherAmount().setScale(2, BigDecimal.ROUND_HALF_UP) : "");
+        createMergedCell(sheet, workbook, 7, 8, 7, 8, 8, 8, queryVO.getBackRefundDate() != null ? queryVO.getBackRefundDate() : "");
+        createMergedCell(sheet, workbook, 7, 9, 7, 8, 9, 9, queryVO.getActualRefundDate() != null ? queryVO.getActualRefundDate() : "");
+        //第五行
+        createMergedCell(sheet, workbook, 9, 0, 9, 10, 0, 1, "收款单位");
+        createMergedCell(sheet, workbook, 9, 2, 9, 10, 2, 9, queryVO.getPayee());
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; charset=UTF-8");
+        response.setHeader("Content-Disposition", "attachment; filename=\"-.xlsx\"");
+        workbook.write(response.getOutputStream());
+        workbook.close();
+        return ServerResult.success();
+
+    }
+
+    @Override
+    public List<InvoiceBillOrderDO> getOverEvnetList() {
+        return baseMapper.getOverEventList();
+    }
+
+
+    public void createMergedCell(Sheet sheet, Workbook workbook, int rowIndex, int colIndex, int startRow, int endRow, int startCol, int endCol, String value) {
+        // 创建或获取当前行
+        Row row = sheet.getRow(rowIndex);
+        if (row == null) {
+            row = sheet.createRow(rowIndex);
+        }
+
+        // 创建第一个单元格并设置值
+        Cell cell = row.createCell(colIndex);
+        cell.setCellValue(value);
+
+        // 创建边框样式
+        CellStyle titleStyle = workbook.createCellStyle();
+        Font titleFont = workbook.createFont();
+        titleFont.setFontHeightInPoints((short) 8.5); // 字体大小
+        titleFont.setBold(true); // 加粗
+        titleFont.setFontName("宋体");
+        titleStyle.setAlignment(HorizontalAlignment.CENTER); // 水平居中
+        titleStyle.setVerticalAlignment(VerticalAlignment.CENTER); // 垂直居中
+        titleStyle.setFont(titleFont);
+
+        // 设置边框样式
+        titleStyle.setBorderTop(BorderStyle.THIN);
+        titleStyle.setBorderBottom(BorderStyle.THIN);
+        titleStyle.setBorderLeft(BorderStyle.THIN);
+        titleStyle.setBorderRight(BorderStyle.THIN);
+
+        // 应用样式到第一个单元格
+        cell.setCellStyle(titleStyle);
+
+        // 合并单元格
+        sheet.addMergedRegion(new CellRangeAddress(startRow, endRow, startCol, endCol));
+
+        // 为合并区域的每个单元格设置相同的样式
+        for (int rowIndexCurrent = startRow; rowIndexCurrent <= endRow; rowIndexCurrent++) {
+            for (int colIndexCurrent = startCol; colIndexCurrent <= endCol; colIndexCurrent++) {
+                Row currentRow = sheet.getRow(rowIndexCurrent);
+                if (currentRow == null) {
+                    currentRow = sheet.createRow(rowIndexCurrent);
+                }
+                Cell currentCell = currentRow.getCell(colIndexCurrent);
+                if (currentCell == null) {
+                    currentCell = currentRow.createCell(colIndexCurrent);
+                }
+                // 只为合并区域内的单元格设置样式
+                if (rowIndexCurrent == startRow && colIndexCurrent == colIndex) {
+                    currentCell.setCellStyle(titleStyle); // 为合并的单元格设置样式
+                } else {
+                    currentCell.setCellStyle(titleStyle); // 为其他合并的单元格设置样式
+                }
+            }
+        }
+    }
+}
@@ -141,6 +141,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     private ReceiveEmailMappingService receiveEmailMappingService;
     @Resource
     private AdminUserRoleService adminUserRoleService;
+    @Resource
+    private InvoiceBillMappingService invoiceBillMappingService;
+
+    @Resource
+    private CheckBillMappingService checkBillMappingService;
     /**
@@ -224,6 +229,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             // 填充质检信息
             fillInspectionStageInfo(resultVOList);
+            // 填充发票信息
+            fillInvoiceNo(resultVOList);
+
             if (locked) {
                 // 填充字段锁定信息
@@ -867,7 +875,26 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     /**
      * @param orderInfoResultVOList
      */
+    private void fillInvoiceNo(List<OrderInfoResultVO> orderInfoResultVOList) {
+        if (CollectionUtils.isEmpty(orderInfoResultVOList)) {
+            return;
+        }
+        Set<Long> orderIds = orderInfoResultVOList.stream().map(OrderInfoResultVO::getId).collect(Collectors.toSet());
+        List<InvoiceBillMappingDO> invoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(InvoiceBillMappingDO::getOrderId, orderIds));
+        if (CollectionUtils.isEmpty(invoiceBillMappingDOS)) {
+            return;
+        }
+        Map<Long, InvoiceBillMappingDO> invoiceBillMappingDOMap = invoiceBillMappingDOS.stream().collect(Collectors.toMap(InvoiceBillMappingDO::getOrderId, Function.identity(), (v1, v2) -> v1));
+        orderInfoResultVOList.forEach(result -> {
+            if (invoiceBillMappingDOMap.containsKey(result.getId())) {
+                InvoiceBillMappingDO invoiceBillMappingDO = invoiceBillMappingDOMap.get(result.getId());
+                result.setInvoiceNo(invoiceBillMappingDO.getInvoiceNo());
+            }
+        });
+    }
     /**
      * @param orderInfoResultVOList
@@ -2115,6 +2142,19 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if (CollUtil.isEmpty(orderBaseInfoList)) {
             return ServerResult.success();
         }
+        //判断是否存在invoice和订单应付款。
+        List<InvoiceBillMappingDO> InvoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(InvoiceBillMappingDO::getOrderId, ids));
+        if(CollectionUtils.isNotEmpty(InvoiceBillMappingDOS)){
+            throw new BusinessException("该订单已绑定Invoice账单,请先删除对应的Invoice账单！");
+        }
+        List<CheckBillMappingDO> checkBillMappingDOList = checkBillMappingService.list(new LambdaQueryWrapper<CheckBillMappingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(CheckBillMappingDO::getOrderId, ids));
+        if(CollectionUtils.isNotEmpty(checkBillMappingDOList)){
+            throw new BusinessException("该订单已绑定生产科对账单号,请先删除对应的生产科对账单！");
+        }
         //todo 校验是否可以逻辑删除
         //订单基本信息
         LambdaUpdateWrapper<OrderBaseInfoDO> updateWrapper = new LambdaUpdateWrapper<OrderBaseInfoDO>()
@@ -71,6 +71,15 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
     @Resource
     private OrderInspectionStageService inspectionStageService;
+    @Resource
+    private InvoiceBillOrderService invoiceBillOrderService;
+
+    @Resource
+    private ProducePaymentCheckBillOrderService checkBillOrderService;
+    @Resource
+    private InvoiceBillMappingService invoiceBillMappingService;
+    @Resource
+    private CheckBillMappingService checkBillMappingService;
     /**
      * 通过ID查询单条数据
@@ -116,19 +125,68 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 BeanUtils.copyProperties(x, resultVO);
                 String fields = x.getFields();
                 if (StringUtils.isNotBlank(fields)) {
-                    if (ApplyTypeEnum.FIELD_EDIT_APPLY.getType() == x.getType()) {
+                    if (ApplyTypeEnum.FIELD_EDIT_APPLY.getType() .equals(x.getType())) {
                         resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                     }
-                    if (ApplyTypeEnum.ORDER_REPORT_APPLY.getType() == x.getType()) {
+                    if (ApplyTypeEnum.ORDER_REPORT_APPLY.getType().equals(x.getType())) {
                         OrderLockFieldVO fieldVO = new OrderLockFieldVO();
                         fieldVO.setReportFields(JSONObject.parseObject(fields, OrderCompletionReportFieldVO.class));
                         resultVO.setFieldInfos(fieldVO);
                     }
-                    if (ApplyTypeEnum.ORDER_PROFIT_APPLY.getType() == x.getType()) {
+                    if (ApplyTypeEnum.ORDER_PROFIT_APPLY.getType() .equals(x.getType())) {
                         OrderLockFieldVO fieldVO = new OrderLockFieldVO();
                         fieldVO.setProfitAnalysisFields(JSONObject.parseObject(fields, OrderProfitAnalysisFieldVO.class));
                         resultVO.setFieldInfos(fieldVO);
                     }
+                    if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(x.getType())) {
+                        //自定义。   解决待审批列表中的应收款要显示内部编码。
+                        OrderLockFieldVO orderLockFieldVO = JSONObject.parseObject(fields, OrderLockFieldVO.class);
+                        if(Objects.nonNull(orderLockFieldVO.getInvoiceBillOrderDO()) && StringUtils.isNotBlank(orderLockFieldVO.getInvoiceBillOrderDO().getInvoiceNo())){
+                            List<InvoiceBillMappingDO> invoiceBillMappingDOList= invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
+                                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                                    .eq(InvoiceBillMappingDO::getInvoiceNo, orderLockFieldVO.getInvoiceBillOrderDO().getInvoiceNo()));
+                            if(CollectionUtils.isNotEmpty(invoiceBillMappingDOList)){
+                                Set<Long> orderIds = invoiceBillMappingDOList.stream().map(InvoiceBillMappingDO::getOrderId).filter(Objects::nonNull).collect(Collectors.toSet());
+                                if(CollectionUtils.isNotEmpty(orderIds)){
+                                    List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
+                                    if(CollectionUtils.isNotEmpty(orderBaseInfoDOList)){
+                                        Set<String> innerNoList = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getInnerNo).filter(Objects::nonNull).collect(Collectors.toSet());
+                                        if(CollectionUtils.isNotEmpty(innerNoList)){
+                                            OrderBaseInfoVO orderBaseInfoVO = new OrderBaseInfoVO();
+                                            resultVO.setOrderBaseInfo(orderBaseInfoVO);
+                                            orderBaseInfoVO.setInnerNo(resultVO.getOrderBaseInfo().getInnerNo().join(",", innerNoList));
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
+                    }
+                    if (ApplyTypeEnum.CHECK_BILL_APPLY.getType().equals(x.getType()) || ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(x.getType())) {
+
+                        OrderLockFieldVO orderLockFieldVO = JSONObject.parseObject(fields, OrderLockFieldVO.class);
+                        if(Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && StringUtils.isNotBlank(orderLockFieldVO.getCheckBillOrderDO().getCheckNo())){
+                            List<CheckBillMappingDO> checkBillMappingDOList= checkBillMappingService.list(new LambdaQueryWrapper<CheckBillMappingDO>()
+                                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                                    .eq(CheckBillMappingDO::getCheckNo, orderLockFieldVO.getCheckBillOrderDO().getCheckNo()));
+                            if(CollectionUtils.isNotEmpty(checkBillMappingDOList)){
+                                Set<Long> orderIds = checkBillMappingDOList.stream().map(CheckBillMappingDO::getOrderId).filter(Objects::nonNull).collect(Collectors.toSet());
+                                if(CollectionUtils.isNotEmpty(orderIds)){
+                                    List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
+                                    if(CollectionUtils.isNotEmpty(orderBaseInfoDOList)){
+                                        Set<String> innerNoList = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getInnerNo).filter(Objects::nonNull).collect(Collectors.toSet());
+                                        if(CollectionUtils.isNotEmpty(innerNoList)){
+                                            OrderBaseInfoVO orderBaseInfoVO = new OrderBaseInfoVO();
+                                            resultVO.setOrderBaseInfo(orderBaseInfoVO);
+                                            orderBaseInfoVO.setInnerNo(resultVO.getOrderBaseInfo().getInnerNo().join(",", innerNoList));
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
+                    }
                 }
                 return resultVO;
             }).collect(Collectors.toList());
@@ -311,6 +369,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 roleSelect = RoleEnum.ADMIN;
             }
         }
+        //这里是否还u需要添加财务角色权限的逻辑。
         Set<Long> orderIds = new HashSet<>();
         if (StringUtils.isNotBlank(queryVO.getBusinessPerson()) || CollectionUtils.isNotEmpty(queryVO.getCustomerCode()) || CollectionUtils.isNotEmpty(queryVO.getInnerNo())
                 || CollectionUtils.isNotEmpty(queryVO.getProductionDepartment()) || CollectionUtils.isNotEmpty(queryVO.getProjectNo())) {
@@ -331,9 +390,17 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(Objects.nonNull(queryVO.getApplyUserId()), OrderFieldLockApplyDO::getApplyUserId, queryVO.getApplyUserId())
                 .eq(Objects.nonNull(queryVO.getStatus()), OrderFieldLockApplyDO::getStatus, queryVO.getStatus())
-                .eq(Objects.nonNull(queryVO.getType()), OrderFieldLockApplyDO::getType, queryVO.getType())
                 .in(CollectionUtils.isNotEmpty(queryVO.getStatusList()), OrderFieldLockApplyDO::getStatus, queryVO.getStatusList())
                 .in(CollectionUtils.isNotEmpty(orderIds), OrderFieldLockApplyDO::getOrderId, orderIds);
+        if(Objects.nonNull(queryVO.getType())){
+            if(Constant.FOUR == String.valueOf(queryVO.getType()).length()){
+                int firstTwoDigits = queryVO.getType() / 100;
+                int lastTwoDigits = queryVO.getType() % 100;
+                queryWrapper.in(OrderFieldLockApplyDO::getType,firstTwoDigits,lastTwoDigits);
+            }else{
+                queryWrapper.eq(Objects.nonNull(queryVO.getType()), OrderFieldLockApplyDO::getType, queryVO.getType());
+            }
+        }
         if (Objects.isNull(roleSelect)) {
             queryWrapper.like(Objects.nonNull(roleEnum), OrderFieldLockApplyDO::getAuditRoleCodes, roleEnum.getCode());
         }else {
@@ -384,9 +451,24 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
         applyDO.setAuditUserId(auditUserId);
         applyDO.setStatus(ApplyStatusEnum.AUDIT_REFUSE.getStatus());
         applyDO.setRefuseRemark(refuseRemark);
+        //应收款和应付款的申请,没有把orderId作为OrderFieldLockApplyDO的orderId,而是把InvoiceBillOrdeDO.getId()作为orderId来存储的。所以肯定查找不到。
         OrderBaseInfoDO orderBaseInfoDO = orderBaseInfoService.getById(applyDO.getOrderId());
-        if (Objects.isNull(orderBaseInfoDO)) {
-            throw new BusinessException(ServerResultCode.ORDER_BASE_INFO_EMPTY);
+        if(!ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType()) && !ApplyTypeEnum.CHECK_BILL_APPLY.getType().equals(applyDO.getType()) && !ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())){
+            if (Objects.isNull(orderBaseInfoDO)) {
+                throw new BusinessException(ServerResultCode.ORDER_BASE_INFO_EMPTY);
+            }
+        }
+        if(ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType())){
+            InvoiceBillOrderDO invoiceBillOrderDO= invoiceBillOrderService.getById(applyDO.getOrderId());
+            if(Objects.isNull(invoiceBillOrderDO)){
+                throw new BusinessException(ServerResultCode. APPLY_NOT_EXIST);
+            }
+        }
+        if(ApplyTypeEnum.CHECK_BILL_APPLY.getType().equals(applyDO.getType()) || ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())){
+            ProducePaymentCheckBillOrderDO checkBillOrderDO= checkBillOrderService.getById(applyDO.getOrderId());
+            if(Objects.isNull(checkBillOrderDO)){
+                throw new BusinessException(ServerResultCode. APPLY_NOT_EXIST);
+            }
         }
         if (ApplyTypeEnum.ORDER_REPORT_APPLY.getType().equals(applyDO.getType())) {
@@ -395,7 +477,40 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
         } else if (ApplyTypeEnum.ORDER_PROFIT_APPLY.getType().equals(applyDO.getType())) {
             orderBaseInfoDO.setOrderStatus(OrderStatusEnum.PROFIT_AUDIT_REFUSE.getStatus());
             orderBaseInfoService.updateById(orderBaseInfoDO);
+        } else if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType())) {
+            OrderLockFieldVO lockFieldVO =  JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
+            InvoiceBillOrderDO invoiceBillOrderDO = lockFieldVO.getInvoiceBillOrderDO();
+            invoiceBillOrderDO.setStatus(ApplyStatusEnum.AUDIT_REFUSE.getStatus());
+            invoiceBillOrderService.updateById(invoiceBillOrderDO);
+        } else if (ApplyTypeEnum.CHECK_BILL_APPLY.getType().equals(applyDO.getType())) {
+            OrderLockFieldVO lockFieldVO = JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
+            ProducePaymentCheckBillOrderDO checkBillOrderDO = lockFieldVO.getCheckBillOrderDO();
+            checkBillOrderDO.setStatus(ApplyStatusEnum.AUDIT_REFUSE.getStatus());
+            checkBillOrderService.updateById(checkBillOrderDO);
+        } else if(ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())){
+            OrderLockFieldVO lockFieldVO = JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
+            ProducePaymentCheckBillOrderDO checkBillOrderDO = lockFieldVO.getCheckBillOrderDO();
+            checkBillOrderDO.setDepartmentInvoiceStatus(ApplyStatusEnum.AUDIT_REFUSE.getStatus());
+
+            ProducePaymentCheckBillOrderDO invoiceInfoDO = checkBillOrderService.getById(checkBillOrderDO.getId());
+            //传递给审核一直都是最新的发票。
+            if(com.order.erp.common.utils.StringUtils.isNotBlank(invoiceInfoDO.getInvoiceUrl())){
+                log.info("checkBillOrderDO.getInvoiceUrl() 极有可能为空: {}", checkBillOrderDO.getInvoiceUrl());
+                if(Arrays.stream(invoiceInfoDO.getInvoiceUrl().split(",")).anyMatch(item->item.equals(checkBillOrderDO.getInvoiceUrl()))){
+                    // 将 invoiceUrls 分割成 List 并删除相同项
+                    List<String> urlList = new ArrayList<>(Arrays.asList(invoiceInfoDO.getInvoiceUrl().split(",")));
+                    urlList.removeIf(url -> url.equals(checkBillOrderDO.getInvoiceUrl()));
+
+                    // 将更新后的 List 转换回逗号分隔的字符串并重新设置
+                    String updatedInvoiceUrls = String.join(",", urlList);
+                    checkBillOrderDO.setInvoiceUrl(updatedInvoiceUrls);
+                }
+            }else{
+                checkBillOrderDO.setInvoiceUrl(null);
+            }
+            checkBillOrderService.updateById(checkBillOrderDO);
         }
+
         OrderAuditLogDO auditLogDO = OrderAuditLogDO.builder().applyId(applyDO.getId()).orderId(applyDO.getOrderId()).optType(ApplyStatusEnum.AUDIT_REFUSE.getDesc()).build();
         applyService.updateById(applyDO);
@@ -516,6 +631,45 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             }
             orderBaseInfoDO.setOrderStatus(OrderStatusEnum.PROFIT_AUDIT_PASS.getStatus());
             orderBaseInfoService.updateById(orderBaseInfoDO);
+        } else if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType())) {
+            applyDO.setAuditUserId(auditUserId);
+            applyDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
+            OrderLockFieldVO lockFieldVO =  JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
+            InvoiceBillOrderDO invoiceBillOrderDO = lockFieldVO.getInvoiceBillOrderDO();
+            invoiceBillOrderDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
+            invoiceBillOrderService.updateById(invoiceBillOrderDO);
+        } else if (ApplyTypeEnum.CHECK_BILL_APPLY.getType().equals(applyDO.getType())) {
+            applyDO.setAuditUserId(auditUserId);
+            applyDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
+            OrderLockFieldVO lockFieldVO = JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
+            ProducePaymentCheckBillOrderDO checkBillOrderDO = lockFieldVO.getCheckBillOrderDO();
+            checkBillOrderDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
+            checkBillOrderService.updateById(checkBillOrderDO);
+        }  else if (ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())) {
+            applyDO.setAuditUserId(auditUserId);
+            applyDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
+            OrderLockFieldVO lockFieldVO = JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
+            ProducePaymentCheckBillOrderDO checkBillOrderDO = lockFieldVO.getCheckBillOrderDO();
+            checkBillOrderDO.setDepartmentInvoiceStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
+            //查询旧的。
+            ProducePaymentCheckBillOrderDO invoiceInfoDO = checkBillOrderService.getById(checkBillOrderDO.getId());
+            //传递给审核一直都是最新的发票。
+            if(com.order.erp.common.utils.StringUtils.isNotBlank(invoiceInfoDO.getInvoiceUrl())){
+                if(com.order.erp.common.utils.StringUtils.isNotBlank(checkBillOrderDO.getInvoiceUrl())){
+                    Set<String> deductUrlSet = new HashSet<>(Arrays.asList(
+                            org.apache.commons.lang3.StringUtils.defaultString(invoiceInfoDO.getInvoiceUrl()).split(",")));
+                    if(!deductUrlSet.contains(checkBillOrderDO.getInvoiceUrl())){
+                        deductUrlSet.add(checkBillOrderDO.getInvoiceUrl());
+                        String updateDeductUrl=String.join(",",deductUrlSet);
+                        checkBillOrderDO.setInvoiceUrl(updateDeductUrl);
+                    }
+                }
+            }else{
+                if(com.order.erp.common.utils.StringUtils.isNotBlank(checkBillOrderDO.getInvoiceUrl())){
+                    checkBillOrderDO.setInvoiceUrl(checkBillOrderDO.getInvoiceUrl());
+                }
+            }
+            checkBillOrderService.updateById(checkBillOrderDO);
         }
         OrderAuditLogDO auditLogDO = OrderAuditLogDO.builder().applyId(applyDO.getId()).orderId(applyDO.getOrderId()).optType(ApplyStatusEnum.AUDIT_PASS.getDesc()).build();
+package com.order.erp.service.order.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.stupdit1t.excel.common.PoiWorkbookType;
+import com.github.stupdit1t.excel.core.ExcelHelper;
+import com.github.stupdit1t.excel.style.CellPosition;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.constant.ServerResultCode;
+import com.order.erp.common.exception.BusinessException;
+import com.order.erp.common.utils.DateUtils;
+import com.order.erp.common.utils.StringUtils;
+import com.order.erp.common.utils.TransactionHelper;
+import com.order.erp.config.DataScope;
+import com.order.erp.domain.ApplyStatusEnum;
+import com.order.erp.domain.ApplyTypeEnum;
+import com.order.erp.domain.RoleEnum;
+import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.SystemSettingDO;
+import com.order.erp.domain.dto.order.*;
+import com.order.erp.domain.vo.order.*;
+import com.order.erp.mapper.order.ProducePaymentCheckBillOrderMapper;
+import com.order.erp.service.SystemSettingService;
+import com.order.erp.service.order.*;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@Slf4j
+@Service
+public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl<ProducePaymentCheckBillOrderMapper, ProducePaymentCheckBillOrderDO> implements ProducePaymentCheckBillOrderService {
+
+    @Resource
+    private CheckBillMappingService checkBillMappingService;
+
+    @Resource
+    private OrderBaseInfoService orderBaseInfoService;
+
+    @Resource
+    private OrderProfitAnalysisService profitAnalysisService;
+
+    @Resource
+    private SystemSettingService systemSettingService;
+
+    @Resource
+    private OrderFieldLockApplyService orderFieldLockApplyService;
+
+    @Resource
+    private DataScope dataScope;
+
+    @Resource
+    private TransactionHelper transactionHelper;
+
+
+    /**
+     * 分页查询
+     *
+     * @param queryVO 筛选条件
+     * @return 查询结果
+     */
+    @Override
+    public ServerResult listByPage(ProducePaymentCheckBillOrderQueryVO queryVO) {
+        RoleEnum role = dataScope.getRole();
+        LambdaQueryWrapper<ProducePaymentCheckBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
+        //生产科,生产科只能看到属于自己的订单。
+        if(Objects.nonNull(role) && role.getId().equals(RoleEnum.PRODUCE_USER.getId())){
+            queryWrapper.eq(ProducePaymentCheckBillOrderDO::getProductionName, dataScope.getLoginUserName());
+        }
+        //跟单也只能看到自己创建的,业务只能看到自己的
+        if(Objects.nonNull(role) && role.getId().equals(RoleEnum.TRACKER_USER.getId())){
+            queryWrapper.eq(ProducePaymentCheckBillOrderDO::getCreateBy, dataScope.getLoginUserName());
+        }
+        if(Objects.nonNull(role) && role.getId().equals(RoleEnum.BUSINESS_USER.getId())){
+            queryWrapper.eq(ProducePaymentCheckBillOrderDO::getBusinesPerson, dataScope.getLoginUserName());
+        }
+        Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
+        IPage<ProducePaymentCheckBillOrderDO> iPage = page(page, queryWrapper);
+        return ServerResult.success(iPage);
+    }
+
+    @Override
+    public ServerResult listBaseOrderInfoBy(ProducePaymentBaseOrderQueryVO queryVO) {
+        List<CheckBillMappingDO> mappingDOS = checkBillMappingService.list(new LambdaQueryWrapper<CheckBillMappingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(CheckBillMappingDO::getCheckNo, queryVO.getCheckNo()));
+        if (CollectionUtils.isEmpty(mappingDOS)) {
+            return ServerResult.success();
+        }
+        Set<Long> orderIds = mappingDOS.stream().map(CheckBillMappingDO::getOrderId).collect(Collectors.toSet());
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
+        List<OrderProfitAnalysisDO> profitAnalysisDOList = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderProfitAnalysisDO::getOrderId, orderIds));
+        Map<Long, OrderBaseInfoDO> orderBaseInfoDOMap = orderBaseInfoDOList.stream().collect(Collectors.toMap(OrderBaseInfoDO::getId, Function.identity(), (x, y) -> x));
+        Map<Long, OrderProfitAnalysisDO> profitAnalysisDOMap = profitAnalysisDOList.stream().collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity(), (x, y) -> x));
+        List<CheckBillOrdeBaseResultVO> list = orderBaseInfoDOList.stream().map(x -> {
+            if (orderBaseInfoDOMap.containsKey(x.getId()) && profitAnalysisDOMap.containsKey(x.getId())) {
+                CheckBillOrdeBaseResultVO resultVO = new CheckBillOrdeBaseResultVO();
+                resultVO.setCustomerCode(orderBaseInfoDOMap.get(x.getId()).getCustomerCode());
+                resultVO.setProjectNo(orderBaseInfoDOMap.get(x.getId()).getProjectNo());
+                resultVO.setInnerNo(orderBaseInfoDOMap.get(x.getId()).getInnerNo());
+                resultVO.setCustomerPo(orderBaseInfoDOMap.get(x.getId()).getCustomerPo());
+                resultVO.setCustomerStyle(orderBaseInfoDOMap.get(x.getId()).getCustomerStyle());
+                resultVO.setModeleLo(orderBaseInfoDOMap.get(x.getId()).getModeleLo());
+                resultVO.setSmallPicUrl(orderBaseInfoDOMap.get(x.getId()).getSmallPicUrl());
+                resultVO.setOrderCount(orderBaseInfoDOMap.get(x.getId()).getOrderCount());
+                resultVO.setProductionDepartmentPrice(profitAnalysisDOMap.get(x.getId()).getProductionDepartmentPrice());
+                resultVO.setProductionDepartmentTotalPrice(profitAnalysisDOMap.get(x.getId()).getProductionDepartmentTotalPrice());
+                return resultVO;
+            } else {
+                return null;
+            }
+        }).filter(Objects::nonNull).collect(Collectors.toList());
+        return ServerResult.success(list);
+    }
+
+    @Override
+    public ServerResult listAnalysisBy(ProducePaymentCheckBillOrderQueryVO queryVO) {
+        return ServerResult.success(getAnalysisResult(queryVO));
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+
+//    private CheckBillAnalysisResultVO getAnalysisResult(ProducePaymentCheckBillOrderQueryVO queryVO) {
+    //第二版开始。
+        private List<CheckBillAnalysisResultVO> getAnalysisResult(ProducePaymentCheckBillOrderQueryVO queryVO) {
+            //第二版截止。
+        LambdaQueryWrapper<ProducePaymentCheckBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
+        List<ProducePaymentCheckBillOrderDO> checkBillOrderDOS = list(queryWrapper);
+        if (CollectionUtils.isEmpty(checkBillOrderDOS)) {
+            return null;
+        }
+        Set<Long> ids = checkBillOrderDOS.stream().map(ProducePaymentCheckBillOrderDO::getId).collect(Collectors.toSet());
+        List<CheckBillMappingDO> checkBillMappingDOS = checkBillMappingService.list(new LambdaQueryWrapper<CheckBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(CheckBillMappingDO::getCheckBillId, ids));
+        if (CollectionUtils.isEmpty(checkBillMappingDOS)) {
+            return null;
+        }
+        Map<Long, CheckBillMappingDO> orderBillMap = checkBillMappingDOS.stream().collect(Collectors.toMap(CheckBillMappingDO::getOrderId, Function.identity(), (x, y) -> x));
+        List<CheckOrderBaseItemVO> itemVOS = getCheckOrderBaseItems(orderBillMap);
+        Map<String, ProducePaymentCheckBillOrderDO> checkBillOrderDOMap = checkBillOrderDOS.stream().collect(Collectors.toMap(ProducePaymentCheckBillOrderDO::getCheckNo, Function.identity(), (x, y) -> x));
+        Map<String, List<CheckOrderBaseItemVO>> baseItemMap = itemVOS.stream().collect(Collectors.groupingBy(CheckOrderBaseItemVO::getCheckNo));
+        List<CheckBillAnalysisExportVO> exportVOS = wrapperAnalysisExport(checkBillOrderDOMap, baseItemMap);
+        return wrapperAnalysisResultVO(exportVOS);
+    }
+
+    /**
+     * @param exportVOS
+     * @return
+     */
+//    private CheckBillAnalysisResultVO wrapperAnalysisResultVO(List<CheckBillAnalysisExportVO> exportVOS) {
+//        if (CollectionUtils.isEmpty(exportVOS)) {
+//            return null;
+//        }
+//        CheckBillAnalysisResultVO resultVO = CheckBillAnalysisResultVO.builder().exportVOS(exportVOS).build();
+//        BigDecimal productionDepartmentTotalPrice = new BigDecimal(Constant.ZERO);
+//        BigDecimal deductAmount = new BigDecimal(Constant.ZERO);
+//        BigDecimal actualPayedAmount = new BigDecimal(Constant.ZERO);
+//        BigDecimal calculateActualPayedAmount = new BigDecimal(Constant.ZERO);
+//        BigDecimal unPayedAmount = new BigDecimal(Constant.ZERO);
+//        for (CheckBillAnalysisExportVO exportVO : exportVOS) {
+//            if (Objects.nonNull(exportVO.getProductionDepartmentTotalPrice())) {
+//                productionDepartmentTotalPrice = productionDepartmentTotalPrice.add(exportVO.getProductionDepartmentTotalPrice());
+//            }
+//            if (Objects.nonNull(exportVO.getDeductAmount())) {
+//                deductAmount = deductAmount.add(exportVO.getDeductAmount());
+//            }
+//            if (Objects.nonNull(exportVO.getActualPayedAmount())) {
+//                actualPayedAmount = actualPayedAmount.add(exportVO.getActualPayedAmount());
+//            }
+//            if (Objects.nonNull(exportVO.getCalculateActualPayedAmount())) {
+//                calculateActualPayedAmount = calculateActualPayedAmount.add(exportVO.getCalculateActualPayedAmount());
+//            }
+//            if (Objects.nonNull(exportVO.getUnPayedAmount())) {
+//                unPayedAmount = unPayedAmount.add(exportVO.getUnPayedAmount());
+//            }
+//        }
+//        resultVO.setProductionDepartmentTotalPrice(productionDepartmentTotalPrice.setScale(2, RoundingMode.HALF_UP));
+//        resultVO.setDeductAmount(deductAmount.setScale(2, RoundingMode.HALF_UP));
+//        resultVO.setActualPayedAmount(actualPayedAmount.setScale(2, RoundingMode.HALF_UP));
+//        resultVO.setCalculateActualPayedAmount(calculateActualPayedAmount.setScale(2, RoundingMode.HALF_UP));
+//        resultVO.setUnPayedAmount(unPayedAmount.setScale(2, RoundingMode.HALF_UP));
+//        return resultVO;
+//    }
+
+    //第二版开始。
+    private List<CheckBillAnalysisResultVO> wrapperAnalysisResultVO(List<CheckBillAnalysisExportVO> exportVOS) {
+        if (CollectionUtils.isEmpty(exportVOS)) {
+            return null;
+        }
+        Map<String,List<CheckBillAnalysisExportVO>> groupedByProductionDepartment =exportVOS.stream()
+                .collect(Collectors.groupingBy(CheckBillAnalysisExportVO::getProductionDepartment));
+        List<CheckBillAnalysisResultVO> resultVOList=new ArrayList<>();
+        groupedByProductionDepartment.forEach((productionDepartment,exportVOList) -> {
+            CheckBillAnalysisResultVO resultVO = CheckBillAnalysisResultVO.builder().exportVOS(exportVOList).build();
+            BigDecimal productionDepartmentTotalPrice = new BigDecimal(Constant.ZERO);
+            BigDecimal deductAmount = new BigDecimal(Constant.ZERO);
+            BigDecimal actualPayedAmount = new BigDecimal(Constant.ZERO);
+//            BigDecimal calculateActualPayedAmount = new BigDecimal(Constant.ZERO);
+//            BigDecimal unPayedAmount = new BigDecimal(Constant.ZERO);
+            for (CheckBillAnalysisExportVO exportVO : exportVOList) {
+                if (Objects.nonNull(exportVO.getProductionDepartmentTotalPrice())) {
+                    productionDepartmentTotalPrice = productionDepartmentTotalPrice.add(exportVO.getProductionDepartmentTotalPrice());
+                }
+                if (Objects.nonNull(exportVO.getDeductAmount())) {
+                    deductAmount = deductAmount.add(exportVO.getDeductAmount());
+                }
+                if (Objects.nonNull(exportVO.getActualPayedAmount())) {
+                    actualPayedAmount = actualPayedAmount.add(exportVO.getActualPayedAmount());
+                }
+//                if (Objects.nonNull(exportVO.getCalculateActualPayedAmount())) {
+//                    calculateActualPayedAmount = calculateActualPayedAmount.add(exportVO.getCalculateActualPayedAmount());
+//                }
+//                if (Objects.nonNull(exportVO.getUnPayedAmount())) {
+//                    unPayedAmount = unPayedAmount.add(exportVO.getUnPayedAmount());
+//                }
+            }
+            resultVO.setProductionDepartmentTotalPrice(productionDepartmentTotalPrice.setScale(2, RoundingMode.HALF_UP));
+            resultVO.setDeductAmount(deductAmount.setScale(2, RoundingMode.HALF_UP));
+            resultVO.setActualPayedAmount(actualPayedAmount.setScale(2, RoundingMode.HALF_UP));
+            resultVO.setCalculateActualPayedAmount(resultVO.getProductionDepartmentTotalPrice().subtract(resultVO.getDeductAmount()).setScale(2, RoundingMode.HALF_UP));
+            resultVO.setUnPayedAmount(resultVO.getCalculateActualPayedAmount().subtract(resultVO.getActualPayedAmount()).setScale(2, RoundingMode.HALF_UP));
+            resultVOList.add(resultVO);
+        });
+        return resultVOList;
+    }
+//第二版结束。
+
+    /**
+     * @param checkBillOrderDOMap
+     * @param baseItemMap
+     * @return
+     */
+    private List<CheckBillAnalysisExportVO> wrapperAnalysisExport(Map<String, ProducePaymentCheckBillOrderDO> checkBillOrderDOMap, Map<String, List<CheckOrderBaseItemVO>> baseItemMap) {
+        if (CollectionUtils.isEmpty(checkBillOrderDOMap)) {
+            return Collections.emptyList();
+        }
+        List<CheckBillAnalysisExportVO> results = new ArrayList<>();
+        for (Map.Entry<String, ProducePaymentCheckBillOrderDO> entry : checkBillOrderDOMap.entrySet()) {
+            ProducePaymentCheckBillOrderDO checkBillOrderDO = entry.getValue();
+            List<CheckBillAnalysisExportVO> exportVOS = transfer2analysisExportVO(checkBillOrderDO, baseItemMap);
+            if (CollectionUtils.isNotEmpty(exportVOS)) {
+                results.addAll(exportVOS);
+            }
+        }
+        return results;
+    }
+
+    /**
+     * @param checkBillOrderDO
+     * @param baseItemMap
+     * @return
+     */
+    private List<CheckBillAnalysisExportVO> transfer2analysisExportVO(ProducePaymentCheckBillOrderDO checkBillOrderDO, Map<String, List<CheckOrderBaseItemVO>> baseItemMap) {
+        List<CheckBillAnalysisExportVO> results = new ArrayList<>();
+        String checkNo = checkBillOrderDO.getCheckNo();
+        if (baseItemMap.containsKey(checkNo)) {
+            List<CheckOrderBaseItemVO> baseItemVOS = baseItemMap.get(checkNo);
+            Map<String, List<CheckOrderBaseItemVO>> listMap = baseItemVOS.stream().collect(Collectors.groupingBy(CheckOrderBaseItemVO::getProductionDepartment));
+            for (Map.Entry<String, List<CheckOrderBaseItemVO>> entry : listMap.entrySet()) {
+                String productionDepartment = entry.getKey();
+                List<CheckOrderBaseItemVO> itemVOS = entry.getValue();
+                CheckBillAnalysisExportVO exportVO = buildAnalysisExportVO(checkBillOrderDO);
+                exportVO.setProductionDepartment(productionDepartment);
+                if (CollectionUtils.isEmpty(itemVOS)) {
+                    exportVO.setProductionDepartmentTotalPrice(new BigDecimal(Constant.ZERO));
+                } else {
+                    BigDecimal productionDepartmentTotalPrice = new BigDecimal(Constant.ZERO);
+                    for (CheckOrderBaseItemVO itemVO : itemVOS) {
+                        productionDepartmentTotalPrice = productionDepartmentTotalPrice.add(Objects.nonNull(itemVO.getProductionDepartmentTotalPrice()) ? itemVO.getProductionDepartmentTotalPrice() : new BigDecimal(Constant.ZERO));
+                    }
+                    exportVO.setProductionDepartmentTotalPrice(productionDepartmentTotalPrice.setScale(2, RoundingMode.HALF_UP));
+                }
+                results.add(exportVO);
+            }
+        }
+        return results;
+    }
+
+    /**
+     * @param checkBillOrderDO
+     * @return
+     */
+    private CheckBillAnalysisExportVO buildAnalysisExportVO(ProducePaymentCheckBillOrderDO checkBillOrderDO) {
+        CheckBillAnalysisExportVO exportVO = new CheckBillAnalysisExportVO();
+        BeanUtils.copyProperties(checkBillOrderDO, exportVO);
+        // 应付
+        BigDecimal actualPayedAmount = Objects.nonNull(checkBillOrderDO.getActualPayedAmount()) ? checkBillOrderDO.getActualPayedAmount() : new BigDecimal(Constant.ZERO);
+        BigDecimal deductAmount = Objects.nonNull(checkBillOrderDO.getDeductAmount()) ? checkBillOrderDO.getDeductAmount() : new BigDecimal(Constant.ZERO);
+        BigDecimal totalActualPayedAmount = Objects.nonNull(checkBillOrderDO.getTotalActualPayedAmount()) ? checkBillOrderDO.getTotalActualPayedAmount() : new BigDecimal(Constant.ZERO);
+        //   返回    实付
+        exportVO.setActualPayedAmount(totalActualPayedAmount.setScale(2, RoundingMode.HALF_UP));
+//        BigDecimal calculateActualPayedAmount = actualPayedAmount.subtract(deductAmount);
+        //第二版 可删  应付减去实付
+        BigDecimal calculateActualPayedAmount = actualPayedAmount.subtract(totalActualPayedAmount);
+        //返回应付
+        exportVO.setCalculateActualPayedAmount(actualPayedAmount.setScale(2, RoundingMode.HALF_UP));
+        // 返回未付
+        exportVO.setUnPayedAmount(calculateActualPayedAmount.setScale(2, RoundingMode.HALF_UP));
+        //保留小数点后两位。
+       exportVO.setDeductAmount(exportVO.getDeductAmount().setScale(2, RoundingMode.HALF_UP));
+        return exportVO;
+    }
+
+    /**
+     * @param mappingDOMap
+     * @return
+     */
+    private List<CheckOrderBaseItemVO> getCheckOrderBaseItems(Map<Long, CheckBillMappingDO> mappingDOMap) {
+        Set<Long> orderIds = mappingDOMap.keySet();
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
+        List<OrderProfitAnalysisDO> profitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderProfitAnalysisDO::getOrderId, orderIds));
+        Map<Long, OrderBaseInfoDO> orderBaseInfoDOMap = orderBaseInfoDOList.stream().collect(Collectors.toMap(OrderBaseInfoDO::getId, Function.identity(), (x, y) -> x));
+        Map<Long, OrderProfitAnalysisDO> profitAnalysisDOMap = profitAnalysisDOS.stream().collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity(), (x, y) -> x));
+        List<CheckOrderBaseItemVO> baseItemVOS = new ArrayList<>();
+        for (Map.Entry<Long, OrderBaseInfoDO> entry : orderBaseInfoDOMap.entrySet()) {
+            Long orderId = entry.getKey();
+            OrderBaseInfoDO baseInfoDO = entry.getValue();
+            CheckOrderBaseItemVO itemVO = CheckOrderBaseItemVO.builder()
+                    .orderId(orderId)
+                    .productionDepartment(baseInfoDO.getProductionDepartment())
+                    .build();
+            if (profitAnalysisDOMap.containsKey(orderId)) {
+                OrderProfitAnalysisDO profitAnalysisDO = profitAnalysisDOMap.get(orderId);
+                itemVO.setProductionDepartmentTotalPrice(Objects.isNull(profitAnalysisDO.getProductionDepartmentTotalPrice()) ? new BigDecimal(Constant.ZERO) : new BigDecimal(profitAnalysisDO.getProductionDepartmentTotalPrice()));
+            } else {
+                itemVO.setProductionDepartmentTotalPrice(new BigDecimal(Constant.ZERO));
+            }
+
+            if (mappingDOMap.containsKey(orderId)) {
+                CheckBillMappingDO mappingDO = mappingDOMap.get(orderId);
+                itemVO.setCheckNo(mappingDO.getCheckNo());
+            }
+            baseItemVOS.add(itemVO);
+        }
+        return baseItemVOS;
+    }
+
+
+    @Override
+    public ServerResult export(HttpServletResponse response, ProducePaymentCheckBillOrderQueryVO queryVO) throws IOException {
+//        CheckBillAnalysisResultVO resultVO = getAnalysisResult(queryVO);
+        //第二版开始
+        List<CheckBillAnalysisResultVO> resultVO = getAnalysisResult(queryVO);
+        //第二版结束
+        if (Objects.isNull(resultVO)) {
+            throw new BusinessException("数据为空，不能导出！");
+        }
+        List<Map<String, Object>> list = buildExportMapVOS(resultVO);
+        if (CollectionUtils.isNotEmpty(list)) {
+            List<String> keys = new ArrayList<>(list.get(Constant.ZERO).keySet());
+
+            ExcelHelper.opsExport(PoiWorkbookType.XLSX)
+                    .opsSheet(list)
+                    .opsHeader().simple().texts(keys).done()
+                    .opsColumn().fields(keys).done()
+                    .height(CellPosition.CELL, 750)
+                    .done()
+                    .export(response.getOutputStream());
+        }
+        return ServerResult.success();
+    }
+
+    /**
+     * @param resultVO
+     * @return
+     */
+//    private List<Map<String, Object>> buildExportMapVOS(CheckBillAnalysisResultVO resultVO) throws IOException {
+        //第二版开始。
+        private List<Map<String, Object>> buildExportMapVOS(List<CheckBillAnalysisResultVO> resultVO) throws IOException {
+            //第二版结束。
+
+      /*  List<CheckBillAnalysisExportVO> exportVOS = resultVO.getExportVOS();
+        List<Map<String, Object>> list = new ArrayList<>();
+        int i = 0;
+        for (CheckBillAnalysisExportVO exportVO : exportVOS) {
+            Map<String, Object> map = new LinkedHashMap<>();
+            map.put("编号", i++);
+            map.put("生产科名称", exportVO.getProductionDepartment());
+            map.put("生产科对账单号码", exportVO.getCheckNo());
+            map.put("生产科总价汇总", exportVO.getProductionDepartmentTotalPrice());
+            map.put("生产科扣款金额汇总", exportVO.getDeductAmount());
+            map.put("生产科实际应付金额", exportVO.getCalculateActualPayedAmount());
+            map.put("实际付款金额汇总", exportVO.getActualPayedAmount());
+            map.put("未付金额金额", exportVO.getUnPayedAmount());
+            map.put("生产科应付款日期", exportVO.getPayedDate());
+            map.put("实际付款日期", exportVO.getActualPayedDate());
+            list.add(map);
+        }
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("编号", i++);
+        map.put("生产科名称", "");
+        map.put("生产科对账单号码", "");
+        map.put("生产科总价汇总", resultVO.getProductionDepartmentTotalPrice());
+        map.put("生产科扣款金额汇总", resultVO.getDeductAmount());
+        map.put("生产科实际应付金额", resultVO.getCalculateActualPayedAmount());
+        map.put("实际付款金额汇总", resultVO.getActualPayedAmount());
+        map.put("未付金额金额", resultVO.getUnPayedAmount());
+        map.put("生产科应付款日期", "");
+        map.put("实际付款日期", "");
+        list.add(map);*/
+
+
+//            List<CheckBillAnalysisExportVO> exportVOS = resultVO.getExportVOS();
+
+            //第二版开始。
+            List<CheckBillAnalysisExportVO> exportVOS = resultVO.stream().flatMap(x -> x.getExportVOS().stream())
+                    .collect(Collectors.toList());
+            //第二版结束。
+
+        List<Map<String, Object>> list = new ArrayList<>();
+        int i = 1; // Start index from 1
+        // 根据生产科分组
+        Map<String, List<CheckBillAnalysisExportVO>> customerGroupedMap = exportVOS.stream()
+                .collect(Collectors.groupingBy(CheckBillAnalysisExportVO::getProductionDepartment));
+        boolean multipleCustomerCodes = customerGroupedMap.size() > 1;
+        BigDecimal totalCustomerTotalPrice = BigDecimal.ZERO;
+        BigDecimal totalDeductAmount = BigDecimal.ZERO;
+        BigDecimal totalActualReceivableAmount = BigDecimal.ZERO;
+        BigDecimal totalActualPayedAmount = BigDecimal.ZERO;
+        BigDecimal totalOtherAmount = BigDecimal.ZERO;
+        for (Map.Entry<String, List<CheckBillAnalysisExportVO>> entry : customerGroupedMap.entrySet()) {
+            String customerCode = entry.getKey();
+            List<CheckBillAnalysisExportVO> customerItems = entry.getValue();
+            BigDecimal subTotalCustomerTotalPrice = BigDecimal.ZERO;
+            BigDecimal subTotalDeductAmount = BigDecimal.ZERO;
+            BigDecimal subTotalActualReceivableAmount = BigDecimal.ZERO;
+            BigDecimal subTotalActualPayedAmount = BigDecimal.ZERO;
+            BigDecimal subTotalOtherAmount = BigDecimal.ZERO;
+            for (CheckBillAnalysisExportVO exportVO : customerItems) {
+                Map<String, Object> map = new LinkedHashMap<>();
+                map.put("编号", i++);
+                map.put("生产科名称", exportVO.getProductionDepartment());
+                map.put("生产科对账单号码", exportVO.getCheckNo());
+                map.put("生产科总价汇总", "￥"+exportVO.getProductionDepartmentTotalPrice());
+                map.put("生产科扣款金额汇总", "￥"+exportVO.getDeductAmount());
+                map.put("生产科实际应付金额", "￥"+exportVO.getCalculateActualPayedAmount());
+                map.put("实际付款金额汇总", "￥"+exportVO.getActualPayedAmount());
+                map.put("未付金额金额","￥"+exportVO.getUnPayedAmount());
+                map.put("生产科应付款日期", exportVO.getPayedDate());
+                map.put("实际付款日期", exportVO.getActualPayedDate());
+                list.add(map);
+                // 初始化数据
+                subTotalCustomerTotalPrice = subTotalCustomerTotalPrice.add(exportVO.getProductionDepartmentTotalPrice() == null ? BigDecimal.ZERO : exportVO.getProductionDepartmentTotalPrice());
+                subTotalDeductAmount = subTotalDeductAmount.add(exportVO.getDeductAmount() == null ? BigDecimal.ZERO : exportVO.getDeductAmount());
+                subTotalActualReceivableAmount = subTotalActualReceivableAmount.add(exportVO.getCalculateActualPayedAmount() == null ? BigDecimal.ZERO : exportVO.getCalculateActualPayedAmount());
+                subTotalActualPayedAmount = subTotalActualPayedAmount.add(exportVO.getActualPayedAmount() == null ? BigDecimal.ZERO : exportVO.getActualPayedAmount());
+                subTotalOtherAmount = subTotalOtherAmount.add(exportVO.getUnPayedAmount() == null ? BigDecimal.ZERO : exportVO.getUnPayedAmount());
+            }
+            // 如果客户编码有多个就添加小计。
+            if (multipleCustomerCodes) {
+                Map<String, Object> subTotalMap = new LinkedHashMap<>();
+                subTotalMap.put("编号", "小计");
+                subTotalMap.put("生产科名称", "");
+                subTotalMap.put("生产科对账单号码", "");
+                subTotalMap.put("生产科总价汇总", "￥"+subTotalCustomerTotalPrice);
+                subTotalMap.put("生产科扣款金额汇总", "￥"+subTotalDeductAmount);
+                subTotalMap.put("生产科实际应付金额", "￥"+subTotalActualReceivableAmount);
+                subTotalMap.put("实际付款金额汇总", "￥"+subTotalActualPayedAmount);
+                subTotalMap.put("未付金额金额", "￥"+subTotalOtherAmount);
+                subTotalMap.put("生产科应付款日期", "");
+                subTotalMap.put("实际付款日期", "");
+                list.add(subTotalMap);
+            }
+            // Calculate totals
+            totalCustomerTotalPrice = totalCustomerTotalPrice.add(subTotalCustomerTotalPrice);
+            totalDeductAmount = totalDeductAmount.add(subTotalDeductAmount);
+            totalActualReceivableAmount = totalActualReceivableAmount.add(subTotalActualReceivableAmount);
+            totalActualPayedAmount = totalActualPayedAmount.add(subTotalActualPayedAmount);
+            totalOtherAmount = totalOtherAmount.add(subTotalOtherAmount);
+
+        }
+        // 计算总数据。
+        Map<String, Object> totalMap = new LinkedHashMap<>();
+        totalMap.put("编号", "合计");
+        totalMap.put("生产科名称", "");
+        totalMap.put("生产科对账单号码", "");
+        totalMap.put("生产科总价汇总", "￥"+totalCustomerTotalPrice);
+        totalMap.put("生产科扣款金额汇总", "￥"+totalDeductAmount);
+        totalMap.put("生产科实际应付金额", "￥"+totalActualReceivableAmount);
+        totalMap.put("实际付款金额汇总", "￥"+totalActualPayedAmount);
+        totalMap.put("未付金额金额", "￥"+totalOtherAmount);
+        totalMap.put("生产科应付款日期", "");
+        totalMap.put("实际付款日期", "");
+        list.add(totalMap);
+        return list;
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private LambdaQueryWrapper<ProducePaymentCheckBillOrderDO> getQueryWrapper(ProducePaymentCheckBillOrderQueryVO queryVO) {
+        LambdaQueryWrapper<ProducePaymentCheckBillOrderDO> queryWrapper = new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>()
+                .eq(ProducePaymentCheckBillOrderDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(StringUtils.isNotBlank(queryVO.getCheckNo()), ProducePaymentCheckBillOrderDO::getCheckNo, queryVO.getCheckNo())
+                .eq(Objects.nonNull(queryVO.getStatus()), ProducePaymentCheckBillOrderDO::getStatus, queryVO.getStatus())
+                .ge(StringUtils.isNotBlank(queryVO.getStartTime()), ProducePaymentCheckBillOrderDO::getCreateTime, queryVO.getStartTime())
+                .le(StringUtils.isNotBlank(queryVO.getEndTime()), ProducePaymentCheckBillOrderDO::getCreateTime, queryVO.getEndTime())
+                .orderByDesc(ProducePaymentCheckBillOrderDO::getId);
+        if (CollectionUtils.isNotEmpty(queryVO.getIds())) {
+            queryWrapper.in(ProducePaymentCheckBillOrderDO::getId, queryVO.getIds());
+        } else {
+            Set<Long> billOrderIds = filterBillOrderIdsBy(queryVO);
+            queryWrapper.in(CollectionUtils.isNotEmpty(billOrderIds), ProducePaymentCheckBillOrderDO::getId, billOrderIds);
+        }
+        return queryWrapper;
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private Set<Long> filterBillOrderIdsBy(ProducePaymentCheckBillOrderQueryVO queryVO) {
+        List<Long> orderIds = filterOrderIdsBy(queryVO);
+        if (CollectionUtils.isEmpty(orderIds)) {
+            return null;
+        }
+        List<CheckBillMappingDO> mappingDOS = checkBillMappingService.list(new LambdaQueryWrapper<CheckBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(CollectionUtils.isNotEmpty(orderIds), CheckBillMappingDO::getOrderId, orderIds));
+        if (CollectionUtils.isEmpty(mappingDOS)) {
+            Set<Long> ids = new HashSet<>();
+            ids.add(-1L);
+            return ids;
+        }
+        return mappingDOS.stream().map(CheckBillMappingDO::getCheckBillId).collect(Collectors.toSet());
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private List<Long> filterOrderIdsBy(ProducePaymentCheckBillOrderQueryVO queryVO) {
+        Boolean flag = false;
+        if (StringUtils.isNotBlank(queryVO.getCustomerCode())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getProductionDepartment())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getCustomerPo())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getInnerNo())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getProjectNo())) {
+            flag = flag | true;
+        }
+        if (!flag) {
+            return null;
+        }
+        LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = new LambdaQueryWrapper<OrderBaseInfoDO>()
+                .eq(OrderBaseInfoDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(StringUtils.isNotBlank(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
+                .eq(StringUtils.isNotBlank(queryVO.getProductionDepartment()), OrderBaseInfoDO::getProductionDepartment, queryVO.getProductionDepartment())
+                .eq(StringUtils.isNotBlank(queryVO.getCustomerPo()), OrderBaseInfoDO::getCustomerPo, queryVO.getCustomerPo())
+                .eq(StringUtils.isNotBlank(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo())
+                .eq(StringUtils.isNotBlank(queryVO.getProjectNo()), OrderBaseInfoDO::getProjectNo, queryVO.getProjectNo());
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(queryWrapper);
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            List<Long> orderIds = new ArrayList<>();
+            orderIds.add(-1L);
+            return orderIds;
+        }
+        return orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toList());
+    }
+
+    /**
+     * 创建生产科应付单据
+     *
+     * @param createVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult create(ProducePaymentCheckBillCreateVO createVO) {
+        if (Objects.nonNull(createVO.getId())) {
+            createVO.setId(null);
+        }
+        validaBillOrder(createVO);
+
+        ProducePaymentCheckBillOrderDO checkBillOrderDO = buildCheckBillOrderDO(createVO);
+
+        Boolean success = transactionHelper.run(() -> {
+            save(checkBillOrderDO);
+
+            checkBillMappingService.saveBatch(buildCheckBillMappingDOS(createVO, checkBillOrderDO));
+            return true;
+        });
+        if(success){
+            List<CheckBillMappingDO> checkBillMappingDOS = checkBillMappingService.list(new LambdaQueryWrapper<CheckBillMappingDO>()
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .eq(CheckBillMappingDO::getCheckNo, checkBillOrderDO.getCheckNo()));
+            if(CollectionUtils.isNotEmpty(checkBillMappingDOS)){
+                List<Long> orderIds = checkBillMappingDOS.stream().map(CheckBillMappingDO::getOrderId).collect(Collectors.toList());
+                List<OrderProfitAnalysisDO> orderProfitAnalysisList = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .in(OrderProfitAnalysisDO::getOrderId, orderIds));
+                List<OrderProfitAnalysisDO> orderProfitAnalysisDOS = orderProfitAnalysisList.stream()
+                        .collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity(), (existing, replacement) -> existing))
+                        .values()
+                        .stream()
+                        .collect(Collectors.toList());
+                if(CollectionUtils.isNotEmpty(orderProfitAnalysisDOS)){
+                    BigDecimal totalConvertedAmount = orderProfitAnalysisDOS.stream().map(order -> BigDecimal.valueOf(order.getProductionDepartmentTotalPrice()))
+                            .reduce(BigDecimal.ZERO, BigDecimal::add);
+                    BigDecimal formattedSum = totalConvertedAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
+                    if(Objects.nonNull(formattedSum)){
+                        //客户总价金额汇总。
+                        checkBillOrderDO.setTotalProductionAmount(formattedSum);
+                        //设置实际应付金额汇总。
+                        checkBillOrderDO.setActualPayedAmount(checkBillOrderDO.getTotalProductionAmount());
+                    }else {
+                        checkBillOrderDO.setTotalProductionAmount( BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
+                        checkBillOrderDO.setActualPayedAmount(checkBillOrderDO.getTotalProductionAmount());
+                    }
+                }
+            }
+            //设置实际付款金额汇总,避免没有填写直接审核时没有数据。
+            checkBillOrderDO.setTotalActualPayedAmount(BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
+            //设置生产科扣款金额汇总,避免没有填写扣款金额时,到时候审核没有数据。
+            checkBillOrderDO.setDeductAmount(BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
+            //设置未付金额
+            checkBillOrderDO.setUnPayedAmount(checkBillOrderDO.getTotalProductionAmount().subtract(checkBillOrderDO.getTotalActualPayedAmount()).subtract(checkBillOrderDO.getDeductAmount()).setScale(2, BigDecimal.ROUND_HALF_UP));
+            updateById(checkBillOrderDO);
+        }
+        return ServerResult.success();
+    }
+
+    /**
+     * 获取生产科应回款日期
+     *
+     * @param createVO
+     * @return
+     */
+    @Override
+    public ServerResult getPayedDate(ProducePaymentCheckBillCreateVO createVO) {
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(createVO.getOrderIds());
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            throw new BusinessException("勾选的订单信息不存在！");
+        }
+
+        CheckHoldTimeItemVO checkHoldTimeItemVO = getProductionDepartmentHoldTime(orderBaseInfoDOList);
+        return ServerResult.success(calculatePayedDate(checkHoldTimeItemVO));
+    }
+
+    /**
+     * @param checkHoldTimeItemVO
+     * @return
+     */
+    private String calculatePayedDate(CheckHoldTimeItemVO checkHoldTimeItemVO) {
+        Integer holdDays = getHoldTimeByProductionDepartment(checkHoldTimeItemVO.getProductionDepartment());
+        LocalDateTime holdTime = DateUtils.parse(checkHoldTimeItemVO.getHoldTime(), DateUtils.DATE_TIME).plusDays(holdDays);
+        return DateUtils.format(holdTime, DateUtils.DATE);
+    }
+
+    /**
+     * @param productionDepartment
+     * @return
+     */
+    private Integer getHoldTimeByProductionDepartment(String productionDepartment) {
+        SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(SystemSettingDO::getSettingCode, "customerCode").eq(SystemSettingDO::getSettingValue, productionDepartment)
+                .eq(SystemSettingDO::getRelationCode, "produHodTime").last("limit 1"));
+        if (Objects.isNull(systemSettingDO)) {
+            return Constant.ZERO;
+        }
+        String holdTime = systemSettingDO.getRelationValue();
+        return StringUtils.isBlank(holdTime) ? Constant.ZERO : Integer.parseInt(holdTime);
+    }
+
+    /**
+     * @param orderBaseInfoDOList
+     * @return
+     */
+    private CheckHoldTimeItemVO getProductionDepartmentHoldTime(List<OrderBaseInfoDO> orderBaseInfoDOList) {
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            return null;
+        }
+
+        Map<String, OrderBaseInfoDO> holdTimeMap = new HashMap<String, OrderBaseInfoDO>();
+        String maxHoldTime = null;
+        for (OrderBaseInfoDO baseInfoDO : orderBaseInfoDOList) {
+            if (StringUtils.isNotBlank(baseInfoDO.getOrderHodTime())) {
+                holdTimeMap.put(baseInfoDO.getOrderHodTime(), baseInfoDO);
+                if (StringUtils.isBlank(maxHoldTime)) {
+                    maxHoldTime = baseInfoDO.getOrderHodTime();
+                } else if (maxHoldTime.compareTo(baseInfoDO.getOrderHodTime()) <= 0) {
+                    maxHoldTime = baseInfoDO.getOrderHodTime();
+                }
+            }
+        }
+        if (StringUtils.isBlank(maxHoldTime)) {
+            return null;
+        }
+        CheckHoldTimeItemVO itemVO = new CheckHoldTimeItemVO();
+        if (holdTimeMap.containsKey(maxHoldTime)) {
+            OrderBaseInfoDO baseInfoDO = holdTimeMap.get(maxHoldTime);
+            itemVO.setProductionDepartment(baseInfoDO.getProductionDepartment());
+            itemVO.setHoldTime(maxHoldTime);
+            itemVO.setBaseInfoDO(baseInfoDO);
+        }
+        return itemVO;
+    }
+
+    /**
+     * @param createVO
+     * @param checkBillOrderDO
+     * @return
+     */
+    private List<CheckBillMappingDO> buildCheckBillMappingDOS(ProducePaymentCheckBillCreateVO createVO, ProducePaymentCheckBillOrderDO checkBillOrderDO) {
+        return createVO.getOrderIds().stream().map(x -> {
+            return CheckBillMappingDO.builder()
+                    .orderId(x)
+                    .checkBillId(checkBillOrderDO.getId())
+                    .checkNo(checkBillOrderDO.getCheckNo())
+                    .build();
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * @param createVO
+     * @return
+     */
+    private ProducePaymentCheckBillOrderDO buildCheckBillOrderDO(ProducePaymentCheckBillCreateVO createVO) {
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(createVO.getOrderIds());
+        return ProducePaymentCheckBillOrderDO.builder()
+                .checkNo(createVO.getCheckNo())
+                .payedDate(createVO.getPayedDate())
+                .status(ApplyStatusEnum.NO_COMMIT.getStatus())
+                .productionName(orderBaseInfoDOList.get(0).getProductionDepartment())
+                .businesPerson(orderBaseInfoDOList.get(0).getBusinessPerson())
+                .build();
+    }
+
+    /**
+     * @param createVO
+     */
+    private void validaBillOrder(ProducePaymentCheckBillCreateVO createVO) {
+        if (CollectionUtils.isEmpty(createVO.getOrderIds())) {
+            throw new BusinessException("请勾选订单！");
+        }
+
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(createVO.getOrderIds());
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            throw new BusinessException("勾选的订单信息不存在！");
+        }
+
+        if (orderBaseInfoDOList.size() != createVO.getOrderIds().size()) {
+            throw new BusinessException("勾选的订单信息有误！");
+        }
+        //如果利润信息没有填写或者该订单的利润处于审核中也无法创建。
+        List<OrderProfitAnalysisDO> orderProfitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderProfitAnalysisDO::getOrderId, createVO.getOrderIds()));
+        List<OrderProfitAnalysisDO> profitAnalysisDOList = orderProfitAnalysisDOS.stream()
+                .collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity(), (existing, replacement) -> existing))
+                .values()
+                .stream()
+                .collect(Collectors.toList());
+        if(CollectionUtils.isEmpty(orderProfitAnalysisDOS) || createVO.getOrderIds().size()!=profitAnalysisDOList.size()){
+            throw new BusinessException("勾选订单的利润信息未填写！");
+        }
+//        for (OrderProfitAnalysisDO analysisDO : orderProfitAnalysisDOS) {
+//            if (analysisDO.getCustomerPrice() == null ) {
+//                throw new BusinessException("勾选订单的利润信息未填写！");
+//            }
+//        }
+        List<OrderFieldLockApplyDO> orderFieldLockApplyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderFieldLockApplyDO::getOrderId, createVO.getOrderIds())
+                .eq(OrderFieldLockApplyDO::getType, ApplyTypeEnum.ORDER_PROFIT_APPLY.getType())
+                .eq(OrderFieldLockApplyDO::getStatus,ApplyStatusEnum.WAIT_AUDIT.getStatus()));
+        if(CollectionUtils.isNotEmpty(orderFieldLockApplyDOS)){
+            throw new BusinessException("订单中包含利润未审批的订单,无法创建！");
+        }
+
+        String checkNo = createVO.getCheckNo();
+
+        List<ProducePaymentCheckBillOrderDO> checkBillOrderDOS = list(new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(ProducePaymentCheckBillOrderDO::getCheckNo, checkNo));
+        if (CollectionUtils.isNotEmpty(checkBillOrderDOS)) {
+            throw new BusinessException("存在相同的生产科对账单号！");
+        }
+
+        List<CheckBillMappingDO> checkBillMappingDOS = checkBillMappingService.list(new LambdaQueryWrapper<CheckBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(CheckBillMappingDO::getOrderId, createVO.getOrderIds()));
+        if (CollectionUtils.isNotEmpty(checkBillMappingDOS)) {
+            throw new BusinessException("该勾选的订单已经绑定其他账单了！");
+        }
+        if(StringUtils.isNotEmpty(orderBaseInfoDOList.get(0).getProductionDepartment())){
+            String firstProductionDepartment = orderBaseInfoDOList.get(0).getProductionDepartment();
+            boolean allSame = orderBaseInfoDOList.stream()
+                    .allMatch(order -> order.getProductionDepartment().equals(firstProductionDepartment));
+           if(!allSame){
+                throw  new BusinessException("勾选订单的生产科不一致!");
+            }
+        }
+    }
+
+    /**
+     * 更新扣款信息
+     *
+     * @param deductInfoVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult updateDeductInfo(ProducePaymentCheckBillDeductInfoVO deductInfoVO) {
+        if (Objects.isNull(deductInfoVO.getId())) {
+            throw new BusinessException("id 不能为空");
+        }
+        ProducePaymentCheckBillOrderDO checkBillOrderDO = getById(deductInfoVO.getId());
+        if (Objects.isNull(checkBillOrderDO)) {
+            throw new BusinessException("应付款单据不存在");
+        }
+        if(Objects.nonNull(checkBillOrderDO.getStatus()) && Constant.ENABLE_TEN==checkBillOrderDO.getStatus()){
+            throw new BusinessException("应付款单据已审核通过,无法编辑");
+        }
+
+        checkCommitApply(checkBillOrderDO.getId());
+        //需要判断一下是否为空?不然知己以逗号分隔会报错。
+//        if(StringUtils.isNotBlank(deductInfoVO.getDeductUrl())){
+//            List<String> deductUrlList = new ArrayList<>(Arrays.asList(
+//                    org.apache.commons.lang3.StringUtils.defaultString(deductInfoVO.getDeductUrl()).split(",")
+//            ));
+//            String lastElement = deductUrlList.get(deductUrlList.size() - 1);
+//            if(StringUtils.isNotBlank(lastElement)){
+//                if(!deductUrlList.contains(lastElement)){
+//                    deductUrlList.add(lastElement);
+//                }
+//            }
+//            String updatedDeductUrl = String.join(",", deductUrlList);
+//            checkBillOrderDO.setDeductUrl(updatedDeductUrl);
+//        }else{
+//            checkBillOrderDO.setDeductUrl(deductInfoVO.getDeductUrl());
+//        }
+        if(StringUtils.isNotBlank(checkBillOrderDO.getDeductUrl())){
+//记住:需要修改数据表对应的字段deduct_url的varchar数据范围,修改为1000左右。
+            if(StringUtils.isNotBlank(deductInfoVO.getDeductUrl())){
+                Set<String> deductUrlSet = new HashSet<>(Arrays.asList(
+                        org.apache.commons.lang3.StringUtils.defaultString(checkBillOrderDO.getDeductUrl()).split(",")
+                ));
+                if(!deductUrlSet.contains(deductInfoVO.getDeductUrl())){
+                    deductUrlSet.add(deductInfoVO.getDeductUrl());
+                    String updatedDeductUrl = String.join(",", deductUrlSet);
+                    checkBillOrderDO.setDeductUrl(updatedDeductUrl);
+                }
+            }
+        }else{
+             if(StringUtils.isNotBlank(deductInfoVO.getDeductUrl())){
+                 checkBillOrderDO.setDeductUrl(deductInfoVO.getDeductUrl());
+            }
+        }
+        checkBillOrderDO.setDeductDept(deductInfoVO.getDeductDept());
+        checkBillOrderDO.setDeductAmount((deductInfoVO.getDeductAmount()==null? BigDecimal.ZERO:deductInfoVO.getDeductAmount()).setScale(2, BigDecimal.ROUND_HALF_UP));
+        checkBillOrderDO.setActualPayedAmount((checkBillOrderDO.getTotalProductionAmount().subtract(deductInfoVO.getDeductAmount()==null? BigDecimal.ZERO:deductInfoVO.getDeductAmount())).setScale(2, BigDecimal.ROUND_HALF_UP));
+        checkBillOrderDO.setUnPayedAmount((checkBillOrderDO.getTotalProductionAmount().subtract(checkBillOrderDO.getDeductAmount()).subtract(checkBillOrderDO.getTotalActualPayedAmount())).setScale(2, BigDecimal.ROUND_HALF_UP));
+        updateById(checkBillOrderDO);
+        return ServerResult.success();
+    }
+
+    /**
+     * 更新其他金额信息
+     *
+     * @param amountInfoVO
+     * @return
+     */
+    @Override
+    public ServerResult updateAmountInfo(ProducePaymentCheckBillAmountInfoVO amountInfoVO) {
+        if (Objects.isNull(amountInfoVO.getId())) {
+            throw new BusinessException("id 不能为空");
+        }
+        ProducePaymentCheckBillOrderDO checkBillOrderDO = getById(amountInfoVO.getId());
+        if (Objects.isNull(checkBillOrderDO)) {
+            throw new BusinessException("应付款单据不存在");
+        }
+
+        checkCommitApply(checkBillOrderDO.getId());
+
+        checkBillOrderDO.setActualPayedAmount1(amountInfoVO.getActualPayedAmount1() != null ? amountInfoVO.getActualPayedAmount1().setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
+        checkBillOrderDO.setActualPayedAmount2(amountInfoVO.getActualPayedAmount2() != null ? amountInfoVO.getActualPayedAmount2().setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
+        checkBillOrderDO.setActualPayedAmount3(amountInfoVO.getActualPayedAmount3() != null ? amountInfoVO.getActualPayedAmount3().setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
+        checkBillOrderDO.setTotalActualPayedAmount(checkBillOrderDO.getActualPayedAmount1().add(checkBillOrderDO.getActualPayedAmount2().add(checkBillOrderDO.getActualPayedAmount3())).setScale(2, BigDecimal.ROUND_HALF_UP));
+        checkBillOrderDO.setUnPayedAmount((checkBillOrderDO.getTotalProductionAmount().subtract(checkBillOrderDO.getDeductAmount()).subtract(checkBillOrderDO.getTotalActualPayedAmount())).setScale(2, BigDecimal.ROUND_HALF_UP));
+        updateById(checkBillOrderDO);
+        return ServerResult.success();
+    }
+
+    @Override
+    public ServerResult updateInvoiceInfo(ProducePaymentCheckBillInvoiceInfoVO invoiceInfoVO) {
+        Long loginUserId = dataScope.getLoginUserId();
+
+        Long id = invoiceInfoVO.getId();
+        if (Objects.isNull(id)) {
+            return ServerResult.fail("id 参数不能为空");
+        }
+        ProducePaymentCheckBillOrderDO checkBillOrderDO = getById(id);
+        if(Objects.isNull(checkBillOrderDO)){
+            return ServerResult.fail("生产科对账单号不存在！");
+        }
+        if(Constant.ENABLE_TEN==checkBillOrderDO.getStatus()){
+            throw new BusinessException("该订单已通过审核无法继续上传发票!");
+        }
+        if(StringUtils.isBlank(invoiceInfoVO.getInvoiceUrl())){
+            return ServerResult.success();
+        }
+        //校验是否有处于待审核的发票。
+        checkApply(id,loginUserId,ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType());
+        //校验是否有处于待审核的订单。
+        checkCommitApply(checkBillOrderDO.getId());
+        OrderLockFieldVO locakFieldVO = new OrderLockFieldVO();
+//        if(StringUtils.isNotBlank(checkBillOrderDO.getInvoiceUrl())){
+//            if(StringUtils.isNotBlank(invoiceInfoVO.getInvoiceUrl())){
+//               Set<String> deductUrlSet = new HashSet<>(Arrays.asList(
+//                        org.apache.commons.lang3.StringUtils.defaultString(checkBillOrderDO.getInvoiceUrl()).split(",")));
+//               if(!deductUrlSet.contains(invoiceInfoVO.getInvoiceUrl())){
+//                   deductUrlSet.add(invoiceInfoVO.getInvoiceUrl());
+//                   String updateDeductUrl=String.join(",",deductUrlSet);
+//                   checkBillOrderDO.setInvoiceUrl(updateDeductUrl);
+//               }
+//            }
+//        }else {
+//            if(StringUtils.isNotBlank(invoiceInfoVO.getInvoiceUrl())){
+//                checkBillOrderDO.setInvoiceUrl(invoiceInfoVO.getInvoiceUrl());
+//            }
+//        }
+        //事务:待审核,设置为admin和财务才有权限审批。
+        transactionHelper.run(() -> {
+            checkBillOrderDO.setDepartmentInvoiceStatus(ApplyStatusEnum.WAIT_AUDIT.getStatus());
+            updateById(checkBillOrderDO);
+            //不保存,仅仅只是做一个审核,千万不要保存。目的是传递给审核的是最新的发票,审核通过才保存,不通过则不保存。
+            checkBillOrderDO.setInvoiceUrl(invoiceInfoVO.getInvoiceUrl());
+            //上述不保存,上述仅仅只是让审批时获取最新的一个审批发票记录。
+            locakFieldVO.setCheckBillOrderDO(checkBillOrderDO);
+            OrderFieldLockApplyDO applyDO = OrderFieldLockApplyDO.builder()
+                    .applyUserId(loginUserId)
+                    .auditUserId(null)
+                    .fields(JSONObject.toJSONString(locakFieldVO))
+                    .orderId(checkBillOrderDO.getId())
+                    .type(ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType())
+                    .remark(ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getDesc())
+                    .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                    .auditRoleCodes(RoleEnum.ADMIN.getCode() + Constant.COMMA_CHARACTER + RoleEnum.FINANCE_USER.getCode())
+                    .build();
+            orderFieldLockApplyService.save(applyDO);
+        });
+        return ServerResult.success();
+    }
+
+    @Override
+    public ServerResult commitApply(ProducePaymentCheckBillCommitApplyVO commitApplyVO) {
+        ProducePaymentCheckBillOrderDO checkBillOrderDO = getById(commitApplyVO.getId());
+        if (Objects.isNull(checkBillOrderDO)) {
+            throw new BusinessException("账单不存在！");
+        }
+        if(checkBillOrderDO.getStatus()==Constant.ENABLE_TEN){
+            throw new BusinessException("该订单已通过审核！");
+        }
+        Long userId = dataScope.getLoginUserId();
+        String loginUserName = dataScope.getLoginUserName();
+        checkApply(commitApplyVO.getId(), userId,ApplyTypeEnum.CHECK_BILL_APPLY.getType());
+
+     /*   List<CheckBillMappingDO> checkBillMappingDOS = checkBillMappingService.list(new LambdaQueryWrapper<CheckBillMappingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(CheckBillMappingDO::getCheckNo, checkBillOrderDO.getCheckNo()));
+        if(CollectionUtils.isNotEmpty(checkBillMappingDOS)){
+            List<Long> orderIds = checkBillMappingDOS.stream().map(CheckBillMappingDO::getOrderId).collect(Collectors.toList());
+            List<OrderProfitAnalysisDO> orderProfitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .in(OrderProfitAnalysisDO::getOrderId, orderIds));
+            if(CollectionUtils.isNotEmpty(orderProfitAnalysisDOS)){
+//                List<Double> totalPrice = orderProfitAnalysisDOS.stream().map(OrderProfitAnalysisDO::getProductionDepartmentTotalPrice).collect(Collectors.toList());
+                BigDecimal totalConvertedAmount = orderProfitAnalysisDOS.stream().map(order -> BigDecimal.valueOf(order.getProductionDepartmentTotalPrice()))
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+                BigDecimal formattedSum = totalConvertedAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
+                if(Objects.nonNull(formattedSum)){
+                    //客户总价金额汇总。
+                    checkBillOrderDO.setTotalProductionAmount(formattedSum);
+                }else {
+                    checkBillOrderDO.setTotalProductionAmount( BigDecimal.ZERO);
+                }
+            }
+        }
+        if(Objects.isNull(checkBillOrderDO.getDeductAmount())){
+             checkBillOrderDO.setDeductAmount(BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
+        }*/
+        checkBillOrderDO.setActualPayedDate(commitApplyVO.getActualPayedDate());
+        checkBillOrderDO.setFinancePerson(loginUserName);
+        OrderFieldLockApplyDO applyDO = initOrderFieldLockApplyDO(checkBillOrderDO, userId);
+        transactionHelper.run(() -> {
+            orderFieldLockApplyService.save(applyDO);
+            checkBillOrderDO.setStatus(ApplyStatusEnum.WAIT_AUDIT.getStatus());
+//            checkBillOrderDO.setActualPayedDate(DateUtils.format(LocalDateTime.now(), DateUtils.DATE));
+            updateById(checkBillOrderDO);
+        });
+        return ServerResult.success();
+    }
+
+    /**
+     * @param checkBillOrderDO
+     * @param userId
+     * @return
+     */
+    private OrderFieldLockApplyDO initOrderFieldLockApplyDO(ProducePaymentCheckBillOrderDO checkBillOrderDO, Long userId) {
+        OrderLockFieldVO lockFieldVO = new OrderLockFieldVO();
+        lockFieldVO.setCheckBillOrderDO(checkBillOrderDO);
+        return OrderFieldLockApplyDO.builder()
+                .applyUserId(userId)
+                .auditUserId(null)
+                .fields(JSONObject.toJSONString(lockFieldVO))
+                .orderId(checkBillOrderDO.getId())
+                .type(ApplyTypeEnum.CHECK_BILL_APPLY.getType())
+                .remark(ApplyTypeEnum.CHECK_BILL_APPLY.getDesc())
+                .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                .auditRoleCodes(RoleEnum.ADMIN.getCode())
+                .build();
+    }
+
+    /**
+     * @param id
+     * @param userId
+     */
+    private void checkApply(Long id, Long userId,Integer applyType) {
+        List<OrderFieldLockApplyDO> applyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderFieldLockApplyDO::getOrderId, id)
+                .eq(OrderFieldLockApplyDO::getApplyUserId, userId)
+                .eq(OrderFieldLockApplyDO::getType, applyType)
+                .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));
+        if (CollectionUtils.isNotEmpty(applyDOS)) {
+            throw new BusinessException(ServerResultCode.APPLY_UNLOCK_FIELD_EXIST);
+        }
+    }
+
+    /**
+     * @param id
+     */
+    private void checkCommitApply(Long id) {
+        OrderFieldLockApplyDO applyDO = orderFieldLockApplyService.getOne(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                .eq(OrderFieldLockApplyDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderFieldLockApplyDO::getType, ApplyTypeEnum.CHECK_BILL_APPLY.getType())
+                .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                .eq(OrderFieldLockApplyDO::getOrderId, id).last("limit 1"));
+        if (Objects.nonNull(applyDO)) {
+            throw new BusinessException("该账单还在审批中，请联系总经理审批后操作！");
+        }
+    }
+
+    /**
+     * @param ids
+     * @param userId
+     */
+    private void checkApplyByIds(List<Long> ids, Long userId) {
+        List<OrderFieldLockApplyDO> applyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderFieldLockApplyDO::getOrderId, ids)
+                .eq(OrderFieldLockApplyDO::getApplyUserId, userId)
+                .eq(OrderFieldLockApplyDO::getType, ApplyTypeEnum.CHECK_BILL_APPLY.getType())
+                .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));
+        if (CollectionUtils.isNotEmpty(applyDOS)) {
+            throw new BusinessException(ServerResultCode.APPLY_UNLOCK_FIELD_EXIST);
+        }
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param producePaymentCheckBillOrderQueryVO 筛选条件
+     * @return 是否成功
+     */
+    @Override
+    public ServerResult deleteById(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
+        List<Long> ids = producePaymentCheckBillOrderQueryVO.getIds();
+        if (CollUtil.isEmpty(ids)) {
+            return ServerResult.fail("ids 参数不能为空");
+        }
+        List<ProducePaymentCheckBillOrderDO> checkBillOrderDOS = listByIds(ids);
+        if (CollUtil.isEmpty(checkBillOrderDOS)) {
+            return ServerResult.success();
+        }
+        checkBillOrderDOS.stream().forEach(checkBillOrderDO ->{
+            if(Constant.ENABLE_TEN==checkBillOrderDO.getStatus()){
+                throw new BusinessException("该订单已通过审核,无法删除!");
+            }
+        });
+        checkApplyByIds(ids, dataScope.getLoginUserId());
+        transactionHelper.run(() -> {
+            removeByIds(ids);
+            checkBillMappingService.remove(new LambdaQueryWrapper<CheckBillMappingDO>().in(CheckBillMappingDO::getCheckBillId, ids));
+        });
+
+        return ServerResult.success();
+    }
+
+    @Override
+    public ServerResult getDeductUrlById(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
+        Long id = producePaymentCheckBillOrderQueryVO.getId();
+        if (Objects.isNull(id)) {
+            return ServerResult.fail("id 参数不能为空");
+        }
+        ProducePaymentCheckBillOrderDO checkBillOrderDO = getById(id);
+        if(Objects.isNull(checkBillOrderDO)){
+            return ServerResult.fail("生产科对账单号不存在！");
+        }
+        if(StringUtils.isBlank(checkBillOrderDO.getDeductUrl())){
+            return  ServerResult.fail("扣款单未上传！");
+        }
+        Map<String, String> hashMap = new HashMap<>();
+        if(StringUtils.isBlank(checkBillOrderDO.getDeductUrl())){
+            return ServerResult.success();
+        }
+        //获取每一个url的文件名称
+        Arrays.stream(checkBillOrderDO.getDeductUrl().split(",")).forEach(x->{
+            try{
+            String preUrl =  x.contains("?") ? x.split("\\?")[0] : x;
+            String fileName = preUrl.substring(preUrl.lastIndexOf("/") + 1);
+            String decodeUrl = URLDecoder.decode(fileName, StandardCharsets.UTF_8.name());
+            hashMap.put(decodeUrl,x);
+        }catch(Exception e){
+            throw  new BusinessException("文件名错误!");
+        }
+        });
+        return ServerResult.success(hashMap);
+    }
+
+    @Override
+    public ServerResult getInvoiceUrlById(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
+        Long id = producePaymentCheckBillOrderQueryVO.getId();
+        if (Objects.isNull(id)) {
+            return ServerResult.fail("id 参数不能为空");
+        }
+        ProducePaymentCheckBillOrderDO checkBillOrderDO = getById(id);
+        if(Objects.isNull(checkBillOrderDO)){
+            return ServerResult.fail("生产科对账单号不存在！");
+        }
+        if(StringUtils.isBlank(checkBillOrderDO.getInvoiceUrl())){
+            return  ServerResult.fail("生产科发票未上传或者处于审核状态！");
+        }
+        Map<String, String> hashMap = new HashMap<>();
+        if(StringUtils.isBlank(checkBillOrderDO.getInvoiceUrl())){
+            return ServerResult.success();
+        }
+        //获取每一个url的文件名称
+        Arrays.stream(checkBillOrderDO.getInvoiceUrl().split(",")).forEach(x->{
+            try{
+                String preUrl =  x.contains("?") ? x.split("\\?")[0] : x;
+                String fileName = preUrl.substring(preUrl.lastIndexOf("/") + 1);
+                String decodeUrl = URLDecoder.decode(fileName, StandardCharsets.UTF_8.name());
+                hashMap.put(decodeUrl,x);
+            }catch(Exception e){
+                throw  new BusinessException("文件名错误!");
+            }
+        });
+        return ServerResult.success(hashMap);
+    }
+
+    public List<ProducePaymentCheckBillOrderDO> getOverEventList(){
+       return  baseMapper.getOverEventList();
+    }
+    @Override
+    public ServerResult exportReceipt(HttpServletResponse response,ProducePaymentCheckBillOrderDO queryVO) throws IOException {
+        XSSFWorkbook workbook = new XSSFWorkbook();
+        Sheet sheet = workbook.createSheet("付款单");
+        Row row = sheet.createRow(0);
+        Cell cell = row.createCell(0);
+        cell.setCellValue("付款单");
+        sheet.setMargin(sheet.LeftMargin,0.5);
+        sheet.setMargin(sheet.RightMargin,0.5);
+
+
+        CellStyle titleStyle = workbook.createCellStyle();
+        Font titleFont = workbook.createFont();
+        titleFont.setFontHeightInPoints((short) 20); // 字体大小
+        titleFont.setBold(true); // 加粗
+        titleFont.setFontName("宋体");
+        titleStyle.setAlignment(HorizontalAlignment.CENTER); // 水平居中
+        titleStyle.setVerticalAlignment(VerticalAlignment.CENTER); // 垂直居中
+        // 合并单元格（第一行的第一列到第三列）
+        sheet.addMergedRegion(new CellRangeAddress(0, 2, 0, 9));
+        titleStyle.setFont(titleFont);
+        cell.setCellStyle(titleStyle);
+        //第二行
+        Row row2 = sheet.createRow(3);
+        Cell cell2 = row2.createCell(0);
+        cell2.setCellValue("提交人：");
+        sheet.addMergedRegion(new CellRangeAddress(3, 4, 0, 1));
+        Cell cell3 = row2.createCell(2);
+        cell3.setCellValue("");
+        sheet.addMergedRegion(new CellRangeAddress(3, 4, 2, 7));
+        Cell cell4 = row2.createCell(8);
+        cell4.setCellValue("日期：");
+        sheet.addMergedRegion(new CellRangeAddress(3, 4, 8, 9));
+        //第三行
+        createMergedCell(sheet, workbook, 5, 0, 5, 6, 0, 1, "生产科对账单号");
+        createMergedCell(sheet, workbook, 5, 2, 5, 6, 2, 3, "实际应付金额");
+        createMergedCell(sheet, workbook, 5, 4, 5, 6, 4, 4, "扣款金额");
+        createMergedCell(sheet, workbook, 5, 5, 5, 6, 5, 6, "实际付款金额");
+        createMergedCell(sheet, workbook, 5, 7, 5, 6, 7, 7, "未付金额");
+        createMergedCell(sheet, workbook, 5, 8, 5, 6, 8, 8, "必须付款日期");
+        createMergedCell(sheet, workbook, 5, 9, 5, 6, 9, 9, "实际付款日期");
+        //第四行
+        createMergedCell(sheet, workbook, 7, 0, 7, 8, 0, 1, queryVO.getCheckNo()!=null ? queryVO.getCheckNo() :"");
+        createMergedCell(sheet, workbook, 7, 2, 7, 8, 2, 3,queryVO.getActualPayedAmount()!=null ? "￥"+queryVO.getActualPayedAmount().setScale(2, BigDecimal.ROUND_HALF_UP):"");
+        createMergedCell(sheet, workbook, 7, 4, 7, 8, 4, 4, queryVO.getDeductAmount()!=null? "￥"+queryVO.getDeductAmount().setScale(2, BigDecimal.ROUND_HALF_UP):"");
+        createMergedCell(sheet, workbook, 7, 5, 7, 8, 5, 6, queryVO.getTotalActualPayedAmount()!=null? "￥"+queryVO.getTotalActualPayedAmount().setScale(2, BigDecimal.ROUND_HALF_UP):"");
+        createMergedCell(sheet, workbook, 7, 7, 7, 8, 7, 7, queryVO.getUnPayedAmount()!=null? "￥"+queryVO.getUnPayedAmount().setScale(2, BigDecimal.ROUND_HALF_UP):"");
+        createMergedCell(sheet, workbook, 7, 8, 7, 8, 8, 8, queryVO.getPayedDate()!=null?queryVO.getPayedDate():"");
+        createMergedCell(sheet, workbook, 7, 9, 7, 8, 9, 9, queryVO.getActualPayedDate()!=null?queryVO.getActualPayedDate():"");
+        //第五行
+        createMergedCell(sheet, workbook, 9, 0, 9, 10, 0, 1, "部门经理审核");
+        createMergedCell(sheet, workbook, 9, 2, 9, 10, 2, 4, "财务审核");
+        createMergedCell(sheet, workbook, 9, 5, 9, 10, 5, 7, "总经理审核");
+        createMergedCell(sheet, workbook, 9, 8, 9, 10, 8, 9, "出纳审核");
+        //第六行
+        createMergedCell(sheet, workbook, 11, 0, 11, 13, 0, 1, "");
+        createMergedCell(sheet, workbook, 11, 2, 11, 13, 2, 4, "");
+        createMergedCell(sheet, workbook, 11, 5, 11, 13, 5, 7, "");
+        createMergedCell(sheet, workbook, 11, 8, 11, 13, 8, 9, "");
+        //第七行
+        createMergedCell(sheet, workbook, 14, 0, 14, 15, 0, 4, "收款人");
+        createMergedCell(sheet, workbook, 14, 5, 14, 15, 5, 9, "付款金额");
+        //第八行
+        createMergedCell(sheet, workbook, 16, 0, 16, 17, 0, 4, "");
+        createMergedCell(sheet, workbook, 16, 5, 16, 17, 5, 9, "");
+        //第九行
+        createMergedCell(sheet, workbook, 18, 0, 18, 19, 0, 4, "");
+        createMergedCell(sheet, workbook, 18, 5, 18, 19, 5, 9, "");
+        //第十行
+        createMergedCell(sheet, workbook, 20, 0, 20, 21, 0, 4, "");
+        createMergedCell(sheet, workbook, 20, 5, 20, 21, 5, 9, "");
+        //第十一行
+        createMergedCell(sheet, workbook, 22, 0, 22, 23, 0, 4, "");
+        createMergedCell(sheet, workbook, 22, 5, 22, 23, 5, 9, "");
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; charset=UTF-8");
+        response.setHeader("Content-Disposition", "attachment; filename=\"-.xlsx\"");
+        workbook.write(response.getOutputStream());
+        workbook.close();
+        return ServerResult.success();
+    }
+
+    public void createMergedCell(Sheet sheet, Workbook workbook, int rowIndex, int colIndex, int startRow, int endRow, int startCol, int endCol, String value) {
+        // 创建或获取当前行
+        Row row = sheet.getRow(rowIndex);
+        if (row == null) {
+            row = sheet.createRow(rowIndex);
+        }
+
+        // 创建第一个单元格并设置值
+        Cell cell = row.createCell(colIndex);
+        cell.setCellValue(value);
+
+        // 创建边框样式
+        CellStyle titleStyle = workbook.createCellStyle();
+        Font titleFont = workbook.createFont();
+        titleFont.setFontHeightInPoints((short) 8.5); // 字体大小
+        titleFont.setBold(true); // 加粗
+        titleFont.setFontName("宋体");
+        titleStyle.setAlignment(HorizontalAlignment.CENTER); // 水平居中
+        titleStyle.setVerticalAlignment(VerticalAlignment.CENTER); // 垂直居中
+        titleStyle.setFont(titleFont);
+
+        // 设置边框样式
+        titleStyle.setBorderTop(BorderStyle.THIN);
+        titleStyle.setBorderBottom(BorderStyle.THIN);
+        titleStyle.setBorderLeft(BorderStyle.THIN);
+        titleStyle.setBorderRight(BorderStyle.THIN);
+
+        // 应用样式到第一个单元格
+        cell.setCellStyle(titleStyle);
+
+        // 合并单元格
+        sheet.addMergedRegion(new CellRangeAddress(startRow, endRow, startCol, endCol));
+
+        // 为合并区域的每个单元格设置相同的样式
+        for (int rowIndexCurrent = startRow; rowIndexCurrent <= endRow; rowIndexCurrent++) {
+            for (int colIndexCurrent = startCol; colIndexCurrent <= endCol; colIndexCurrent++) {
+                Row currentRow = sheet.getRow(rowIndexCurrent);
+                if (currentRow == null) {
+                    currentRow = sheet.createRow(rowIndexCurrent);
+                }
+                Cell currentCell = currentRow.getCell(colIndexCurrent);
+                if (currentCell == null) {
+                    currentCell = currentRow.createCell(colIndexCurrent);
+                }
+                // 只为合并区域内的单元格设置样式
+                if (rowIndexCurrent == startRow && colIndexCurrent == colIndex) {
+                    currentCell.setCellStyle(titleStyle); // 为合并的单元格设置样式
+                } else {
+                    currentCell.setCellStyle(titleStyle); // 为其他合并的单元格设置样式
+                }
+            }
+        }
+    }
+}
@@ -76,21 +76,26 @@ spring:
     timeout: 2000
   mail:
     # 配置 SMTP 服务器地址
-    host: xxx
+#    host: smtp.qiye.aliyun.com
+    host: smtp.163.com
     # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
-    username: xxxx
+#    username: information@alterego.xin
+    username: chenhang4442024@163.com
     # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
-    password: xxx
+#    password: AlterEgo1608ITf31
+    password: ACHWYJSXRITHTMGA
     # 邮件接收者
     mailRecipient: #邮件接收者邮箱
     # 端口号465或587（QQ邮箱发送邮件仅支持587端口协议）
-    port: 587
+    port: 465
     # 默认的邮件编码为UTF-8
     default-encoding: UTF-8
     # 配置SSL 加密工厂
     properties:
       mail:
         smtp:
+          ssl:
+            enable: true
           socketFactoryClass: javax.net.ssl.SSLSocketFactory
         #表示开启 DEBUG 模式，这样，邮件发送过程的日志会在控制台打印出来，方便排查错误
         debug: true
@@ -173,7 +178,7 @@ oss:
   endpoint: https://oss-cn-qingdao.aliyuncs.com
   accessKeyId: LTAI5t7u1gXR2vm82sd6CkVz
   accessKeySecret: m4NzHZZsZiauKmRO8y7DihmcGNdQk4
-  bucket: alterego
+  bucket: test-alterego
 db:
@@ -76,11 +76,11 @@ spring:
     timeout: 2000
   mail:
     # 配置 SMTP 服务器地址
-    host: smtp.163.com
+    host: smtp.qiye.aliyun.com
     # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
-    username: chenhang4442024@163.com
+    username: information@alterego.xin
     # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
-    password: ACHWYJSXRITHTMGA
+    password: AlterEgo1608ITf31
     # 邮件接收者
     mailRecipient: #邮件接收者邮箱
     # 端口号465或587（QQ邮箱发送邮件仅支持587端口协议）
@@ -164,8 +164,8 @@ openai:
 # 文件存储路径
 file:
   path: /home/canrd/order-erp/files/
-#  host: http://47.104.8.35
-  host: http://39.108.227.113
+  host: http://47.104.8.35
+#  host: http://39.108.227.113
   avatar: /home/order-erp/avatar/
   # 文件大小 /M
   maxSize: 100
@@ -175,9 +175,9 @@ file:
 # 阿里pss图片服务
 oss:
   endpoint: https://oss-cn-qingdao.aliyuncs.com
-  accessKeyId: LTAIZCPI7OaWud0m
-  accessKeySecret: nvtGeScBwRztGeoj8WSp5OWalalgpK
-  bucket: order-erp
+  accessKeyId: LTAI5t7u1gXR2vm82sd6CkVz
+  accessKeySecret: m4NzHZZsZiauKmRO8y7DihmcGNdQk4
+  bucket: test-alterego
 db:
 server:
-  port: 18000
+  port: 18001
 spring:
   profiles:
-    active: test
 \ No newline at end of file
+    active: pre-prod
 \ No newline at end of file