fix:第二版财务,全部更新

chenhang4442024
1 parent f21c137d
Showing 27 changed files with 1649 additions and 344 deletions
src/main/java/com/order/erp/common/utils/EasyPdfUtils.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/FinanceEnum.java
src/main/java/com/order/erp/domain/dto/order/InvoiceBillOrderDO.java
src/main/java/com/order/erp/domain/dto/order/OrderBaseInfoDO.java
src/main/java/com/order/erp/domain/dto/order/OrderFieldLockApplyDO.java
src/main/java/com/order/erp/domain/dto/order/ProducePaymentCheckBillOrderDO.java
src/main/java/com/order/erp/domain/pdf/OrderProducePdfVO.java
src/main/java/com/order/erp/domain/vo/order/FinanceOrderResultVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceBillAnalysisResultVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceBillCommitApplyVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceBillCreateVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceBillOrderQueryVO.java
src/main/java/com/order/erp/domain/vo/order/InvoiceFieldVO.java
src/main/java/com/order/erp/domain/vo/order/OrderLockFieldVO.java
src/main/java/com/order/erp/domain/vo/order/ProducePaymentCheckBillCommitApplyVO.java
src/main/java/com/order/erp/domain/vo/order/ProducePaymentCheckBillCreateVO.java
src/main/java/com/order/erp/domain/vo/order/ProducePaymentCheckBillFieldVO.java
src/main/java/com/order/erp/mapper/order/InvoiceBillOrderMapper.java
@@ -357,7 +357,12 @@ public class EasyPdfUtils {
         cellList.add(createCell("客户订单号", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
         cellList.add(createCell("客户款号", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
         cellList.add(createCell("REFERENCE", 100F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
-        cellList.add(createCell("订单颜色", 120F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        //针对于A01订单单独设置,A01不需要订单颜色。
+        if(pdfVOList.get(0).getProjectNo().contains("A01")){
+            cellList.add(createCell("COLLECTION", 120F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        }else{
+            cellList.add(createCell("订单颜色", 120F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        }
         cellList.add(createCell("颜色中文", 100F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
         cellList.add(createCell("订单图片", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
         cellList.add(createCell("产品意见", 150F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
@@ -381,7 +386,11 @@ public class EasyPdfUtils {
             dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getCustomerPo()) ? producePdfVO.getCustomerPo() : "", 110F));
             dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getCustomerStyle()) ? producePdfVO.getCustomerStyle() : "", 110F));
             dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getModeleLo()) ? producePdfVO.getModeleLo() : "", 100F));
-            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getPoColor()) ? producePdfVO.getPoColor() : "", 120F));
+            if(producePdfVO.getProjectNo().contains("A01")){
+                dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getCollection()) ? producePdfVO.getCollection() : "", 120F));
+            }else{
+                dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getPoColor()) ? producePdfVO.getPoColor() : "", 120F));
+            }
             dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getCnColor()) ? producePdfVO.getCnColor() : "", 100F));
             if (StringUtils.isNotBlank(producePdfVO.getPicUrl())) {
                 URL url = new URL(producePdfVO.getPicUrl());
@@ -45,7 +45,7 @@ public class InvoiceBillOrderController {
     }
     /**
-     * 基础订单查询
+     * 基础订单查询 完成
      *
      * @param queryVO 查询条件
      * @return 查询结果
@@ -56,7 +56,7 @@ public class InvoiceBillOrderController {
     }
     /**
-     * 分析列表
+     * 分析列表 完成
      *
      * @param queryVO 查询条件
      * @return 查询结果
@@ -67,7 +67,7 @@ public class InvoiceBillOrderController {
     }
     /**
-     * 导出分析列表
+     * 导出分析列表  完成
      *
      * @param queryVO 查询条件
      * @return 查询结果
@@ -80,7 +80,7 @@ public class InvoiceBillOrderController {
     }
     /**
-     * 创建invoice单据
+     * 创建invoice单据   完成 1
      *
      * @param createVO 数据VO
      * @return 新增结果
@@ -91,7 +91,7 @@ public class InvoiceBillOrderController {
     }
     /**
-     * 获取必须回款日期
+     * 获取必须回款日期  完成 1
      *
      * @param createVO 数据VO
      * @return 新增结果
@@ -102,7 +102,7 @@ public class InvoiceBillOrderController {
     }
     /**
-     * 更新扣款信息
+     * 更新扣款信息  完成 1
      *
      * @param deductInfoVO 数据VO
      * @return 编辑结果
@@ -113,7 +113,7 @@ public class InvoiceBillOrderController {
     }
     /**
-     * 更新其他金额信息
+     * 更新其他金额信息  完成 1
      *
      * @param amountInfoVO 数据VO
      * @return 编辑结果
@@ -124,7 +124,7 @@ public class InvoiceBillOrderController {
     }
     /**
-     * 提交审核
+     * 提交审核  完成 1
      *
      * @param commitApplyVO 数据VO
      * @return 编辑结果
@@ -135,7 +135,7 @@ public class InvoiceBillOrderController {
     }
     /**
-     * 删除数据
+     * 删除数据  完成 1
      *
      * @param invoiceBillOrderQueryVO 查询条件
      * @return 删除是否成功
@@ -145,7 +145,7 @@ public class InvoiceBillOrderController {
         return invoiceBillOrderService.deleteById(invoiceBillOrderQueryVO);
     }
     /**
-     * 获取扣款单
+     * 获取扣款单   完成 1
      *
      * @param invoiceBillOrderQueryVO 查询条件
      * @return 扣款单
@@ -155,7 +155,7 @@ public class InvoiceBillOrderController {
         return invoiceBillOrderService.getDeductUrlById(invoiceBillOrderQueryVO);
     }
     /**
-     * 重新上传报关单
+     * 重新上传报关单  完成 1
      *
      * @param bgUrl 报关单
      * @return 
@@ -176,7 +176,7 @@ public class InvoiceBillOrderController {
         invoiceBillOrderService.exportReceipt(response,queryVO);
     }
     /**
-     * 设置必须回款日期
+     * 设置必须回款日期  完成 1
      * @param createVO 必须回款日期
      * @return
      */
@@ -184,5 +184,15 @@ public class InvoiceBillOrderController {
    public void setBackRefundDate(@RequestBody InvoiceBillCreateVO createVO) {
         invoiceBillOrderService.setBackRefundDate(createVO);
     }
+
+    /**
+     *设置备注信息 完成 1
+     * @param createVO 备注信息
+     * @return
+     */
+    @PostMapping("/notes")
+    public void byIdAddNotes(@RequestBody InvoiceBillCreateVO createVO) {
+        invoiceBillOrderService.byIdAddNotes(createVO);
+    }
 }
@@ -45,7 +45,7 @@ public class ProducePaymentCheckBillOrderController {
     }
     /**
-     * 基础订单查询
+     * 基础订单查询 wanchen
      *
      * @param queryVO 查询条件
      * @return 查询结果
@@ -56,7 +56,7 @@ public class ProducePaymentCheckBillOrderController {
     }
     /**
-     * 分析列表
+     * 分析列表  wanchen
      *
      * @param queryVO 查询条件
      * @return 查询结果
@@ -67,7 +67,7 @@ public class ProducePaymentCheckBillOrderController {
     }
     /**
-     * 导出分析列表
+     * 导出分析列表 wanchen
      *
      * @param queryVO 查询条件
      * @return 查询结果
@@ -80,7 +80,7 @@ public class ProducePaymentCheckBillOrderController {
     }
     /**
-     * 创建生产科应付单据
+     * 创建生产科应付单据  wanchen 2
      *
      * @param createVO 数据VO
      * @return 新增结果
@@ -91,7 +91,7 @@ public class ProducePaymentCheckBillOrderController {
     }
     /**
-     * 获取生产科应回款日期
+     * 获取生产科应回款日期   wanchen 2
      *
      * @param createVO 数据VO
      * @return 新增结果
@@ -102,7 +102,7 @@ public class ProducePaymentCheckBillOrderController {
     }
     /**
-     * 更新扣款信息
+     * 更新扣款信息  wanchen
      *
      * @param deductInfoVO 数据VO
      * @return 编辑结果
@@ -113,7 +113,7 @@ public class ProducePaymentCheckBillOrderController {
     }
     /**
-     * 更新其他金额信息
+     * 更新其他金额信息  wanchen
      *
      * @param amountInfoVO 数据VO
      * @return 编辑结果
@@ -124,7 +124,7 @@ public class ProducePaymentCheckBillOrderController {
     }
     /**
-     * 更新发票信息
+     * 更新发票信息 wanchen
      *
      * @param invoiceInfoVO 数据VO
      * @return 编辑结果
@@ -146,7 +146,7 @@ public class ProducePaymentCheckBillOrderController {
     }
     /**
-     * 删除数据
+     * 删除数据 wanchen
      *
      * @param producePaymentCheckBillOrderQueryVO 查询条件
      * @return 删除是否成功
@@ -156,7 +156,7 @@ public class ProducePaymentCheckBillOrderController {
         return producePaymentCheckBillOrderService.deleteById(producePaymentCheckBillOrderQueryVO);
     }
     /**
-     * 获取扣款单
+     * 获取扣款单  wanchen 2
      *
      * @param producePaymentCheckBillOrderQueryVO 查询条件
      * @return 扣款单
@@ -167,7 +167,7 @@ public class ProducePaymentCheckBillOrderController {
         return producePaymentCheckBillOrderService.getDeductUrlById(producePaymentCheckBillOrderQueryVO);
     }
     /**
-     * 获取生产科发票
+     * 获取生产科发票 wanchen 2
      *
      * @param producePaymentCheckBillOrderQueryVO 查询条件
      * @return 扣款单
@@ -187,10 +187,25 @@ public class ProducePaymentCheckBillOrderController {
     public void exportReceipt(HttpServletResponse response, @RequestBody ProducePaymentCheckBillOrderDO queryVO) throws IOException {
         producePaymentCheckBillOrderService.exportReceipt(response,queryVO);
     }
-
+    /**
+     * 设置应付款日期  wanchen
+     *
+     * @param producePaymentCheckBillCreatevo 查询条件
+     * @return 日期
+     */
     @PostMapping("/setPayedDate")
     public void setPayedDate(@RequestBody ProducePaymentCheckBillCreateVO producePaymentCheckBillCreatevo) {
        producePaymentCheckBillOrderService.setPayedDate(producePaymentCheckBillCreatevo);
     }
+
+    /**
+     *设置备注信息 wanchen 2
+     * @param producePaymentCheckBillCreatevo 备注信息
+     * @return
+     */
+    @PostMapping("/notes")
+    public void byIdAddNotes(@RequestBody ProducePaymentCheckBillCreateVO producePaymentCheckBillCreatevo) {
+        producePaymentCheckBillOrderService.byIdAddNotes(producePaymentCheckBillCreatevo);
+    }
 }
+package com.order.erp.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author: xms
+ * @description: TODO
+ * @date: 2023/9/13 18:05
+ * @version: 1.0
+ */
+@Getter
+@AllArgsConstructor
+public enum FinanceEnum {
+//没有创建invocie号。
+    NOT_CREATED(-1,"未创建"),
+    //创建了invoice号没有提交审核,或者审核被驳回了。
+    UNPAID_PAYMENTS(0,"未收款"),
+    //审核通过了。
+    RECEIVED_PAYMENT(10,"已收款"),
+    ;
+    private Integer status;
+
+    private String desc;
+
+}
@@ -29,6 +29,10 @@ public class InvoiceBillOrderDO extends BaseDO implements Serializable {
      */
     private String invoiceNo;
     /**
+     * 订单id
+     */
+    private Long orderId ;
+    /**
      * 报关单url地址
      */
     private String bgUrl;
@@ -70,7 +74,7 @@ public class InvoiceBillOrderDO extends BaseDO implements Serializable {
      */
     private BigDecimal otherAmount;
     /**
-     * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
+     * 状态 -1：未创建、0：未收款，10：已收款
      */
     private Integer status;
     //需要在表中添加字段。
@@ -100,4 +104,8 @@ public class InvoiceBillOrderDO extends BaseDO implements Serializable {
      * */
     private String trackerUser;
+    /**
+     * 备注信息
+     * */
+    private String notes;
 }
@@ -22,7 +22,7 @@ import java.io.Serializable;
 @SuperBuilder
 public class OrderBaseInfoDO extends BaseDO implements Serializable {
     private static final long serialVersionUID = -59225000333017917L;
-
+//1
     private Long id;
     /**
      * 客户编码
@@ -6,6 +6,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
+import java.util.List;
 /**
  * 用户订单-字段锁定申请表(OrderFeildLockApply)实体类
@@ -67,4 +68,9 @@ public class OrderFieldLockApplyDO extends BaseDO implements Serializable {
      */
     private String  applyRemark;
+    /**
+     * 这个字段完全是为财务板块创建的,因为提交审核是可以一起提交,所以你把选中的多个订单id都放到一起提交审核,在设置orderid时只能设置一个,所以你其他的几个你必须要找地方存储。所以才用这个,把其他几个都放在里面存储进去。
+     */
+    private String financeId;
+
 }
@@ -28,6 +28,11 @@ public class ProducePaymentCheckBillOrderDO extends BaseDO implements Serializab
      * 生产科对账单
      */
     private String checkNo;
+
+    /**
+     * orderId
+     */
+    private Long orderId;
     /**
      * 发票url地址
      */
@@ -108,6 +113,9 @@ public class ProducePaymentCheckBillOrderDO extends BaseDO implements Serializab
      * 跟单 --业务创建单子,跟单也能看到。
      * */
     private String trackerUser;
-
+    /**
+     * 备注。
+     * */
+    private String notes;
 }
@@ -53,6 +53,10 @@ public class OrderProducePdfVO implements Serializable {
      * PO COLOR (订单颜色)
      */
     private String poColor;
+    /**
+     * collection(style description)
+     */
+    private String collection;
     /**
      * 颜色中文
+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;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+
+public class FinanceOrderResultVO extends OrderBaseInfoVO {
+
+    //基本信息
+    /**
+     * orderId
+     */
+    private Long id;
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+    /**
+     * 项目号
+     */
+    private String projectNo;
+    /**
+     * 生产科
+     */
+    private String productionDepartment;
+    /**
+     * 内部编号
+     */
+    private String innerNo;
+    /**
+     * 缩略图片地址
+     */
+    private String smallPicUrl;
+    /**
+     * 数量
+     */
+    private Integer orderCount;
+    /**
+     * 生成科拖货时间
+     */
+    private String productionDepartmentConsignTime;
+    /**
+     * 订单上HOD时间
+     */
+    private String orderHodTime;
+
+
+   //invoice信息
+   //应收款信息
+//    private InvoiceBillOrderDO invoiceBillOrderDO;
+    private Long invoiceId;
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+    /**
+     * 报关单url地址
+     */
+    private String invoiceBgUrl;
+    /**
+     * 必须回款日期
+     */
+    private String invoiceBackRefundDate;
+    /**
+     * 实际回款日期
+     */
+    private String invoiceActualRefundDate;
+
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal invoiceDeductAmount;
+    /**
+     * 扣款单url地址
+     */
+    private String invoiceDeductUrl;
+    /**
+     * 实际应收金额
+     */
+    private BigDecimal invoiceActualReceivableAmount;
+    /**
+     * 实际应付金额1
+     */
+    private BigDecimal invoiceActualPayedAmount1;
+    /**
+     * 实际应付金额2
+     */
+    private BigDecimal invoiceActualPayedAmount2;
+    /**
+     * 实际应付金额3
+     */
+    private BigDecimal invoiceActualPayedAmount3;
+    /**
+     * 其他费用金额
+     */
+    private BigDecimal invoiceOtherAmount;
+    /**
+     * 状态 -1：未创建、0：未收款，10：已收款
+     */
+    private Integer invoiceStatus;
+
+    /**
+     * 备注信息
+     * */
+    private String invoiceNotes;
+
+    //应付款信息
+//    private ProducePaymentCheckBillOrderDO producePaymentCheckBillOrderDO;
+
+    private Long checkId;
+    /**
+     * 生产科对账单
+     */
+    private String checkNo;
+    /**
+     * 发票url地址
+     */
+    private String checkInvoiceUrl;
+    /**
+     * 扣款单url地址
+     */
+    private String checkDeductUrl;
+    /**
+     * 生产科应付款日期
+     */
+    private String checkPayedDate;
+
+    /**
+     * 生产科实际付款日期
+     */
+    private String checkActualPayedDate;
+
+    /**
+     * 生产科扣款责任部门
+     */
+    private String checkDeductDept;
+    /**
+     * 生产科扣款金额
+     */
+    private BigDecimal checkDeductAmount;
+    /**
+     * 实际应付金额
+     */
+    private BigDecimal checkActualPayedAmount;
+    /**
+     * 实际应付金额1
+     */
+    private BigDecimal checkActualPayedAmount1;
+    /**
+     * 实际应付金额2
+     */
+    private BigDecimal checkActualPayedAmount2;
+    /**
+     * 实际应付金额3
+     */
+    private BigDecimal checkActualPayedAmount3;
+    /**
+     * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer checkPayStatus;
+    //需要在表中添加三个字段。
+    /**
+     * 生产科发票审核状态 0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer checkDepartmentInvoiceStatus;
+    /**
+     * 备注。
+     * */
+    private String checkNotes;
+
+
+    //利润信息
+//    private OrderProfitAnalysisVO profitAnalysisInfo;
+    /**
+     *  利润id。
+     * */
+    private Long profitId;
+    /**
+     * 客户单价$
+     */
+    private Double customerPrice;
+    /**
+     * 客户总价$
+     */
+    private Double customerTotalPrice;
+
+    /**
+     * 生成科单价￥
+     */
+    private Double productionDepartmentPrice;
+    /**
+     * 生成科总价￥
+     */
+    private Double productionDepartmentTotalPrice;
+
+
+
+
+}
@@ -42,7 +42,7 @@ public class InvoiceBillAnalysisResultVO implements Serializable {
     private BigDecimal deductAmount;
     /**
-     * 实际应收金额总计  实际应收1+2+3
+     * 实际收款金额汇总  实际收款1+2+3
      */
     private BigDecimal actualReceivableAmount;
@@ -61,9 +61,29 @@ public class InvoiceBillAnalysisResultVO implements Serializable {
      * 未付金额合计
      */
     private BigDecimal otherTotalAmount;
-
-    /**
-     * 合计数据
-     */
-
+    //可以省略!
+//    /**
+//     * 多个不同客户编码的订单合计数据  客户总金额汇总
+//     */
+//    private BigDecimal sumOrderCustomerTotalPrice;
+//   /**
+//   * 多个不同客户编码的订单合计数据  客户扣款金额汇总
+//   */
+//    private BigDecimal sumOrderDeductAmount;
+//    /**
+//     * 多个不同客户编码的订单合计数据  实际收款金额汇总
+//     */
+//    private BigDecimal sumOrderActualReceivableAmount;
+//    /**
+//     * 多个不同客户编码的订单合计数据  未收金额汇总
+//     */
+//    private BigDecimal sumOrderActualPayedAmount;
+//    /**
+//     * 多个不同客户编码的订单合计数据 实际应收金额汇总
+//     */
+//    private BigDecimal sumOrderOtherAmount;
+//    /**
+//     * 多个不同客户编码的订单合计数据  未付金额汇总
+//     */
+//    private BigDecimal sumOrderOtherTotalAmount;
 }
@@ -4,6 +4,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
+import java.util.List;
 /**
  * 应收款账单 -- 提交审核
@@ -19,7 +20,8 @@ import java.io.Serializable;
 @SuperBuilder
 public class InvoiceBillCommitApplyVO implements Serializable {
-    private Long id;
+    private List<Long> id;
+    //日期
     private String actualRefundDate;
     private String payee;
@@ -43,5 +43,10 @@ public class InvoiceBillCreateVO implements Serializable {
      */
     private List<Long> orderIds;
+    /**
+     * 备注
+     */
+    private String notes;
+
 }
@@ -30,43 +30,94 @@ public class InvoiceBillOrderQueryVO extends BasePageVO implements Serializable 
     private String invoiceNo;
     /**
-     * 总经理审核状态 -1，未提交审核，0：待审核、1：审核通过，2：审核驳回
+     * 生产科对账单号
      */
-    private Integer status;
+    private String checkNo;
     /**
-     * 客户编码
+     *  发票状态 总经理审核状态 -1，未创建，0：未收款、10：已收款
+     */
+    private Integer invoiceStatus;
+
+    /**
+     *  对账单号状态 总经理审核状态 -1，未创建，0：未收款、10：已收款
+     */
+    private Integer checkNoStatus;
+
+    /**
+     * order订单的客户编码
      */
     private String customerCode;
     /**
-     * 项目号
+     * order订单的项目号
      */
     private String projectNo;
     /**
-     * 生产科
+     * order订单的生产科
      */
     private String productionDepartment;
     /**
-     * 内部编号
+     * order订单的内部编号
      */
     private String innerNo;
     /**
-     * 客户po号
+     * order订单的客户po号
      */
     private String customerPo;
     /**
-     * 开始时间
+     * invoice的开始时间
+     */
+    private String invoiceStartTime;
+
+    /**
+     * invoice的结束时间
+     */
+    private String invoiceEndTime;
+    /**
+     * check的开始时间
      */
-    private String startTime;
+    private String checkStartTime;
     /**
-     * 结束时间
+     * check的结束时间
+     */
+    private String checkEndTime;
+    /**
+     * order订单的开始时间
+     */
+    private String createStartTime;
+    /**
+     * order订单的结束时间
+     */
+    private String createEndTime;
+    /**
+     * order订单的生产科拖货开始时间
+     */
+    private String productionDepartmentConsignStartTime;
+    /**
+     * order订单的生产科拖货结束时间
+     */
+    private String productionDepartmentConsignEndTime;
+    /**
+     * order订单的HOD开始时间
+     */
+    private String orderHodStartTime;
+    /**
+     * order订单的HOD结束时间
+     */
+    private String orderHodEndTime;
+    /**
+     * 跟单员 用来判断跟单员只能看到跟单员的数据
+     */
+    private String trackerUserName;
+    /**
+     * 业务员 用来判断业务员只能看到业务员的数据
      */
-    private String endTime;
+    private String businessUserName;
 }
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceFieldVO {
+
+
+    /**
+     * 订单id,这里取选中多个集合中的第第一个id作为申请id。
+     */
+    private List<Long> invoiceId;
+    /**
+     * 订单id,这里取选中多个集合中的第第一个id作为申请id。
+     */
+    private List<String> innerNo;
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+    /**
+     * 必须回款日期
+     */
+    private String backRefundDate;
+    /**
+     * 实际回款日期
+     */
+    private String actualRefundDate;
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal deductAmount;
+    /**
+     * 其他费用金额
+     */
+    private BigDecimal otherAmount;
+    /**
+     * payee 收款单位
+     */
+    private String payee;
+    /**
+     * 实际收款金额汇总
+     * */
+    private BigDecimal totalPayAmount;
+    /**
+     * 客户总价金额汇总
+     * */
+    private BigDecimal totalCustomerAmount;
+    /**
+     * 跟单员
+     * */
+    private String trackerUser;
+    /**
+     * 业务员
+     * */
+    private String businesPerson;
+    /**
+     * 财务人员
+     * */
+    private String financePerson;
+
+}
@@ -48,13 +48,18 @@ public class OrderLockFieldVO implements Serializable {
     /**
      * 应收款账单字段
      */
-    private InvoiceBillOrderDO invoiceBillOrderDO;
+//    private List<InvoiceBillOrderDO> invoiceBillOrderDOList;
+
+     private  InvoiceFieldVO invoiceFieldVO;
     /**
      * 应付款账单字段
      */
+    //这个专门给发票审核用的。
     private ProducePaymentCheckBillOrderDO checkBillOrderDO;
+    private  ProducePaymentCheckBillFieldVO producePaymentCheckBillFieldVO;
+
     /**
      * 导出指定订单id集合
      */
@@ -4,6 +4,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 import java.io.Serializable;
+import java.util.List;
 /**
  * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
@@ -19,7 +20,7 @@ import java.io.Serializable;
 @SuperBuilder
 public class ProducePaymentCheckBillCommitApplyVO implements Serializable {
-    private Long id;
+    private List<Long> id;
     private String actualPayedDate;
 }
@@ -35,6 +35,10 @@ public class ProducePaymentCheckBillCreateVO implements Serializable {
      * 订单id集合
      */
     private List<Long> orderIds;
+    /**
+     * 备注
+     */
+    private String notes;
 }
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProducePaymentCheckBillFieldVO {
+
+
+    /**
+    * 订单id,这里选取多个集合中的第第一个id作为申请id。
+    */
+    private List<Long> producePaymentCheckBillId;
+    /**
+     * 内部编号。
+     */
+    private List<String> innerNo;
+
+    /**
+     * 生产科对账单
+     */
+    private String checkNo;
+
+    /**
+     * 发票url地址
+     */
+    private String invoiceUrl;
+    /**
+     * 生产科应付款日期
+     */
+    private String payedDate;
+
+    /**
+     * 生产科实际付款日期
+     */
+    private String actualPayedDate;
+
+    /**
+     * 生产科扣款金额
+     */
+    private BigDecimal deductAmount;
+    /**
+     * 实际应付金额
+     */
+    private BigDecimal actualPayedAmount;
+    /**
+     * 实际付款金额汇总
+     * */
+    private BigDecimal totalActualPayedAmount;
+
+    /**
+     * 未付金额
+     * */
+    private BigDecimal unPayedAmount;
+    /**
+     * 跟单员
+     * */
+    private String trackerUser;
+    /**
+     * 业务员
+     * */
+    private String businesPerson;
+    /**
+     * 财务人员
+     * */
+    private String financePerson;
+    /**
+     * 生产科
+     * */
+    private String productionName;
+
+}
 package com.order.erp.mapper.order;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
+import com.order.erp.domain.vo.order.FinanceOrderResultVO;
+import com.order.erp.domain.vo.order.InvoiceBillOrderQueryVO;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import java.util.List;
@@ -16,5 +21,7 @@ public interface InvoiceBillOrderMapper extends BaseMapper&lt;InvoiceBillOrderDO&gt; {
 @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();
+    IPage<FinanceOrderResultVO> byConditionGetOrder(@Param("page") Page<FinanceOrderResultVO> page, @Param("queryVO") InvoiceBillOrderQueryVO queryVO);
+
 }
@@ -117,4 +117,6 @@ public interface InvoiceBillOrderService extends IService&lt;InvoiceBillOrderDO&gt; {
     ServerResult setBackRefundDate(InvoiceBillCreateVO createVO);
+    ServerResult byIdAddNotes(InvoiceBillCreateVO createVO);
+
 }
@@ -109,4 +109,5 @@ public interface ProducePaymentCheckBillOrderService extends IService&lt;ProducePay
     List<ProducePaymentCheckBillOrderDO> getOverEventList();
     ServerResult setPayedDate(ProducePaymentCheckBillCreateVO createVO);
+    ServerResult byIdAddNotes(ProducePaymentCheckBillCreateVO createVO);
 }
@@ -20,6 +20,7 @@ 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.FinanceEnum;
 import com.order.erp.domain.RoleEnum;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.SystemSettingDO;
@@ -46,6 +47,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 /**
  * 应收款账单表(InvoiceBillOrder)表服务实现类
@@ -79,6 +81,9 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
     @Resource
     private TransactionHelper transactionHelper;
+    @Resource
+    private ProducePaymentCheckBillOrderService producePaymentCheckBillOrderService;
+
     /**
      * 分页查询
@@ -88,7 +93,12 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      */
     @Override
     public ServerResult listByPage(InvoiceBillOrderQueryVO queryVO) {
-        RoleEnum role = dataScope.getRole();
+        //分页查询既会筛选基本信息也会筛选invoice信息。只能是选通过一边,要么是基本信息这边,要么是invoice这边,然后根据对应invoice或者orderId去查询。
+        //例如:查询基本信息中项目号为A01-C2409,并且invoice状态为已通过,那么就先去基本信息中查找A01-C2409,然后找到对应的invoice,判断A01-C2409对应的订单集合是否有invoice,有的话,就查找已通过的invocie。
+        //要是查询invoice为67,并且订单HOD时间小于2024-12-25,那么就先去invoice中查找是否有checkNo为67的订单,然后查找对应orderId,使用orderId去查找对应订单基本信息,查看是否有HOD小于2024-12-25的单子。
+
+
+       /* RoleEnum role = dataScope.getRole();
         LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
         //跟单也只能看到自己创建的   业务只能看到自己的
         if(Objects.nonNull(role) && role.getId().equals(RoleEnum.TRACKER_USER.getId())){
@@ -99,9 +109,192 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         }
         Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
         IPage<InvoiceBillOrderDO> iPage = page(page, queryWrapper);
-        return ServerResult.success(iPage);
-    }
+        //创建另一个page,包含订单基本信息与invoice,然后一起返回。
+        return ServerResult.success(iPage);*/
+
+        //一个条件也没有。
+//        if(true) {
+//            Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
+//            IPage<OrderBaseInfoDO> iPage = orderBaseInfoService.page(page, new LambdaQueryWrapper<OrderBaseInfoDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).orderByDesc(OrderBaseInfoDO::getId));
+//            List<OrderBaseInfoDO> orderList = iPage.getRecords();
+//            //获取关联的信息。
+//            List<FinanceOrderResultVO> financeOrderResultVOList = null;
+//            if (CollectionUtils.isNotEmpty(orderList)) {
+//                List<Long> orderIds = orderList.stream().filter(Objects::nonNull).map(item -> item.getId()).collect(Collectors.toList());
+//                List<InvoiceBillOrderDO> invoiceBillOrderDOList = list(new LambdaQueryWrapper<InvoiceBillOrderDO>()
+//                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(InvoiceBillOrderDO::getOrderId, orderIds));
+//                List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOList = producePaymentCheckBillOrderService.list(new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>()
+//                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(ProducePaymentCheckBillOrderDO::getOrderId, orderIds));
+//                Map<Long, InvoiceBillOrderDO> invoiceBillOrderDOMap = invoiceBillOrderDOList.stream().collect(Collectors.toMap(InvoiceBillOrderDO::getOrderId, Function.identity(), (x, y) -> x));
+//                Map<Long, ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOMap = producePaymentCheckBillOrderDOList.stream().collect(Collectors.toMap(ProducePaymentCheckBillOrderDO::getOrderId, Function.identity(), (x, y) -> x));
+//                financeOrderResultVOList = orderList.stream().filter(Objects::nonNull).map(x -> {
+//                    FinanceOrderResultVO financeOrderResultVO = new FinanceOrderResultVO();
+//                    BeanUtils.copyProperties(x, financeOrderResultVO);
+//                    if (invoiceBillOrderDOMap.containsKey(x.getId())) {
+//                        InvoiceBillOrderDO invoiceBillOrderDO = invoiceBillOrderDOMap.get(x.getId());
+//                        financeOrderResultVO.setInvoiceBillOrderDO(invoiceBillOrderDO);
+//                    }
+//                    if (producePaymentCheckBillOrderDOMap.containsKey(x.getId())) {
+//                        ProducePaymentCheckBillOrderDO producePaymentCheckBillOrderDO = producePaymentCheckBillOrderDOMap.get(x.getId());
+//                        financeOrderResultVO.setProducePaymentCheckBillOrderDO(producePaymentCheckBillOrderDO);
+//                    }
+//                    return financeOrderResultVO;
+//                }).collect(Collectors.toList());
+//            }
+//            IPage<FinanceOrderResultVO> financeOrderResultVOIPage = new Page<>();
+//            financeOrderResultVOIPage.setRecords(financeOrderResultVOList);
+//            BeanUtils.copyProperties(iPage, financeOrderResultVOIPage, "records");
+//            return ServerResult.success(financeOrderResultVOIPage);
+//        }
+//        else{
+       /* //上面单独再写一个if判断,要是一个条件都没有,就直接进行分页查询(只做一下权限)。   唯一问题:这里一下子需要查询多条数据。
+        RoleEnum role = dataScope.getRole();
+        List<OrderBaseInfoDO> orderBaseInfoDOList = ByOrderGetOrderId(queryVO, role);
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            return ServerResult.success();
+        }
+        List<InvoiceBillOrderDO> invoiceBillOrderDOS = ByInvoiceGetOrderId(queryVO, orderBaseInfoDOList);
+        List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOS = ByCheckGetOrderId(queryVO, orderBaseInfoDOList);
+
+        //取交集
+
+        //取交集。
+        // 获取每个集合的 id 列表，如果集合为空则返回空集合
+        Set<Long> orderIds1 = orderBaseInfoDOList != null
+                ? orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toSet())
+                : Collections.emptySet();
+
+        Set<Long> orderIds2 = invoiceBillOrderDOS != null
+                ? invoiceBillOrderDOS.stream().map(InvoiceBillOrderDO::getOrderId).collect(Collectors.toSet())
+                : Collections.emptySet();
+
+        Set<Long> orderIds3 = producePaymentCheckBillOrderDOS != null
+                ? producePaymentCheckBillOrderDOS.stream().map(ProducePaymentCheckBillOrderDO::getOrderId).collect(Collectors.toSet())
+                : Collections.emptySet();
+
+        Set<Long> intersection = Stream.of(orderIds1, orderIds2, orderIds3)
+                .filter(CollectionUtils::isNotEmpty) // 过滤掉空集合
+                .reduce((set1, set2) -> {
+                    set1.retainAll(set2); // 取交集
+                    return set1;
+                })
+                .orElse(Collections.emptySet()); // 如果结果为空则返回空集合
+        if (CollectionUtils.isEmpty(intersection)) {
+            return ServerResult.success();
+        }
+
+        //返回交集的订单数据。 todo
+        Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
+        IPage<OrderBaseInfoDO> iPage = orderBaseInfoService.page(page, new LambdaQueryWrapper<OrderBaseInfoDO>().in(OrderBaseInfoDO::getId, intersection));
+        List<OrderBaseInfoDO> orderList = iPage.getRecords();
+
+
+        //去对应的invoice中查找。
+        List<InvoiceBillOrderDO> invoiceBillOrderDOList = list(new LambdaQueryWrapper<InvoiceBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(InvoiceBillOrderDO::getOrderId, intersection));
+        //去对应的check中查找。
+        List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOList = producePaymentCheckBillOrderService.list(new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(ProducePaymentCheckBillOrderDO::getOrderId, intersection));
+
+        List<FinanceOrderResultVO> financeOrderResultVOS = null;
+        if (CollectionUtils.isNotEmpty(orderList)) {
+            // 将 Map 提升到方法范围内
+            Map<Long, InvoiceBillOrderDO> invoiceBillOrderDOMap = CollectionUtils.isNotEmpty(invoiceBillOrderDOList)
+                    ? invoiceBillOrderDOList.stream().collect(Collectors.toMap(
+                    InvoiceBillOrderDO::getOrderId,
+                    Function.identity(),
+                    (existing, replacement) -> existing))
+                    : Collections.emptyMap();
+            Map<Long, ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOMap = CollectionUtils.isNotEmpty(producePaymentCheckBillOrderDOList)
+                    ? producePaymentCheckBillOrderDOList.stream().collect(Collectors.toMap(
+                    ProducePaymentCheckBillOrderDO::getOrderId,
+                    Function.identity(),
+                    (existing, replacement) -> existing))
+                    : Collections.emptyMap();
+            financeOrderResultVOS = orderList.stream().map(result -> {
+                //到这复制订单基本信息。   一个整体包含订单基本信息,invoice信息,生产科对账单号信息。
+                FinanceOrderResultVO financeOrderResultVO = new FinanceOrderResultVO();
+                BeanUtils.copyProperties(result, financeOrderResultVO);
+                // 访问 invoiceBillOrderDOMap
+                if (invoiceBillOrderDOMap.containsKey(result.getId())) {
+                    // 对 invoice 进行处理,填充到整体中,需要orderId一致。
+                    financeOrderResultVO.setInvoiceBillOrderDO(invoiceBillOrderDOMap.get(result.getId()));
+                }
+                if (producePaymentCheckBillOrderDOMap.containsKey(result.getId())) {
+                    // 对 check 进行处理,填充到整体中,需要orderId一致。
+                    financeOrderResultVO.setProducePaymentCheckBillOrderDO(producePaymentCheckBillOrderDOMap.get(result.getId()));
+                }
+                return financeOrderResultVO;
+            }).collect(Collectors.toList());
+        }
+        IPage<FinanceOrderResultVO> finVoPage = new Page<>();
+        finVoPage.setRecords(financeOrderResultVOS);
+        BeanUtils.copyProperties(iPage, finVoPage, "records");
+        System.out.println("交集 ID 集合：" + intersection);
+        //返回所有的订单数据。 todo  没有筛选的情况。
+        return ServerResult.success(finVoPage);*/
+            RoleEnum role = dataScope.getRole();
+            Page<FinanceOrderResultVO> page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
+            if(Objects.nonNull(role) && role.getId().equals(RoleEnum.TRACKER_USER.getId())) {
+                queryVO.setTrackerUserName(dataScope.getLoginUserName());
+                IPage<FinanceOrderResultVO> financeOrderResultVOIPage = baseMapper.byConditionGetOrder(page, queryVO);
+                return ServerResult.success(financeOrderResultVOIPage);
+            }
+            if (Objects.nonNull(role) && role.getId().equals(RoleEnum.BUSINESS_USER.getId())) {
+                queryVO.setBusinessUserName(dataScope.getLoginUserName());
+                IPage<FinanceOrderResultVO> financeOrderResultVOIPage = baseMapper.byConditionGetOrder(page,queryVO);
+                return ServerResult.success(financeOrderResultVOIPage);
+            }
+        IPage<FinanceOrderResultVO> financeOrderResultVOIPage = baseMapper.byConditionGetOrder(page,queryVO);
+            return ServerResult.success(financeOrderResultVOIPage);
+        }
+//    }
+
+
+
+    private List<OrderBaseInfoDO> ByOrderGetOrderId(InvoiceBillOrderQueryVO queryVO,RoleEnum role){
+        LambdaQueryWrapper<OrderBaseInfoDO> lambdawrapper = new LambdaQueryWrapper<OrderBaseInfoDO>().eq(BaseDO::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())
+                .ge(StringUtils.isNotBlank(queryVO.getCreateStartTime()), OrderBaseInfoDO::getCreateTime, queryVO.getCreateStartTime())
+                .le(StringUtils.isNotBlank(queryVO.getCreateEndTime()), OrderBaseInfoDO::getCreateTime, queryVO.getCreateEndTime())
+                .ge(StringUtils.isNotBlank(queryVO.getProductionDepartmentConsignStartTime()), OrderBaseInfoDO::getProductionDepartmentConsignTime, queryVO.getProductionDepartmentConsignStartTime())
+                .le(StringUtils.isNotBlank(queryVO.getProductionDepartmentConsignEndTime()), OrderBaseInfoDO::getProductionDepartmentConsignTime, queryVO.getProductionDepartmentConsignEndTime())
+                .ge(StringUtils.isNotBlank(queryVO.getOrderHodStartTime()), OrderBaseInfoDO::getOrderHodTime, queryVO.getOrderHodStartTime())
+                .le(StringUtils.isNotBlank(queryVO.getOrderHodEndTime()), OrderBaseInfoDO::getOrderHodTime, queryVO.getOrderHodEndTime());
+        if(Objects.nonNull(role) && role.getId().equals(RoleEnum.TRACKER_USER.getId())) {
+            lambdawrapper.eq(OrderBaseInfoDO::getCreateBy, dataScope.getLoginUserName());
+        }
+        if (Objects.nonNull(role) && role.getId().equals(RoleEnum.BUSINESS_USER.getId())) {
+                lambdawrapper.eq(OrderBaseInfoDO::getBusinessPerson, dataScope.getLoginUserName());
+        }
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(lambdawrapper);
+        return orderBaseInfoDOList;
+    }
+    private List<InvoiceBillOrderDO> ByInvoiceGetOrderId(InvoiceBillOrderQueryVO queryVO,List<OrderBaseInfoDO> orderBaseInfoDOList){
+        LambdaQueryWrapper<InvoiceBillOrderDO> LambdaQueryWrapper = new LambdaQueryWrapper<InvoiceBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(StringUtils.isNotBlank(queryVO.getInvoiceNo()), InvoiceBillOrderDO::getInvoiceNo, queryVO.getInvoiceNo())
+                .eq(Objects.nonNull(queryVO.getInvoiceStatus()), InvoiceBillOrderDO::getStatus, queryVO.getInvoiceStatus())
+                .ge(StringUtils.isNotBlank(queryVO.getInvoiceStartTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getInvoiceStartTime())
+                .le(StringUtils.isNotBlank(queryVO.getInvoiceEndTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getInvoiceEndTime());
+        if(CollectionUtils.isNotEmpty(orderBaseInfoDOList)){
+            LambdaQueryWrapper.in(InvoiceBillOrderDO::getOrderId, orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toList()));
+        }
+        return list(LambdaQueryWrapper);
+    }
+    private List<ProducePaymentCheckBillOrderDO> ByCheckGetOrderId(InvoiceBillOrderQueryVO queryVO,List<OrderBaseInfoDO> orderBaseInfoDOList){
+        LambdaQueryWrapper<ProducePaymentCheckBillOrderDO> wrapper = new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(StringUtils.isNotBlank(queryVO.getInvoiceNo()), ProducePaymentCheckBillOrderDO::getCheckNo, queryVO.getCheckNo())
+                .eq(Objects.nonNull(queryVO.getInvoiceStatus()), ProducePaymentCheckBillOrderDO::getStatus, queryVO.getCheckNoStatus())
+                .ge(StringUtils.isNotBlank(queryVO.getCheckStartTime()), ProducePaymentCheckBillOrderDO::getCreateTime, queryVO.getCheckStartTime())
+                .le(StringUtils.isNotBlank(queryVO.getCheckEndTime()), ProducePaymentCheckBillOrderDO::getCreateTime, queryVO.getCheckEndTime());
+        if(CollectionUtils.isNotEmpty(orderBaseInfoDOList)){
+            wrapper.in(ProducePaymentCheckBillOrderDO::getOrderId, orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toList()));
+        }
+        return producePaymentCheckBillOrderService.list(wrapper);
+    }
     /**
      * @param queryVO
      * @return
@@ -109,10 +302,10 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
     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())
+               /* .eq(StringUtils.isNotBlank(queryVO.getInvoiceNo()), InvoiceBillOrderDO::getInvoiceNo, queryVO.getInvoiceNo())
+                .eq(Objects.nonNull(queryVO.getInvoiceStatus()), InvoiceBillOrderDO::getStatus, queryVO.getInvoiceStatus())
+                .ge(StringUtils.isNotBlank(queryVO.getInvoiceStartTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getInvoiceStartTime())
+                .le(StringUtils.isNotBlank(queryVO.getInvoiceEndTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getInvoiceEndTime())*/
                 .orderByDesc(InvoiceBillOrderDO::getId);
         if (CollectionUtils.isNotEmpty(queryVO.getIds())) {
             queryWrapper.in(InvoiceBillOrderDO::getId, queryVO.getIds());
@@ -125,13 +318,16 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
     @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()));
+//        List<InvoiceBillMappingDO> mappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
+//                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+//                .eq(InvoiceBillMappingDO::getInvoiceNo, queryVO.getInvoiceNo()));
+
+        List<InvoiceBillOrderDO> mappingDOS = list(new LambdaQueryWrapper<InvoiceBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(InvoiceBillOrderDO::getInvoiceNo, queryVO.getInvoiceNo()));
         if (CollectionUtils.isEmpty(mappingDOS)) {
             return ServerResult.success();
         }
-        Set<Long> orderIds = mappingDOS.stream().map(InvoiceBillMappingDO::getOrderId).collect(Collectors.toSet());
+        Set<Long> orderIds = mappingDOS.stream().map(InvoiceBillOrderDO::getOrderId).collect(Collectors.toSet());
         //返回数据包含利润信息。
         //创建返回的数据,里面包含订单信息和利润信息,然后放到list集合中。
         List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
@@ -308,16 +504,17 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         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));
+//        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, InvoiceBillOrderDO> invoiceBillOrderDOMap = invoiceBillOrderDOS.stream().collect(Collectors.toMap(InvoiceBillOrderDO::getOrderId, Function.identity(), (x, y) -> x));
+  //第一版,上面为第二版 Map<Long, InvoiceBillMappingDO> orderBillMap = invoiceBillMappingDOS.stream().collect(Collectors.toMap(InvoiceBillMappingDO::getOrderId, Function.identity(), (x, y) -> x));
+        List<InvoiceOrderBaseItemVO> itemVOS = getInvoiceOrderBaseItems(invoiceBillOrderDOMap);
+//第一版,上面为第二版   List<InvoiceOrderBaseItemVO> itemVOS = getInvoiceOrderBaseItems(orderBillMap);
+        Map<String, InvoiceBillOrderDO> invoiceBillMap = 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);
+        List<InvoiceBillAnalysisExportVO> exportVOS = wrapperAnalysisExport(invoiceBillMap, baseItemMap);
         return wrapperAnalysisResultVO(exportVOS);
     }
@@ -472,7 +669,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      * @param mappingDOMap
      * @return
      */
-    private List<InvoiceOrderBaseItemVO> getInvoiceOrderBaseItems(Map<Long, InvoiceBillMappingDO> mappingDOMap) {
+    private List<InvoiceOrderBaseItemVO> getInvoiceOrderBaseItems(Map<Long, InvoiceBillOrderDO> 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));
@@ -494,7 +691,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
             }
             if (mappingDOMap.containsKey(orderId)) {
-                InvoiceBillMappingDO mappingDO = mappingDOMap.get(orderId);
+                InvoiceBillOrderDO mappingDO = mappingDOMap.get(orderId);
                 itemVO.setInvoiceCode(mappingDO.getInvoiceNo());
             }
             baseItemVOS.add(itemVO);
@@ -507,18 +704,23 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      * @return
      */
     private Set<Long> filterBillOrderIdsBy(InvoiceBillOrderQueryVO queryVO) {
+        //根据基本信息得到对应的订单id。
         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));
+//        List<InvoiceBillMappingDO> mappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+//                .in(CollectionUtils.isNotEmpty(orderIds), InvoiceBillMappingDO::getOrderId, orderIds));
+        //不再从invoiceBillMappingDO里面查询关联的数据,而是应该从invoice中查询。
+        List<InvoiceBillOrderDO> mappingDOS = list(new LambdaQueryWrapper<InvoiceBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(CollectionUtils.isNotEmpty(orderIds), InvoiceBillOrderDO::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());
+//        return mappingDOS.stream().map(InvoiceBillMappingDO::getInvoiceBillId).collect(Collectors.toSet());
+        return mappingDOS.stream().map(InvoiceBillOrderDO::getId).collect(Collectors.toSet());
     }
     /**
@@ -542,6 +744,24 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         if (StringUtils.isNotBlank(queryVO.getProjectNo())) {
             flag = flag | true;
         }
+        if(StringUtils.isNotBlank(queryVO.getCreateStartTime())){
+            flag = flag | true;
+        }
+        if(StringUtils.isNotBlank(queryVO.getCreateEndTime())){
+            flag = flag | true;
+        }
+        if(StringUtils.isNotBlank(queryVO.getProductionDepartmentConsignStartTime())){
+            flag = flag | true;
+        }
+        if(StringUtils.isNotBlank(queryVO.getProductionDepartmentConsignEndTime())){
+            flag = flag | true;
+        }
+        if(StringUtils.isNotBlank(queryVO.getOrderHodStartTime())){
+            flag = flag | true;
+        }
+        if(StringUtils.isNotBlank(queryVO.getOrderHodEndTime())){
+            flag = flag | true;
+        }
         if (!flag) {
             return null;
         }
@@ -551,7 +771,13 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
                 .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());
+                .eq(StringUtils.isNotBlank(queryVO.getProjectNo()), OrderBaseInfoDO::getProjectNo, queryVO.getProjectNo())
+                .ge(StringUtils.isNotBlank(queryVO.getCreateStartTime()), OrderBaseInfoDO::getCreateTime, queryVO.getCreateStartTime())
+                .le(StringUtils.isNotBlank(queryVO.getCreateEndTime()), OrderBaseInfoDO::getCreateTime, queryVO.getCreateEndTime())
+                .ge(StringUtils.isNotBlank(queryVO.getProductionDepartmentConsignStartTime()), OrderBaseInfoDO::getProductionDepartmentConsignTime, queryVO.getProductionDepartmentConsignStartTime())
+                .le(StringUtils.isNotBlank(queryVO.getProductionDepartmentConsignEndTime()), OrderBaseInfoDO::getProductionDepartmentConsignTime, queryVO.getProductionDepartmentConsignEndTime())
+                .ge(StringUtils.isNotBlank(queryVO.getOrderHodStartTime()), OrderBaseInfoDO::getOrderHodTime, queryVO.getOrderHodStartTime())
+                .le(StringUtils.isNotBlank(queryVO.getOrderHodEndTime()), OrderBaseInfoDO::getOrderHodTime, queryVO.getOrderHodEndTime());
         List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(queryWrapper);
         if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
             List<Long> orderIds = new ArrayList<>();
@@ -575,7 +801,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         List<OrderBaseInfoDO> orderBaseInfoDOList = validaBillOrder(createVO);
-        InvoiceBillOrderDO invoiceBillOrderDO = buildInvoiceBillOrderDO(createVO);
+        List<InvoiceBillOrderDO> invoiceBillOrderDOList = buildInvoiceBillOrderDO(createVO,orderBaseInfoDOList);
         List<OrderBaseInfoDO> containInvoiceOrderBaseInfoList=orderBaseInfoDOList.stream().map(x->{
             x.setInvoiceNo(createVO.getInvoiceNo());
@@ -583,49 +809,48 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         }).collect(Collectors.toList());
         boolean success= transactionHelper.run(() -> {
-            save(invoiceBillOrderDO);
+            saveBatch(invoiceBillOrderDOList);
             orderBaseInfoService.updateBatchById(containInvoiceOrderBaseInfoList);
-            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);
-       }
+        Map<Long, OrderProfitAnalysisDO> orderProfitAnalysisMap;
+        //提前获取金额数据,避免后续多次查询。
+        List<OrderProfitAnalysisDO> orderProfitAnalysisList = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderProfitAnalysisDO::getOrderId, createVO.getOrderIds()));
+        if(CollectionUtils.isNotEmpty(orderProfitAnalysisList)){
+           orderProfitAnalysisMap = orderProfitAnalysisList.stream().collect(Collectors.toMap(
+                            OrderProfitAnalysisDO::getOrderId,  // key：使用 orderId 作为键
+                            Function.identity(),                // value：使用对象本身作为值
+                            (existing, replacement) -> existing // 冲突时保留已有的值
+                    ));
+        } else {
+            orderProfitAnalysisMap = null;
+        }
+        if(success) {
+            List<InvoiceBillOrderDO> invoiceBillOrderDOS = invoiceBillOrderDOList.stream().filter(Objects::nonNull).map(invoiceNo -> {
+                if (orderProfitAnalysisMap != null) {
+                    if (orderProfitAnalysisMap.containsKey(invoiceNo.getOrderId())) {
+                        OrderProfitAnalysisDO orderProfitAnalysisDO = orderProfitAnalysisMap.get(invoiceNo.getOrderId());
+                        invoiceNo.setTotalCustomerAmount(
+                                //如果CustomerTotalPrice为空，则设置为0.0
+                                //设置实际应收金额汇总,要是没有发生扣款,也会被设置。
+                                BigDecimal.valueOf(Optional.ofNullable(orderProfitAnalysisDO.getCustomerTotalPrice()).orElse(0.0))
+                                        .setScale(2, RoundingMode.HALF_UP)
+                        );
+                        invoiceNo.setActualReceivableAmount(invoiceNo.getTotalCustomerAmount());
+                    }
+                }
+                //设置发生扣款金额汇总,避免没有发生扣款金额,也能在审核界面有对应的值。
+                invoiceNo.setDeductAmount(BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
+                //设置其他费用汇总,避免没有发生扣款金额,也能在审核界面有对应的值。
+                invoiceNo.setOtherAmount(BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
+                //设置实际付款金额。
+                invoiceNo.setTotalPayAmount(BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
+                return invoiceNo;
+            }).collect(Collectors.toList());
+          updateBatchById(invoiceBillOrderDOS);
+        }
         return ServerResult.success();
     }
@@ -704,16 +929,18 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      * @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())
-                .trackerUser(orderBaseInfoDOList.get(0).getCreateBy())
-                .build();
+    private List<InvoiceBillOrderDO> buildInvoiceBillOrderDO(InvoiceBillCreateVO createVO,List<OrderBaseInfoDO> orderBaseInfoDOList) {
+        return orderBaseInfoDOList.stream().map(x->{
+            return InvoiceBillOrderDO.builder()
+                    .invoiceNo(createVO.getInvoiceNo())
+                    .orderId(x.getId())
+                    .bgUrl(createVO.getBgUrl())
+                    .backRefundDate(createVO.getBackRefundDate())
+                    .status(FinanceEnum.UNPAID_PAYMENTS.getStatus())
+                    .businesPerson(x.getBusinessPerson())
+                    .trackerUser(x.getCreateBy())
+                    .build();
+        }).collect(Collectors.toList());
     }
     /**
@@ -773,17 +1000,15 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
             throw new BusinessException("订单中包含利润未审批的订单,无法创建！");
         }
-        String invoiceNo = createVO.getInvoiceNo();
-
         List<InvoiceBillOrderDO> invoiceBillOrderDOS = list(new LambdaQueryWrapper<InvoiceBillOrderDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(InvoiceBillOrderDO::getInvoiceNo, invoiceNo));
+                .eq(InvoiceBillOrderDO::getInvoiceNo, createVO.getInvoiceNo()));
         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)) {
+        //该订单已绑定其他订单。
+        List<InvoiceBillOrderDO> invoiceBillOrderDOList = list(new LambdaQueryWrapper<InvoiceBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(InvoiceBillOrderDO::getOrderId,createVO.getOrderIds()));
+        if(CollectionUtils.isNotEmpty(invoiceBillOrderDOList)){
             throw new BusinessException("该勾选的订单已经绑定其他账单了！");
         }
         return orderBaseInfoDOList;
@@ -804,11 +1029,13 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         if (Objects.isNull(invoiceBillOrderDo)) {
             throw new BusinessException("应收款单据不存在");
         }
-        if(Objects.nonNull(invoiceBillOrderDo.getStatus()) && Constant.ENABLE_TEN==invoiceBillOrderDo.getStatus()){
-            throw new BusinessException("应收款单据已审核通过,无法编辑");
+        if(Objects.nonNull(invoiceBillOrderDo.getStatus()) && FinanceEnum.RECEIVED_PAYMENT.getStatus()==invoiceBillOrderDo.getStatus()){
+            throw new BusinessException("应收款单据已收款,无法编辑");
         }
+        //todo 审核有问题  完成1
+//        checkCommitApply(invoiceBillOrderDo.getId());
+        checkApply(new ArrayList<>(Arrays.asList(deductInfoVO.getId())));
-        checkCommitApply(invoiceBillOrderDo.getId());
         if(StringUtils.isNotBlank(invoiceBillOrderDo.getDeductUrl())){
 //记住:需要修改数据表对应的字段deduct_url的varchar数据范围,修改为1000左右。
             if(StringUtils.isNotBlank(deductInfoVO.getDeductUrl())){
@@ -842,9 +1069,12 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         if (Objects.isNull(invoiceBillOrderDo)) {
             throw new BusinessException("应收款单据不存在");
         }
-
-        checkCommitApply(invoiceBillOrderDo.getId());
-
+        //todo 审核有问题 完成2
+//        checkCommitApply(invoiceBillOrderDo.getId());
+        if(Objects.nonNull(invoiceBillOrderDo.getStatus()) && FinanceEnum.RECEIVED_PAYMENT.getStatus()==invoiceBillOrderDo.getStatus()){
+            throw new BusinessException("已完成收款,无法更新!");
+        }
+         checkApply(new ArrayList<>(Arrays.asList(amountInfoVO.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));
@@ -871,46 +1101,104 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         }
     }
+    //选中提交。
+
     @Override
     public ServerResult commitApply(InvoiceBillCommitApplyVO commitApplyVO) {
-        InvoiceBillOrderDO invoiceBillOrderDO = getById(commitApplyVO.getId());
-        if (Objects.isNull(invoiceBillOrderDO)) {
+        if(CollectionUtils.isEmpty(commitApplyVO.getId())){
+            throw new BusinessException("id参数不能为空!");
+        }
+        List<InvoiceBillOrderDO> invoiceBillOrderDOS = list(new LambdaQueryWrapper<InvoiceBillOrderDO>().eq(InvoiceBillOrderDO::getEnableFlag,Constant.ENABLE_TEN)
+                .in(InvoiceBillOrderDO::getId,commitApplyVO.getId()));
+        if (CollectionUtils.isEmpty(invoiceBillOrderDOS)) {
             throw new BusinessException("账单不存在！");
         }
-        if(Constant.ENABLE_TEN==invoiceBillOrderDO.getStatus()){
-            throw new BusinessException("该订单已通过审核!");
+        boolean isTure = invoiceBillOrderDOS.stream().filter(Objects::nonNull).allMatch(invoiceBillOrderDO -> invoiceBillOrderDO.getInvoiceNo().equals(invoiceBillOrderDOS.get(0).getInvoiceNo()));
+        if(!isTure){
+            throw  new BusinessException("勾选订单的invoice需一致");
         }
+       //判断选择订单中是否包含已审核通过的订单。  todo:这里需要在审核处理之后,给orderid设置状态,给外带的finacneId集合也设置状态,这里才能生效。
+        boolean isTrue = invoiceBillOrderDOS.stream().filter(Objects::nonNull).anyMatch(invoiceBillOrder -> FinanceEnum.RECEIVED_PAYMENT.getStatus().equals(invoiceBillOrder.getStatus()));
+        if(isTrue){
+            throw new BusinessException("订单中包含已收款的数据,无法提交!");
+        }
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(invoiceBillOrderDOS.stream().filter(Objects::nonNull).map(invoice -> invoice.getOrderId()).collect(Collectors.toSet()));
+        //实际收款金额汇总
+        BigDecimal totalPayAmount =  BigDecimal.ZERO;
+        //客户总价金额汇总
+        BigDecimal totalCustomerAmount = BigDecimal.ZERO;
+        //发生扣款金额汇总
+        BigDecimal deductAmount = BigDecimal.ZERO;
+        //其他费用汇总
+        BigDecimal otherAmount = BigDecimal.ZERO;
+        //todo 还需要判断一下,是否提交的订单中包含正在处于审核中的订单,要是有正在审核的订单,那就不允许提交。  已完成,应该就是这样审核的。
+        checkApply(commitApplyVO.getId());
         Long userId = dataScope.getLoginUserId();
         String loginUserName = dataScope.getLoginUserName();
-        checkApply(commitApplyVO.getId(), userId);
-        invoiceBillOrderDO.setActualRefundDate(commitApplyVO.getActualRefundDate());
-        invoiceBillOrderDO.setPayee(commitApplyVO.getPayee());
-        //这里设置财务人员,是因为他们最后是点击提交审核的人员,所以当时候申请人就是获取FinancePerson这个变量。
-        invoiceBillOrderDO.setFinancePerson(loginUserName);
-        OrderFieldLockApplyDO applyDO = initOrderFieldLockApplyDO(invoiceBillOrderDO, userId);
+        List<InvoiceBillOrderDO> invoiceBillOrderDO = invoiceBillOrderDOS.stream().filter(Objects::nonNull).map(invoiceBillOrderDo -> {
+            invoiceBillOrderDo.setActualRefundDate(commitApplyVO.getActualRefundDate());
+            invoiceBillOrderDo.setPayee(commitApplyVO.getPayee());
+            //这里设置财务人员,是因为他们最后是点击提交审核的人员,所以当时候申请人就是获取FinancePerson这个变量。
+            invoiceBillOrderDo.setFinancePerson(loginUserName);
+            invoiceBillOrderDo.setStatus(FinanceEnum.UNPAID_PAYMENTS.getStatus());
+            return invoiceBillOrderDo;
+        }).collect(Collectors.toList());
+       for( InvoiceBillOrderDO invoiceBillOrderDo : invoiceBillOrderDOS){
+           totalPayAmount=totalPayAmount.add(invoiceBillOrderDo.getTotalPayAmount()).setScale(2, RoundingMode.HALF_UP);
+           totalCustomerAmount=totalCustomerAmount.add(invoiceBillOrderDo.getTotalCustomerAmount()).setScale(2, RoundingMode.HALF_UP);
+           deductAmount=deductAmount.add(invoiceBillOrderDo.getDeductAmount()).setScale(2, RoundingMode.HALF_UP);
+           otherAmount=otherAmount.add(invoiceBillOrderDo.getOtherAmount()).setScale(2, RoundingMode.HALF_UP);
+       }
+        InvoiceFieldVO invoiceFieldVO = InvoiceFieldVO.builder().invoiceNo(invoiceBillOrderDOS.get(0).getInvoiceNo())
+                .invoiceId(invoiceBillOrderDOS.stream().filter(Objects::nonNull).map(InvoiceBillOrderDO::getId).collect(Collectors.toList()))
+                .payee(commitApplyVO.getPayee())
+                .innerNo(orderBaseInfoDOList.stream().filter(Objects::nonNull).map(orderBaseInfoDO-> orderBaseInfoDO.getInnerNo()).distinct().collect(Collectors.toList()))
+                .backRefundDate(invoiceBillOrderDOS.get(0).getBackRefundDate())
+                .actualRefundDate(commitApplyVO.getActualRefundDate())
+                .businesPerson(invoiceBillOrderDOS.get(0).getBusinesPerson())
+                .trackerUser(invoiceBillOrderDOS.get(0).getTrackerUser())
+                .financePerson(loginUserName)
+                .totalCustomerAmount(totalCustomerAmount)
+                .deductAmount(deductAmount)
+                .otherAmount(otherAmount)
+                .totalPayAmount(totalPayAmount).build();
+        OrderFieldLockApplyDO applyDO = initOrderFieldLockApplyDO(invoiceFieldVO, userId);
         transactionHelper.run(() -> {
             orderFieldLockApplyService.save(applyDO);
-            invoiceBillOrderDO.setStatus(ApplyStatusEnum.WAIT_AUDIT.getStatus());
-            updateById(invoiceBillOrderDO);
+            updateBatchById(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);
-        }
+    private void checkApply(List<Long> id) {
+        //如果提交审核的个数大于1,就代表一起提交,就需要逐个判断。  不,应该是不管是否大于1都需要判断。因为即使是一个提交审核,你目前提交的这个id说不定是别人的finance里面附带的。
+            //获取全部待审核的数据
+            List<OrderFieldLockApplyDO> applyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .eq(OrderFieldLockApplyDO::getType, ApplyTypeEnum.INVOICE_BILL_APPLY.getType())
+                    .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));;
+            if(CollectionUtils.isNotEmpty(applyDOS)){
+                Set<Long> setApplyIds = applyDOS.stream()
+                        .filter(Objects::nonNull)
+                        .flatMap(applyDO -> {
+                            // 将 orderId 和 finacneId 合并为一个流
+                            Stream<Long> orderIdStream = Stream.of(applyDO.getOrderId());
+                            Stream<Long> financeIdStream = (applyDO.getFinanceId() != null && !applyDO.getFinanceId().isEmpty())
+                                    ? Arrays.stream(applyDO.getFinanceId().split(","))
+                                    .map(Long::valueOf)
+                                    : Stream.empty();
+                            return Stream.concat(orderIdStream, financeIdStream);
+                        })
+                        .collect(Collectors.toSet());
+                if(id.stream().anyMatch(ids -> setApplyIds.contains(ids))){
+                    throw new BusinessException("申请单中包含处于审核的订单,请等审核完成后再申请!");
+                }
+            }
     }
     /**
@@ -930,25 +1218,43 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
     }
     /**
-     * @param invoiceBillOrderDO
+     * @param invoiceFieldvo
      * @param userId
      * @return
      */
-    private OrderFieldLockApplyDO initOrderFieldLockApplyDO(InvoiceBillOrderDO invoiceBillOrderDO, Long userId) {
+    private OrderFieldLockApplyDO initOrderFieldLockApplyDO(InvoiceFieldVO invoiceFieldvo, 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() + Constant.COMMA_CHARACTER + RoleEnum.FINANCE_USER.getCode())
-                .build();
+        lockFieldVO.setInvoiceFieldVO(invoiceFieldvo);
+        List<Long> financeIds = invoiceFieldvo.getInvoiceId().subList(1, invoiceFieldvo.getInvoiceId().size());
+        if (invoiceFieldvo.getInvoiceId().size() > 1) {
+            //单独针对财务多个订单提交审核来创建的。
+            return OrderFieldLockApplyDO.builder()
+                    .applyUserId(userId)
+                    .auditUserId(null)
+                    .fields(JSONObject.toJSONString(lockFieldVO))
+                    .orderId(invoiceFieldvo.getInvoiceId().get(0))
+                    .financeId(null==financeIds || financeIds.isEmpty() ? "" :financeIds.stream().map(String::valueOf).collect(Collectors.joining(",")))
+                    .type(ApplyTypeEnum.INVOICE_BILL_APPLY.getType())
+                    .remark(ApplyTypeEnum.INVOICE_BILL_APPLY.getDesc())
+                    .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                    //这里设置审核角色有财务并不是让财务审核,会对财务屏蔽审核按钮,只是让它能够看到审核的单子
+                    .auditRoleCodes(RoleEnum.ADMIN.getCode() + Constant.COMMA_CHARACTER + RoleEnum.FINANCE_USER.getCode())
+                    .build();
+        } else {
+            return OrderFieldLockApplyDO.builder()
+                    .applyUserId(userId)
+                    .auditUserId(null)
+                    .fields(JSONObject.toJSONString(lockFieldVO))
+                    //这个orderId设置应该怎么设置呢？  先这样写吧。取集合中的第一个作为orderId。  目前没有相当好的办法!  后续是创建一个集合finance附加属性,用来存储其他的所有的id。到时候取出来,与orderid放在一起设置状态,这样就能保证每一状态都被设置。
+                    .orderId(invoiceFieldvo.getInvoiceId().get(0))
+                    .type(ApplyTypeEnum.INVOICE_BILL_APPLY.getType())
+                    .remark(ApplyTypeEnum.INVOICE_BILL_APPLY.getDesc())
+                    .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                    //这里设置审核角色有财务并不是让财务审核,会对财务屏蔽审核按钮,只是让它能够看到审核的单子
+                    .auditRoleCodes(RoleEnum.ADMIN.getCode() + Constant.COMMA_CHARACTER + RoleEnum.FINANCE_USER.getCode())
+                    .build();
+        }
     }
-
     /**
      * 通过主键删除数据
      *
@@ -957,7 +1263,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
      */
     @Override
     public ServerResult deleteById(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
-        //其实是不能批量删除的,前端是一个一个删除按钮点击的,但是这里还是使用数组接受的。这里是传的一个id。
+        //删除前端要判断一下,要是勾选多条,这个invoice是否一致。一致才能删除。
         List<Long> ids = invoiceBillOrderQueryVO.getIds();
         if (CollUtil.isEmpty(ids)) {
             return ServerResult.fail("ids 参数不能为空");
@@ -966,17 +1272,33 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         if (CollUtil.isEmpty(invoiceBillOrderList)) {
             return ServerResult.success();
         }
-        checkApplyByIds(ids, dataScope.getLoginUserId());
-        invoiceBillOrderList.stream().forEach(invoiceBillOrderDO -> {
-            if(Constant.ENABLE_TEN==invoiceBillOrderDO.getStatus()){
-                throw new BusinessException("该订单已通过审核,无法删除!");
-            }
-        });
+        boolean isTure = invoiceBillOrderList.stream().allMatch(invoiceBillOrderDO -> invoiceBillOrderDO.getInvoiceNo().equals(invoiceBillOrderList.get(0).getInvoiceNo()));
+        if(!isTure){
+            throw  new BusinessException("勾选订单的invoice需一致");
+        }
+
+        //有一个审核通过不能删除。之所以这样做,是因为避免忘记其他订单创建invoice,然后遗落了,所以需要删掉重新创建,避免每一个都提交审核并且审核后通过了了。
+        boolean anyPaid = invoiceBillOrderList.stream().filter(Objects::nonNull)
+                .anyMatch(invoiceBillOrderDO -> FinanceEnum.RECEIVED_PAYMENT.getStatus()== invoiceBillOrderDO.getStatus());
+        if (anyPaid) {
+            throw new BusinessException("包含已收款的订单,无法删除!");
+        }
+        //todo  还需要检查一下是否处于审核状态,处于审核状态就无法删除！ 完成3
+        checkApply(ids);
+        List<Long> orderIds = invoiceBillOrderList.stream()
+                .map(InvoiceBillOrderDO::getOrderId)
+                .collect(Collectors.toList());
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
+        List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoDOList.stream().map(order -> {
+            //这里要删除对应invoiceNo号,但是为了删除后产生空指针异常,所以定义为"N/N";
+            order.setInvoiceNo("N/N");
+            return order;
+        }).collect(Collectors.toList());
         transactionHelper.run(() -> {
             removeByIds(ids);
-            invoiceBillMappingService.remove(new LambdaQueryWrapper<InvoiceBillMappingDO>().in(InvoiceBillMappingDO::getInvoiceBillId, ids));
+            //删除关联的order。
+            orderBaseInfoService.updateBatchById(orderBaseInfoDOS);
         });
-
         return ServerResult.success();
     }
@@ -1021,9 +1343,15 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         if(StringUtils.isBlank(bgUrl.getBgUrl())){
             return  ServerResult.fail("上传报关单不能为空");
         }
-        //重新上传报关单
-        invoiceBillOrderDO.setBgUrl(bgUrl.getBgUrl());
-        updateById(invoiceBillOrderDO);
+        //对于invoice来说,相同的invoiceNo,设置其中一个,那么其他几个也要被改变。
+        List<InvoiceBillOrderDO>  invoiceBillOrderDOS = list(new LambdaQueryWrapper<InvoiceBillOrderDO>().eq(InvoiceBillOrderDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(InvoiceBillOrderDO::getInvoiceNo, invoiceBillOrderDO.getInvoiceNo()));
+        List<InvoiceBillOrderDO> invoiceBillOrderDOList= invoiceBillOrderDOS.stream().map(invoiceBillOrder -> {
+            //重新上传报关单
+            invoiceBillOrder.setBgUrl(bgUrl.getBgUrl());
+            return invoiceBillOrder;
+        }).collect(Collectors.toList());
+        updateBatchById(invoiceBillOrderDOList);
         return ServerResult.success();
     }
@@ -1102,7 +1430,33 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         if(Objects.isNull(invoiceBillOrderDO)){
             throw new BusinessException("应收款单不存在！");
         }
-        invoiceBillOrderDO.setBackRefundDate(createVO.getBackRefundDate());
+        List<InvoiceBillOrderDO> invoiceBillOrderDOList = list(new LambdaQueryWrapper<InvoiceBillOrderDO>().eq(InvoiceBillOrderDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(InvoiceBillOrderDO::getInvoiceNo, invoiceBillOrderDO.getInvoiceNo()));
+        boolean anyPaid= invoiceBillOrderDOList.stream().filter(Objects::nonNull).anyMatch(invoiceBillOrder -> FinanceEnum.RECEIVED_PAYMENT.getStatus() == invoiceBillOrder.getStatus());
+        if(anyPaid){
+            throw new BusinessException("相同invoiceNo的订单已收款完成,无法设置!");
+        }
+        //todo 要审核判断一下,是否处于审核状态。 完成4
+        checkApply(invoiceBillOrderDOList.stream().filter(Objects::nonNull).map(invoiceDO -> invoiceDO.getId()).collect(Collectors.toList()));
+        List<InvoiceBillOrderDO> invoiceBillOrderDOS = invoiceBillOrderDOList.stream().filter(Objects::nonNull).map(invoiceBillOrder -> {
+            invoiceBillOrder.setBackRefundDate(createVO.getBackRefundDate());
+            return invoiceBillOrder;
+        }).collect(Collectors.toList());
+        updateBatchById(invoiceBillOrderDOS);
+        return ServerResult.success();
+    }
+
+    @Override
+    public ServerResult byIdAddNotes(InvoiceBillCreateVO createVO) {
+        if(Objects.isNull(createVO.getId())){
+            return  ServerResult.fail();
+        }
+        InvoiceBillOrderDO invoiceBillOrderDO = getById(createVO.getId());
+        if(Objects.isNull(invoiceBillOrderDO)){
+            throw new BusinessException("应收款单不存在！");
+        }
+        //备注信息,审核完应该也能修改。
+        invoiceBillOrderDO.setNotes(createVO.getNotes());
         updateById(invoiceBillOrderDO);
         return ServerResult.success();
     }
@@ -142,10 +142,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Resource
     private AdminUserRoleService adminUserRoleService;
     @Resource
-    private InvoiceBillMappingService invoiceBillMappingService;
+    private InvoiceBillOrderService invoiceBillOrderService;
     @Resource
-    private CheckBillMappingService checkBillMappingService;
+    private  ProducePaymentCheckBillOrderService producePaymentCheckBillOrderService;
+
     /**
@@ -231,7 +232,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             // 填充发票信息
             fillInvoiceNo(resultVOList);
-
+            //第四版  start
+/*            //需要填充生产科对账单号信息
+            fillCheckNo(resultVOList);
+            end
+            */
             if (locked) {
                 // 填充字段锁定信息
@@ -881,20 +886,48 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         Set<Long> orderIds = orderInfoResultVOList.stream().map(OrderInfoResultVO::getId).collect(Collectors.toSet());
-        List<InvoiceBillMappingDO> invoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
+      /*  List<InvoiceBillMappingDO> invoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .in(InvoiceBillMappingDO::getOrderId, orderIds));
-        if (CollectionUtils.isEmpty(invoiceBillMappingDOS)) {
+                .in(InvoiceBillMappingDO::getOrderId, orderIds));*/
+        List<InvoiceBillOrderDO> invoiceBillOrderDOList = invoiceBillOrderService.list(new LambdaQueryWrapper<InvoiceBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(InvoiceBillOrderDO::getOrderId, orderIds));
+
+        if (CollectionUtils.isEmpty(invoiceBillOrderDOList)) {
             return;
         }
-        Map<Long, InvoiceBillMappingDO> invoiceBillMappingDOMap = invoiceBillMappingDOS.stream().collect(Collectors.toMap(InvoiceBillMappingDO::getOrderId, Function.identity(), (v1, v2) -> v1));
+        Map<Long, InvoiceBillOrderDO> invoiceBillMappingDOMap = invoiceBillOrderDOList.stream().collect(Collectors.toMap(InvoiceBillOrderDO::getOrderId, Function.identity(), (v1, v2) -> v1));
         orderInfoResultVOList.forEach(result -> {
             if (invoiceBillMappingDOMap.containsKey(result.getId())) {
-                InvoiceBillMappingDO invoiceBillMappingDO = invoiceBillMappingDOMap.get(result.getId());
+                InvoiceBillOrderDO invoiceBillMappingDO = invoiceBillMappingDOMap.get(result.getId());
                 result.setInvoiceNo(invoiceBillMappingDO.getInvoiceNo());
             }
         });
     }
+//第四版  start
+/*
+    private void fillCheckNo(List<OrderInfoResultVO> orderInfoResultVOList) {
+        if (CollectionUtils.isEmpty(orderInfoResultVOList)) {
+            return;
+        }
+
+        Set<Long> orderIds = orderInfoResultVOList.stream().map(OrderInfoResultVO::getId).collect(Collectors.toSet());
+        List<CheckBillMappingDO> checkBillMappingDOSDOS = checkBillMappingService.list(new LambdaQueryWrapper<CheckBillMappingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(CheckBillMappingDO::getOrderId, orderIds));
+        if (CollectionUtils.isEmpty(checkBillMappingDOSDOS)) {
+            return;
+        }
+        Map<Long, CheckBillMappingDO> checkBillMappingDOMap = checkBillMappingDOSDOS.stream().collect(Collectors.toMap(CheckBillMappingDO::getOrderId, Function.identity(), (v1, v2) -> v1));
+        orderInfoResultVOList.forEach(result -> {
+            if (checkBillMappingDOMap.containsKey(result.getId())) {
+                CheckBillMappingDO checkBillMappingDO = checkBillMappingDOMap.get(result.getId());
+                result.setCheckNo(checkBillMappingDO.getCheckNo());
+            }
+        });
+    }
+end
+*/
+
     /**
      * @param orderInfoResultVOList
@@ -1167,9 +1200,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if (StringUtils.isBlank(resultVO.getCnColor())) {
             return false;
         }
-        if (StringUtils.isBlank(resultVO.getPicUrl())) {
-            return false;
-        }
         if (StringUtils.isBlank(resultVO.getProductionComment())) {
             return false;
         }
@@ -1468,6 +1498,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 .ge(StringUtils.isNotBlank(queryVO.getOrderHodStartTime()), OrderBaseInfoDO::getOrderHodTime, queryVO.getOrderHodStartTime())
                 .le(StringUtils.isNotBlank(queryVO.getOrderHodEndTime()), OrderBaseInfoDO::getOrderHodTime, queryVO.getOrderHodEndTime())
                 .in(CollectionUtils.isNotEmpty(queryVO.getOrderIds()), OrderBaseInfoDO::getId, queryVO.getOrderIds())
+                .in(CollectionUtils.isNotEmpty(queryVO.getInvoiceNo()),OrderBaseInfoDO::getInvoiceNo,queryVO.getInvoiceNo())
+                .in(CollectionUtils.isNotEmpty(queryVO.getCheckNo()),OrderBaseInfoDO::getCheckNo,queryVO.getCheckNo())
                 .orderByDesc(OrderBaseInfoDO::getId)
                 ;
     }
@@ -1972,7 +2004,17 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     inspectionStageDO.setBoxPacket(inspectionStageInfo.getBoxPacket());
                 }
                 inspectionStageDO.setOrderId(updateVO.getOrderId());
+               /* //第四版首页展示,这里判断这个订单的跟单信息是否处于跟单中的状态。如果是的话就那就不给这个订单设置质检中,避免首页计算数据时重复计算。随便设置一个状态。
+                OrderTrackStageDO orderTrackStageDO = trackStageService.getById(updateVO.getOrderId());
+                if(Objects.nonNull(orderTrackStageDO) && Objects.nonNull(orderTrackStageDO.getOrderStatus())
+                        && OrderStatusEnum.TRACK_ING.equals(orderTrackStageDO.getOrderStatus()) ){
+                    inspectionStageDO.setOrderStatus(OrderStatusEnum.TRACK_PASS.getStatus());
+                }else{
+                inspectionStageDO.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus());
+                }*/
+                //第四版时下面这句需要删掉。
                 inspectionStageDO.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus());
+
                 inspectionStageService.updateById(inspectionStageDO);
                 OrderBaseInfoDO orderBaseInfoDO = baseInfoService.getById(updateVO.getOrderId());
                 AdminUserDO ProductionDepartmentUserDO = userService.getOne(new LambdaQueryWrapper<AdminUserDO>()
@@ -1985,7 +2027,17 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 inspectionStageDO = new OrderInspectionStageDO();
                 BeanUtils.copyProperties(updateVO.getInspectionStageInfo(), inspectionStageDO);
                 inspectionStageDO.setOrderId(updateVO.getOrderId());
+                 /* //第四版首页展示,这里判断这个订单的跟单信息是否处于跟单中的状态。如果是的话就那就不给这个订单设置质检中,避免首页计算数据时重复计算。随便设置一个状态。 start
+                OrderTrackStageDO orderTrackStageDO = trackStageService.getById(updateVO.getOrderId());
+                if(Objects.nonNull(orderTrackStageDO) && Objects.nonNull(orderTrackStageDO.getOrderStatus())
+                        && OrderStatusEnum.TRACK_ING.equals(orderTrackStageDO.getOrderStatus()) ){
+                    inspectionStageDO.setOrderStatus(OrderStatusEnum.TRACK_PASS.getStatus());
+                }else{
+                inspectionStageDO.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus());
+                }*/
+                //第四版时下面这句需要删掉。
                 inspectionStageDO.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus());
+//end
                 inspectionStageService.save(inspectionStageDO);
                 OrderBaseInfoDO orderBaseInfoDO = baseInfoService.getById(updateVO.getOrderId());
                 AdminUserDO ProductionDepartmentUserDO = userService.getOne(new LambdaQueryWrapper<AdminUserDO>()
@@ -2143,15 +2195,18 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             return ServerResult.success();
         }
         //判断是否存在invoice和订单应付款。
-        List<InvoiceBillMappingDO> InvoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
+       /* List<InvoiceBillMappingDO> InvoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(InvoiceBillMappingDO::getOrderId, ids));*/
+        List<InvoiceBillOrderDO> InvoiceBillMappingDOS = invoiceBillOrderService.list(new LambdaQueryWrapper<InvoiceBillOrderDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .in(InvoiceBillMappingDO::getOrderId, ids));
+                .in(InvoiceBillOrderDO::getOrderId, ids));
         if(CollectionUtils.isNotEmpty(InvoiceBillMappingDOS)){
             throw new BusinessException("该订单已绑定Invoice账单,请先删除对应的Invoice账单！");
         }
-        List<CheckBillMappingDO> checkBillMappingDOList = checkBillMappingService.list(new LambdaQueryWrapper<CheckBillMappingDO>()
+        List<ProducePaymentCheckBillOrderDO> checkBillMappingDOList = producePaymentCheckBillOrderService.list(new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .in(CheckBillMappingDO::getOrderId, ids));
+                .in(ProducePaymentCheckBillOrderDO::getOrderId, ids));
         if(CollectionUtils.isNotEmpty(checkBillMappingDOList)){
             throw new BusinessException("该订单已绑定生产科对账单号,请先删除对应的生产科对账单！");
         }
@@ -16,10 +16,7 @@ import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.common.utils.OrderFieldUtils;
 import com.order.erp.config.DataScope;
-import com.order.erp.domain.ApplyStatusEnum;
-import com.order.erp.domain.ApplyTypeEnum;
-import com.order.erp.domain.OrderStatusEnum;
-import com.order.erp.domain.RoleEnum;
+import com.order.erp.domain.*;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.order.*;
 import com.order.erp.domain.vo.order.*;
@@ -143,12 +140,14 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                     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>()
+                      /*  if(Objects.nonNull(orderLockFieldVO.getInvoiceFieldVO()) && StringUtils.isNotBlank(orderLockFieldVO.getInvoiceFieldVO().getInvoiceNo())){
+                        *//*    List<InvoiceBillMappingDO> invoiceBillMappingDOList= invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
                                     .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                                    .eq(InvoiceBillMappingDO::getInvoiceNo, orderLockFieldVO.getInvoiceBillOrderDO().getInvoiceNo()));
+                                    .eq(InvoiceBillMappingDO::getInvoiceNo, orderLockFieldVO.getInvoiceBillOrderDO().getInvoiceNo()));*//*
+                            List<InvoiceBillOrderDO> invoiceBillMappingDOList = invoiceBillOrderService.list(new LambdaQueryWrapper<InvoiceBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                                    .eq(InvoiceBillOrderDO::getInvoiceNo, orderLockFieldVO.getInvoiceFieldVO().getInvoiceNo()));
                             if(CollectionUtils.isNotEmpty(invoiceBillMappingDOList)){
-                                Set<Long> orderIds = invoiceBillMappingDOList.stream().map(InvoiceBillMappingDO::getOrderId).filter(Objects::nonNull).collect(Collectors.toSet());
+                                Set<Long> orderIds = invoiceBillMappingDOList.stream().map(InvoiceBillOrderDO::getOrderId).filter(Objects::nonNull).collect(Collectors.toSet());
                                 if(CollectionUtils.isNotEmpty(orderIds)){
                                     List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
                                     if(CollectionUtils.isNotEmpty(orderBaseInfoDOList)){
@@ -161,14 +160,14 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                                     }
                                 }
                             }
-                        } //这里结束  上述为待审核列表中应收款要显示内部编码。
+                        }*/ //这里结束  上述为待审核列表中应收款要显示内部编码。     这部分不需要了,内部编码放在里面了。
                         //这部分的目的是,对于跟单员和业务员他们也能查看到应收款和应付款中各自负责订单的审核情况。 而财务和admin则会执行else{},会看到所有的审核订单信息。
                         if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())){
-                            if(Objects.nonNull(orderLockFieldVO.getInvoiceBillOrderDO()) && orderLockFieldVO.getInvoiceBillOrderDO().getBusinesPerson().equals(loginUserName)){
+                            if(Objects.nonNull(orderLockFieldVO.getInvoiceFieldVO()) && orderLockFieldVO.getInvoiceFieldVO().getBusinesPerson().equals(loginUserName)){
                                 resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                             }
                         } else if (RoleEnum.TRACKER_USER.getCode().equals(roleEnum.getCode())) {
-                            if(Objects.nonNull(orderLockFieldVO.getInvoiceBillOrderDO()) && orderLockFieldVO.getInvoiceBillOrderDO().getTrackerUser().equals(loginUserName)){
+                            if(Objects.nonNull(orderLockFieldVO.getInvoiceFieldVO()) && orderLockFieldVO.getInvoiceFieldVO().getTrackerUser().equals(loginUserName)){
                                 resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                             }
                         } else{
@@ -181,7 +180,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                     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())){
+                       /* 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()));
@@ -199,7 +198,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                                     }
                                 }
                             }
-                        }//这里结束  上述为待审核列表中应收款要显示内部编码。
+                        }//这里结束  上述为待审核列表中应收款要显示内部编码。*/   //这部分不需要了。
                         //这部分的目的是,对于跟单员和业务员他们也能查看到应收款和应付款中各自负责订单的审核情况。 而财务和admin则会执行else{},会看到所有的审核订单信息。
                         if(RoleEnum.BUSINESS_USER.getCode().equals(roleEnum.getCode())){
                             if(Objects.nonNull(orderLockFieldVO.getCheckBillOrderDO()) && orderLockFieldVO.getCheckBillOrderDO().getBusinesPerson().equals(loginUserName)){
@@ -437,19 +436,40 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 int firstTwoDigits = queryVO.getType() / 100;
                 int lastTwoDigits = queryVO.getType() % 100;
                 queryWrapper.in(OrderFieldLockApplyDO::getType,firstTwoDigits,lastTwoDigits);
+                if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){
+                    String innerNoList = queryVO.getInnerNo().stream()
+                            .map(innerNo -> "'" + innerNo + "'") // 包装为单引号
+                            .collect(Collectors.joining(","));
+                    queryWrapper.apply(
+                            "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceFieldVO.innerNo')) in (" + innerNoList + ")"
+                    );
+                }
             }else{
+                if(Objects.nonNull(queryVO.getType()) && queryVO.getType().equals(ApplyTypeEnum.CHECK_BILL_APPLY.getType())){
+                    queryWrapper.eq(Objects.nonNull(queryVO.getType()), OrderFieldLockApplyDO::getType, queryVO.getType());
+                    //这个内部编号单独针对于应付款申请设置的。
+                    if(CollectionUtils.isNotEmpty(queryVO.getInnerNo())){
+                        String innerNoList = queryVO.getInnerNo().stream()
+                                .map(innerNo -> "'" + innerNo + "'") // 包装为单引号
+                                .collect(Collectors.joining(","));
+                        queryWrapper.apply(
+                                "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.innerNo')) in (" + innerNoList + ")"
+                        );
+                    }
+                }
                 queryWrapper.eq(Objects.nonNull(queryVO.getType()), OrderFieldLockApplyDO::getType, queryVO.getType());
             }
         }
         // 已测试,没问题。用途:在应收款和应付款中,通过输入invoiceNo和checkNo进行筛选查询。  变量名为invoice和checkNo。
- /*       if (StringUtils.isNotBlank(queryVO.getInvoiceNo())) {
+        if (StringUtils.isNotBlank(queryVO.getInvoiceNo())) {
             // 获取并修整 invoiceNo 字符串
             String invoiceNos = queryVO.getInvoiceNo().trim();
             // 检查处理后的字符串是否仍然有效
             if (!invoiceNos.isEmpty()) {
                 // 使用参数化查询避免 SQL 拼接问题
                 queryWrapper.apply(
-                        "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceBillOrderDO.invoiceNo')) = {0}",
+//                        "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceBillOrderDO.invoiceNo')) = {0}",
+                         "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.invoiceFieldVO.invoiceNo')) = {0}",
                         invoiceNos
                 );
             }
@@ -463,11 +483,12 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             if (!checkNos.isEmpty()) {
                 // 使用参数化查询避免 SQL 拼接问题
                 queryWrapper.apply(
-                        "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.checkBillOrderDO.checkNo')) = {0}",
+//                        "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.checkBillOrderDO.checkNo')) = {0}",
+                          "JSON_UNQUOTE(JSON_EXTRACT(fields, '$.producePaymentCheckBillFieldVO.checkNo')) = {0}",
                         checkNos
                 );
             }
-        }*/
+        }
         //由于不懂下面的代码,所以我只对我需要的需求进行判断,我只针对我需要的这种情况,其他情况下就不走这种情况。
         if(RoleEnum.TRACKER_USER.getCode().equals(roleEnum.getCode()) && (queryVO.getType()==Constant.THIRTY || queryVO.getType()==4050)){
@@ -553,14 +574,28 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             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);
+            InvoiceFieldVO invoiceBillOrderDO = lockFieldVO.getInvoiceFieldVO();
+            List<InvoiceBillOrderDO> invoiceBillOrderDOList = invoiceBillOrderService.listByIds(invoiceBillOrderDO.getInvoiceId());
+            if(CollectionUtils.isNotEmpty(invoiceBillOrderDOList)){
+                List<InvoiceBillOrderDO> invoiceBillOrderDOS = invoiceBillOrderDOList.stream().filter(Objects::nonNull).map(x -> {
+                    x.setStatus(FinanceEnum.UNPAID_PAYMENTS.getStatus());
+                    return x;
+                }).collect(Collectors.toList());
+                invoiceBillOrderService.updateBatchById(invoiceBillOrderDOS);
+            }
         } 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);
+            ProducePaymentCheckBillFieldVO checkBillOrderDO = lockFieldVO.getProducePaymentCheckBillFieldVO();
+            List<Long> producePaymentCheckBillId = checkBillOrderDO.getProducePaymentCheckBillId();
+            List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOList = checkBillOrderService.listByIds(producePaymentCheckBillId);
+            if(CollectionUtils.isNotEmpty(producePaymentCheckBillOrderDOList)){
+                List<ProducePaymentCheckBillOrderDO>  producePaymentCheckBillOrderDOS= producePaymentCheckBillOrderDOList.stream().filter(Objects::nonNull).map(x -> {
+                    x.setStatus(FinanceEnum.UNPAID_PAYMENTS.getStatus());
+                    return x;
+                }).collect(Collectors.toList());
+                checkBillOrderService.updateBatchById(producePaymentCheckBillOrderDOS);
+            }
+
         } else if(ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())){
             OrderLockFieldVO lockFieldVO = JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
             ProducePaymentCheckBillOrderDO checkBillOrderDO = lockFieldVO.getCheckBillOrderDO();
@@ -709,16 +744,30 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             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);
+            InvoiceFieldVO invoiceBillOrderDO = lockFieldVO.getInvoiceFieldVO();
+            List<Long> invoiceId = invoiceBillOrderDO.getInvoiceId();
+            List<InvoiceBillOrderDO> invoiceBillOrderDOS = invoiceBillOrderService.listByIds(invoiceId);
+            if(CollectionUtils.isNotEmpty(invoiceBillOrderDOS)){
+                List<InvoiceBillOrderDO> invoiceeBillOrderDOs = invoiceBillOrderDOS.stream().filter(Objects::nonNull).map(x -> {
+                    x.setStatus(FinanceEnum.RECEIVED_PAYMENT.getStatus());
+                    return x;
+                }).collect(Collectors.toList());
+                invoiceBillOrderService.updateBatchById(invoiceeBillOrderDOs);
+            }
         } 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);
+            ProducePaymentCheckBillFieldVO checkBillOrderDO = lockFieldVO.getProducePaymentCheckBillFieldVO();
+            List<Long> producePaymentCheckBillId = checkBillOrderDO.getProducePaymentCheckBillId();
+            List<ProducePaymentCheckBillOrderDO> checkBillOrderDOS = checkBillOrderService.listByIds(producePaymentCheckBillId);
+            if(CollectionUtils.isNotEmpty(checkBillOrderDOS)){
+                List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOS = checkBillOrderDOS.stream().filter(Objects::nonNull).map(x -> {
+                    x.setStatus(FinanceEnum.RECEIVED_PAYMENT.getStatus());
+                    return x;
+                }).collect(Collectors.toList());
+                checkBillOrderService.updateBatchById(producePaymentCheckBillOrderDOS);
+            }
         }  else if (ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType().equals(applyDO.getType())) {
             applyDO.setAuditUserId(auditUserId);
             applyDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
@@ -20,6 +20,7 @@ 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.FinanceEnum;
 import com.order.erp.domain.RoleEnum;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.SystemSettingDO;
@@ -46,6 +47,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 /**
  * 生产科对账单应收账单(ProducePaymentCheckBillOrder)表服务实现类
@@ -107,13 +109,15 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
     @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()));
+//        List<CheckBillMappingDO> mappingDOS = checkBillMappingService.list(new LambdaQueryWrapper<CheckBillMappingDO>()
+//                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+//                .eq(CheckBillMappingDO::getCheckNo, queryVO.getCheckNo()));
+        List<ProducePaymentCheckBillOrderDO> mappingDOS =list(new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(ProducePaymentCheckBillOrderDO::getCheckNo, queryVO.getCheckNo()));
         if (CollectionUtils.isEmpty(mappingDOS)) {
             return ServerResult.success();
         }
-        Set<Long> orderIds = mappingDOS.stream().map(CheckBillMappingDO::getOrderId).collect(Collectors.toSet());
+        Set<Long> orderIds = mappingDOS.stream().map(ProducePaymentCheckBillOrderDO::getOrderId).collect(Collectors.toSet());
         List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
         List<OrderProfitAnalysisDO> profitAnalysisDOList = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
@@ -160,12 +164,13 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         if (CollectionUtils.isEmpty(checkBillOrderDOS)) {
             return null;
         }
-        Set<Long> ids = checkBillOrderDOS.stream().map(ProducePaymentCheckBillOrderDO::getId).collect(Collectors.toSet());
+       /* 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));
+        }*/
+            Map<Long, ProducePaymentCheckBillOrderDO> orderBillMap = checkBillOrderDOS.stream().collect(Collectors.toMap(ProducePaymentCheckBillOrderDO::getOrderId, Function.identity(), (x, y) -> x));
+//            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));
@@ -296,7 +301,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
      * @param mappingDOMap
      * @return
      */
-    private List<CheckOrderBaseItemVO> getCheckOrderBaseItems(Map<Long, CheckBillMappingDO> mappingDOMap) {
+    private List<CheckOrderBaseItemVO> getCheckOrderBaseItems(Map<Long, ProducePaymentCheckBillOrderDO> 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));
@@ -318,7 +323,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
             }
             if (mappingDOMap.containsKey(orderId)) {
-                CheckBillMappingDO mappingDO = mappingDOMap.get(orderId);
+                ProducePaymentCheckBillOrderDO mappingDO = mappingDOMap.get(orderId);
                 itemVO.setCheckNo(mappingDO.getCheckNo());
             }
             baseItemVOS.add(itemVO);
@@ -449,10 +454,10 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
     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(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())
+                .le(StringUtils.isNotBlank(queryVO.getEndTime()), ProducePaymentCheckBillOrderDO::getCreateTime, queryVO.getEndTime())*/
                 .orderByDesc(ProducePaymentCheckBillOrderDO::getId);
         if (CollectionUtils.isNotEmpty(queryVO.getIds())) {
             queryWrapper.in(ProducePaymentCheckBillOrderDO::getId, queryVO.getIds());
@@ -472,14 +477,16 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         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));
+//        List<CheckBillMappingDO> mappingDOS = checkBillMappingService.list(new LambdaQueryWrapper<CheckBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+//                .in(CollectionUtils.isNotEmpty(orderIds), CheckBillMappingDO::getOrderId, orderIds));
+        List<ProducePaymentCheckBillOrderDO> mappingDOS = list(new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(CollectionUtils.isNotEmpty(orderIds), ProducePaymentCheckBillOrderDO::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());
+        return mappingDOS.stream().map(ProducePaymentCheckBillOrderDO::getId).collect(Collectors.toSet());
     }
     /**
@@ -535,54 +542,52 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         }
         List<OrderBaseInfoDO> orderBaseInfoDOList = validaBillOrder(createVO);
-        ProducePaymentCheckBillOrderDO checkBillOrderDO = buildCheckBillOrderDO(createVO);
+        List<ProducePaymentCheckBillOrderDO> checkBillOrderDOList = buildCheckBillOrderDO(createVO,orderBaseInfoDOList);
         List<OrderBaseInfoDO> containCheckOrderBaseInfoList = orderBaseInfoDOList.stream().map(x -> {
             x.setCheckNo(createVO.getCheckNo());
             return x;
         }).collect(Collectors.toList());
         Boolean success = transactionHelper.run(() -> {
-            save(checkBillOrderDO);
+            saveBatch(checkBillOrderDOList);
             orderBaseInfoService.updateBatchById(containCheckOrderBaseInfoList);
-            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());
+        Map<Long, OrderProfitAnalysisDO> orderProfitAnalysisMap;
+        //提前获取金额数据,避免后续多次查询。
+        List<OrderProfitAnalysisDO> orderProfitAnalysisList = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderProfitAnalysisDO::getOrderId, createVO.getOrderIds()));
+        if(CollectionUtils.isNotEmpty(orderProfitAnalysisList)){
+            orderProfitAnalysisMap = orderProfitAnalysisList.stream().collect(Collectors.toMap(
+                    OrderProfitAnalysisDO::getOrderId,  // key：使用 orderId 作为键
+                    Function.identity(),                // value：使用对象本身作为值
+                    (existing, replacement) -> existing // 冲突时保留已有的值
+            ));
+        } else {
+            orderProfitAnalysisMap = null;
+        }
+        if(success) {
+            List<ProducePaymentCheckBillOrderDO> checkBillOrderDOS = checkBillOrderDOList.stream().filter(Objects::nonNull).map(checkNo -> {
+                if (orderProfitAnalysisMap != null) {
+                    if (orderProfitAnalysisMap.containsKey(checkNo.getOrderId())) {
+                        OrderProfitAnalysisDO orderProfitAnalysisDO = orderProfitAnalysisMap.get(checkNo.getOrderId());
+                        checkNo.setTotalProductionAmount(
+                                BigDecimal.valueOf(Optional.ofNullable(orderProfitAnalysisDO.getProductionDepartmentTotalPrice()).orElse(0.0))
+                                        .setScale(2, RoundingMode.HALF_UP)
+                        );
+                        checkNo.setActualPayedAmount(checkNo.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);
+                //设置实际付款金额汇总,避免没有填写直接审核时没有数据。
+                checkNo.setTotalActualPayedAmount(BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
+                //设置生产科扣款金额汇总,避免没有填写扣款金额时,到时候审核没有数据。
+                checkNo.setDeductAmount(BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
+                //设置未付金额
+                checkNo.setUnPayedAmount(checkNo.getTotalProductionAmount().subtract(checkNo.getTotalActualPayedAmount()).subtract(checkNo.getDeductAmount()).setScale(2, BigDecimal.ROUND_HALF_UP));
+                return checkNo;
+            }).collect(Collectors.toList());
+            updateBatchById(checkBillOrderDOS);
         }
         return ServerResult.success();
     }
@@ -682,16 +687,18 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
      * @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())
-                .trackerUser(orderBaseInfoDOList.get(0).getCreateBy())
-                .build();
+    private List<ProducePaymentCheckBillOrderDO> buildCheckBillOrderDO(ProducePaymentCheckBillCreateVO createVO,List<OrderBaseInfoDO> orderBaseInfoDOList) {
+        return orderBaseInfoDOList.stream().map(x->{
+            return ProducePaymentCheckBillOrderDO.builder()
+                    .checkNo(createVO.getCheckNo())
+                    .orderId(x.getId())
+                    .payedDate(createVO.getPayedDate())
+                    .status(FinanceEnum.UNPAID_PAYMENTS.getStatus())
+                    .productionName(x.getProductionDepartment())
+                    .businesPerson(x.getBusinessPerson())
+                    .trackerUser(x.getCreateBy())
+                    .build();
+        }).collect(Collectors.toList());
     }
     /**
@@ -736,16 +743,14 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
             throw new BusinessException("订单中包含利润未审批的订单,无法创建！");
         }
-        String checkNo = createVO.getCheckNo();
-
         List<ProducePaymentCheckBillOrderDO> checkBillOrderDOS = list(new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(ProducePaymentCheckBillOrderDO::getCheckNo, checkNo));
+                .eq(ProducePaymentCheckBillOrderDO::getCheckNo, createVO.getCheckNo()));
         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()));
+        List<ProducePaymentCheckBillOrderDO> checkBillMappingDOS = list(new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(ProducePaymentCheckBillOrderDO::getOrderId, createVO.getOrderIds()));
         if (CollectionUtils.isNotEmpty(checkBillMappingDOS)) {
             throw new BusinessException("该勾选的订单已经绑定其他账单了！");
         }
@@ -775,11 +780,11 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         if (Objects.isNull(checkBillOrderDO)) {
             throw new BusinessException("应付款单据不存在");
         }
-        if(Objects.nonNull(checkBillOrderDO.getStatus()) && Constant.ENABLE_TEN==checkBillOrderDO.getStatus()){
+        if(Objects.nonNull(checkBillOrderDO.getStatus()) && FinanceEnum.RECEIVED_PAYMENT.getStatus()==checkBillOrderDO.getStatus()){
             throw new BusinessException("应付款单据已审核通过,无法编辑");
         }
-
-        checkCommitApply(checkBillOrderDO.getId());
+        //todo  已完成。
+        checkApply(new ArrayList<>(Arrays.asList(deductInfoVO.getId())));
         //需要判断一下是否为空?不然知己以逗号分隔会报错。
         if(StringUtils.isNotBlank(checkBillOrderDO.getDeductUrl())){
 //记住:需要修改数据表对应的字段deduct_url的varchar数据范围,修改为1000左右。
@@ -821,8 +826,11 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         if (Objects.isNull(checkBillOrderDO)) {
             throw new BusinessException("应付款单据不存在");
         }
-
-        checkCommitApply(checkBillOrderDO.getId());
+        if(Objects.nonNull(checkBillOrderDO.getStatus()) && FinanceEnum.RECEIVED_PAYMENT.getStatus()==checkBillOrderDO.getStatus()){
+               throw new BusinessException("已完成收款,无法更新!");
+        }
+        //todo  已完成。
+        checkApply(new ArrayList<>(Arrays.asList(amountInfoVO.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));
@@ -845,16 +853,16 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         if(Objects.isNull(checkBillOrderDO)){
             return ServerResult.fail("生产科对账单号不存在！");
         }
-        if(Constant.ENABLE_TEN==checkBillOrderDO.getStatus()){
+        if(FinanceEnum.RECEIVED_PAYMENT.getStatus()==checkBillOrderDO.getStatus()){
             throw new BusinessException("该订单已通过审核无法继续上传发票!");
         }
         if(StringUtils.isBlank(invoiceInfoVO.getInvoiceUrl())){
             return ServerResult.success();
         }
         //校验是否有处于待审核的发票。
-        checkApply(id,loginUserId,ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType());
-        //校验是否有处于待审核的订单。
-        checkCommitApply(checkBillOrderDO.getId());
+        checkCommitApply(id);
+        //校验是否有处于待审核的订单。 todo
+        checkApply(new ArrayList<>(Arrays.asList(id)));
         OrderLockFieldVO locakFieldVO = new OrderLockFieldVO();
         //事务:待审核,设置为admin和财务才有权限审批。
@@ -882,62 +890,135 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
     @Override
     public ServerResult commitApply(ProducePaymentCheckBillCommitApplyVO commitApplyVO) {
-        ProducePaymentCheckBillOrderDO checkBillOrderDO = getById(commitApplyVO.getId());
-        if (Objects.isNull(checkBillOrderDO)) {
-            throw new BusinessException("账单不存在！");
+        if(CollectionUtils.isEmpty(commitApplyVO.getId())){
+            throw new BusinessException("id参数不能为空!");
         }
-        if(checkBillOrderDO.getStatus()==Constant.ENABLE_TEN){
-            throw new BusinessException("该订单已通过审核！");
+        List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOList = list(new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>().eq(ProducePaymentCheckBillOrderDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(ProducePaymentCheckBillOrderDO::getId, commitApplyVO.getId()));
+        if (CollectionUtils.isEmpty(producePaymentCheckBillOrderDOList)) {
+            throw new BusinessException("账单不存在！");
         }
+        boolean isTure = producePaymentCheckBillOrderDOList.stream().filter(Objects::nonNull).allMatch(producePaymentCheckBillOrderDO -> producePaymentCheckBillOrderDO.getProductionName().equals(producePaymentCheckBillOrderDOList.get(0).getProductionName()));
+        if(!isTure){
+            throw new BusinessException("勾选订单生产科需一致");
+        }
+        boolean anyMatch = producePaymentCheckBillOrderDOList.stream().filter(Objects::nonNull).anyMatch(producePaymentCheckBillOrderDO -> FinanceEnum.RECEIVED_PAYMENT.getStatus().equals(producePaymentCheckBillOrderDO.getStatus()));
+        if(anyMatch){
+            throw new BusinessException("订单中包含已收款的数据,无法提交！");
+        }
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(producePaymentCheckBillOrderDOList.stream().filter(Objects::nonNull).map(producePaymentCheckBillOrderDO -> producePaymentCheckBillOrderDO.getOrderId()).collect(Collectors.toSet()));
+        //实际应付金额
+        BigDecimal actualPayedAmount=BigDecimal.ZERO;
+        //扣款金额
+        BigDecimal deductAmount=BigDecimal.ZERO;
+        //实际付款金额
+        BigDecimal totalActualPayedAmount=BigDecimal.ZERO;
+        //未付金额
+        BigDecimal unPayedAmount=BigDecimal.ZERO;
         Long userId = dataScope.getLoginUserId();
         String loginUserName = dataScope.getLoginUserName();
-        checkApply(commitApplyVO.getId(), userId,ApplyTypeEnum.CHECK_BILL_APPLY.getType());
-
-        checkBillOrderDO.setActualPayedDate(commitApplyVO.getActualPayedDate());
-        checkBillOrderDO.setFinancePerson(loginUserName);
-        OrderFieldLockApplyDO applyDO = initOrderFieldLockApplyDO(checkBillOrderDO, userId);
+        //todo 审核判断
+        checkApply(commitApplyVO.getId());
+
+        List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderDOS = producePaymentCheckBillOrderDOList.stream().filter(Objects::nonNull).map(producePaymentCheckBillOrderDO -> {
+            producePaymentCheckBillOrderDO.setActualPayedDate(commitApplyVO.getActualPayedDate());
+            producePaymentCheckBillOrderDO.setFinancePerson(loginUserName);
+            producePaymentCheckBillOrderDO.setStatus(FinanceEnum.UNPAID_PAYMENTS.getStatus());
+            return producePaymentCheckBillOrderDO;
+        }).collect(Collectors.toList());
+        for(ProducePaymentCheckBillOrderDO paymentCheckBillOrderDO : producePaymentCheckBillOrderDOS){
+            actualPayedAmount=actualPayedAmount.add(paymentCheckBillOrderDO.getActualPayedAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
+            deductAmount=deductAmount.add(paymentCheckBillOrderDO.getDeductAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
+            totalActualPayedAmount=totalActualPayedAmount.add(paymentCheckBillOrderDO.getTotalActualPayedAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
+            unPayedAmount=unPayedAmount.add(paymentCheckBillOrderDO.getUnPayedAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
+
+        }
+        ProducePaymentCheckBillFieldVO producePaymentCheckBillFieldVO = ProducePaymentCheckBillFieldVO.builder().checkNo(producePaymentCheckBillOrderDOS.get(0).getCheckNo())
+                .producePaymentCheckBillId(producePaymentCheckBillOrderDOS.stream().filter(Objects::nonNull).map(ProducePaymentCheckBillOrderDO::getId).collect(Collectors.toList()))
+                .innerNo(orderBaseInfoDOList.stream().filter(Objects::nonNull).map(orderBaseInfoDO -> orderBaseInfoDO.getInnerNo()).distinct().collect(Collectors.toList()))
+                //这里取的是集合中第一个的时间,作为必须付款日期。 目前还没定,先这样取。
+                .payedDate(producePaymentCheckBillOrderDOS.get(0).getPayedDate())
+                .businesPerson(producePaymentCheckBillOrderDOS.get(0).getBusinesPerson())
+                .trackerUser(producePaymentCheckBillOrderDOS.get(0).getTrackerUser())
+                .financePerson(loginUserName)
+                .productionName(producePaymentCheckBillOrderDOS.get(0).getProductionName())
+                .actualPayedDate(commitApplyVO.getActualPayedDate())
+                .deductAmount(deductAmount)
+                .actualPayedAmount(actualPayedAmount)
+                .totalActualPayedAmount(totalActualPayedAmount)
+                .unPayedAmount(unPayedAmount).build();
+        OrderFieldLockApplyDO applyDO = initOrderFieldLockApplyDO(producePaymentCheckBillFieldVO, userId);
         transactionHelper.run(() -> {
             orderFieldLockApplyService.save(applyDO);
-            checkBillOrderDO.setStatus(ApplyStatusEnum.WAIT_AUDIT.getStatus());
 //            checkBillOrderDO.setActualPayedDate(DateUtils.format(LocalDateTime.now(), DateUtils.DATE));
-            updateById(checkBillOrderDO);
+            updateBatchById(producePaymentCheckBillOrderDOS);
         });
         return ServerResult.success();
     }
     /**
-     * @param checkBillOrderDO
+     * @param producePaymentCheckBillFieldVO
      * @param userId
      * @return
      */
-    private OrderFieldLockApplyDO initOrderFieldLockApplyDO(ProducePaymentCheckBillOrderDO checkBillOrderDO, Long userId) {
+    private OrderFieldLockApplyDO initOrderFieldLockApplyDO(ProducePaymentCheckBillFieldVO producePaymentCheckBillFieldVO, Long userId) {
         OrderLockFieldVO lockFieldVO = new OrderLockFieldVO();
-        lockFieldVO.setCheckBillOrderDO(checkBillOrderDO);
+        lockFieldVO.setProducePaymentCheckBillFieldVO(producePaymentCheckBillFieldVO);
+        List<Long> financeIds= producePaymentCheckBillFieldVO.getProducePaymentCheckBillId().subList(1, producePaymentCheckBillFieldVO.getProducePaymentCheckBillId().size());
+        if(producePaymentCheckBillFieldVO.getProducePaymentCheckBillId().size()>1){
+            //针对于财务多个订单提交审核来创建的。
         return OrderFieldLockApplyDO.builder()
                 .applyUserId(userId)
                 .auditUserId(null)
                 .fields(JSONObject.toJSONString(lockFieldVO))
-                .orderId(checkBillOrderDO.getId())
+                .orderId(producePaymentCheckBillFieldVO.getProducePaymentCheckBillId().get(0))
+                .financeId(null == financeIds || financeIds.isEmpty() ? "" : financeIds.stream().map(String::valueOf).collect(Collectors.joining(",")))   //英文逗号
                 .type(ApplyTypeEnum.CHECK_BILL_APPLY.getType())
                 .remark(ApplyTypeEnum.CHECK_BILL_APPLY.getDesc())
                 .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                //这里设置审核角色有财务并不是让财务审核,会对财务屏蔽审核按钮,只是让它能够看到审核的单子
                 .auditRoleCodes(RoleEnum.ADMIN.getCode() + Constant.COMMA_CHARACTER + RoleEnum.FINANCE_USER.getCode())
                 .build();
+    }else{
+        return OrderFieldLockApplyDO.builder()
+                .applyUserId(userId)
+                .auditUserId(null)
+                .fields(JSONObject.toJSONString(lockFieldVO))
+                .orderId(producePaymentCheckBillFieldVO.getProducePaymentCheckBillId().get(0))
+                .type(ApplyTypeEnum.CHECK_BILL_APPLY.getType())
+                .remark(ApplyTypeEnum.CHECK_BILL_APPLY.getDesc())
+                .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                //这里设置审核角色有财务并不是让财务审核,会对财务屏蔽审核按钮,只是让它能够看到审核的单子
+                .auditRoleCodes(RoleEnum.ADMIN.getCode() + Constant.COMMA_CHARACTER + RoleEnum.FINANCE_USER.getCode())
+                .build();
+        }
     }
     /**
      * @param id
-     * @param userId
+     *
      */
-    private void checkApply(Long id, Long userId,Integer applyType) {
+    private void checkApply(List<Long> id) {
+        //如果提交审核的个数大于1,就需要这个判断。 不,应该是不管是否大于1都需要判断。因为即使是一个提交审核,你目前提交的这个id说不定是别人的financeId。
         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::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);
+            Set<Long> setApplyIds = applyDOS.stream().
+                    filter(Objects::nonNull).
+                    flatMap(applyDO -> {
+                        Stream<Long> orderIdStream = Stream.of(applyDO.getOrderId());
+                        Stream<Long> financeIdStream = (applyDO.getFinanceId() != null && !applyDO.getFinanceId().isEmpty())
+                                ? Arrays.stream(applyDO.getFinanceId().split(","))
+                                .map(Long::valueOf) // 转换为 Long
+                                : Stream.empty();
+                        return Stream.concat(orderIdStream, financeIdStream);
+                    })
+                    .collect(Collectors.toSet());
+            if(id.stream().anyMatch(ids -> setApplyIds.contains(ids))){
+                throw new BusinessException("申请单中包含处于审核的订单,请等审核完成后再申请!");
+            }
         }
     }
@@ -947,24 +1028,23 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
     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::getType, ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType())
                 .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus())
-                .eq(OrderFieldLockApplyDO::getOrderId, id).last("limit 1"));
+                .eq(OrderFieldLockApplyDO::getOrderId, id));
         if (Objects.nonNull(applyDO)) {
-            throw new BusinessException("该账单还在审批中，请联系总经理审批后操作！");
+            throw new BusinessException("该账单发票还在审批中，请联系总经理审批后操作！");
         }
     }
     /**
-     * @param ids
-     * @param userId
+     * @param id
+     *
      */
-    private void checkApplyByIds(List<Long> ids, Long userId) {
+    private void checkApplyByIds(Long id) {
         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::getOrderId, id)
+                .eq(OrderFieldLockApplyDO::getType, ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType())
                 .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));
         if (CollectionUtils.isNotEmpty(applyDOS)) {
             throw new BusinessException(ServerResultCode.APPLY_UNLOCK_FIELD_EXIST);
@@ -979,6 +1059,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
      */
     @Override
     public ServerResult deleteById(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
+        //删除前端要判断一下,要是勾选多条,这个check是否一致。一致才能删除。
         List<Long> ids = producePaymentCheckBillOrderQueryVO.getIds();
         if (CollUtil.isEmpty(ids)) {
             return ServerResult.fail("ids 参数不能为空");
@@ -987,17 +1068,29 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         if (CollUtil.isEmpty(checkBillOrderDOS)) {
             return ServerResult.success();
         }
-        checkBillOrderDOS.stream().forEach(checkBillOrderDO ->{
-            if(Constant.ENABLE_TEN==checkBillOrderDO.getStatus()){
-                throw new BusinessException("该订单已通过审核,无法删除!");
+        boolean isTrue = checkBillOrderDOS.stream().allMatch(checkBillOrderDO -> checkBillOrderDO.getCheckNo().equals(checkBillOrderDOS.get(0).getCheckNo()));
+        if(!isTrue){
+            throw new BusinessException("勾选订单的checkNo需一致");
+        }
+        boolean anyPaid = checkBillOrderDOS.stream().anyMatch(checkBillOrderDO -> FinanceEnum.RECEIVED_PAYMENT.getStatus() == checkBillOrderDO.getStatus());
+            if(anyPaid) {
+                throw new BusinessException("包含已收款的订单,无法删除!");
             }
-        });
-        checkApplyByIds(ids, dataScope.getLoginUserId());
+            //todo 审核有点问题。审核时是是哪个orderid共用一个orderid作为id,查询的时候是只能查询到第一个。  已完成。
+        checkApply(ids);
+        List<Long> orderIds = checkBillOrderDOS.stream()
+                .map(ProducePaymentCheckBillOrderDO::getOrderId)
+                .collect(Collectors.toList());
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
+        List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoDOList.stream().map(order -> {
+            //这里要删除对应invoiceNo号,但是为了删除后产生空指针异常,所以定义为"N/N";
+            order.setCheckNo("N/N");
+            return order;
+        }).collect(Collectors.toList());
         transactionHelper.run(() -> {
             removeByIds(ids);
-            checkBillMappingService.remove(new LambdaQueryWrapper<CheckBillMappingDO>().in(CheckBillMappingDO::getCheckBillId, ids));
+            orderBaseInfoService.updateBatchById(orderBaseInfoDOS);
         });
-
         return ServerResult.success();
     }
@@ -1076,12 +1169,32 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         if(Objects.isNull(checkBillOrderDO)){
             throw new BusinessException("生产科对账单不存在！");
         }
+        if(FinanceEnum.RECEIVED_PAYMENT.getStatus()==checkBillOrderDO.getStatus()){
+            throw new BusinessException("已完成收款,无法修改!");
+        }
+        //todo 要审核判断一下,判断是否处于审核状态。  已完成。
+        checkApply(new ArrayList<>(Arrays.asList(createVO.getId())));
         checkBillOrderDO.setPayedDate(createVO.getPayedDate());
         updateById(checkBillOrderDO);
         return ServerResult.success();
     }
     @Override
+    public ServerResult byIdAddNotes(ProducePaymentCheckBillCreateVO createVO) {
+        if(Objects.isNull(createVO.getId())){
+            return  ServerResult.fail();
+        }
+       ProducePaymentCheckBillOrderDO producePaymentCheckBillOrderDO = getById(createVO.getId());
+        if(Objects.isNull(producePaymentCheckBillOrderDO)){
+            throw new BusinessException("应收款单不存在！");
+        }
+        //备注信息,审核完应该也能修改。
+        producePaymentCheckBillOrderDO.setNotes(createVO.getNotes());
+        updateById(producePaymentCheckBillOrderDO);
+        return ServerResult.success();
+    }
+
+    @Override
     public ServerResult exportReceipt(HttpServletResponse response,ProducePaymentCheckBillOrderDO queryVO) throws IOException {
         XSSFWorkbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("付款单");
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.order.erp.mapper.order.InvoiceBillOrderMapper">
+    <!--    <resultMap id="financeOrderResultMap" type="com.order.erp.domain.vo.order.FinanceOrderResultVO">
+            &lt;!&ndash; 映射 OrderBaseInfoVO 的属性 &ndash;&gt;
+            <result property="id" column="id"/>
+           &lt;!&ndash; <result property="invoiceNo" column="invoice_no"/>
+            <result property="checkNo" column="check_no"/>&ndash;&gt;
+            <result property="customerCode" column="customer_code"/>
+            <result property="projectNo" column="project_no"/>
+            <result property="productionDepartment" column="production_department"/>
+            <result property="innerNo" column="inner_no"/>
+            <result property="smallPicUrl" column="small_pic_url"/>
+            <result property="orderCount" column="order_count"/>
+            <result property="productionDepartmentConsignTime" column="production_department_consign_time"/>
+            <result property="orderHodTime" column="order_hod_time"/>
+
+           &lt;!&ndash;发票invoice&ndash;&gt;
+    &lt;!&ndash;        <association property="invoiceBillOrderDO" javaType="com.order.erp.domain.dto.order.InvoiceBillOrderDO">&ndash;&gt;
+            <result property="id" column="id"/>
+            <result property="invoiceNo" column="invoice_no"/>
+            <result property="bgUrl" column="bg_url"/>
+            <result property="backRefundDate" column="back_refund_date"/>
+            <result property="deductAmount" column="deduct_amount"/>
+            <result property="deductUrl" column="deduct_url"/>
+            <result property="actualReceivableAmount" column="actual_receivable_amount"/>
+            <result property="actualPayedAmount1" column="actual_payed_amount_1"/>
+            <result property="actualPayedAmount2" column="actual_payed_amount_2"/>
+            <result property="actualPayedAmount3" column="actual_payed_amount_3"/>
+            <result property="otherAmount" column="other_amount"/>
+            &lt;!&ndash;缺少备注字段&ndash;&gt;
+            <result property="status" column="status"/>
+    &lt;!&ndash;        </association>&ndash;&gt;
+
+
+            &lt;!&ndash;生产科对账单&ndash;&gt;
+    &lt;!&ndash;    <association property="producePaymentCheckBillOrderDO" javaType="com.order.erp.domain.dto.order.ProducePaymentCheckBillOrderDO">&ndash;&gt;
+            <result property="id" column="checkId"/>
+            <result property="checkNo" column="check_no"/>
+            <result property="status" column="status"/>
+            <result property="deductAmount" column="deduct_amount"/>
+            <result property="deductDept" column="deduct_dept"/>
+            <result property="departmentInvoiceStatus" column="department_invoice_status"/>
+            <result property="actualPayedAmount3" column="actual_payed_amount3"/>
+            <result property="actualPayedAmount2" column="actual_payed_amount2"/>
+            <result property="actualPayedAmount1" column="actual_payed_amount1"/>
+            <result property="actualPayedAmount" column="actual_payed_amount"/>
+            <result property="payedDate" column="payed_date"/>
+            &lt;!&ndash;缺少备注字段&ndash;&gt;
+            <result property="deductUrl" column="deduct_url"/>
+    &lt;!&ndash;    </association>&ndash;&gt;
+
+            &lt;!&ndash;利润&ndash;&gt;
+    &lt;!&ndash;        <association property="profitAnalysisInfo" javaType="com.order.erp.domain.vo.order.OrderProfitAnalysisVO">  &ndash;&gt;
+            <result property="id" column="profitAnalysisId"/>
+            <result property="customerPrice" column="customer_price"/>
+            <result property="customerTotalPrice" column="customer_total_price"/>
+            <result property="productionDepartmentPrice" column="production_department_price"/>
+            <result property="productionDepartmentTotalPrice" column="production_department_total_price"/>
+    &lt;!&ndash;        </association>&ndash;&gt;
+        </resultMap>-->
+
+
+
+
+    <select id="byConditionGetOrder"  parameterType="com.order.erp.domain.vo.order.InvoiceBillOrderQueryVO" resultType="com.order.erp.domain.vo.order.FinanceOrderResultVO">
+        SELECT
+        o.id AS id,
+        --             o.invoice_no AS invoiceNo,  -- 注释字段没有问题
+        --             o.check_no AS checkNo,  -- 注释字段没有问题
+        o.customer_code AS customerCode,   -- 客户编码
+        o.project_no AS projectNo,     -- 项目号
+        o.production_department AS productionDepartment, -- 生产科
+        o.inner_no AS innerNo,   -- 内部编号
+        o.small_pic_url AS smallPicUrl,  -- 订单图片
+        o.order_count AS orderCount,  -- 数量
+        o.production_department_consign_time AS productionDepartmentConsignTime,  -- 生产科拖货时间
+        o.order_hod_time AS orderHodTime,  -- hod时间
+        -- 利润信息
+        a.id AS profitId,  -- 确保表别名 a 是正确的
+        a.customer_price AS customerPrice,  -- 客户单价
+        a.customer_total_price AS customerTotalPrice, -- 客户总价
+        a.production_department_price AS productionDepartmentPrice,  -- 生产科单价
+        a.production_department_total_price AS productionDepartmentTotalPrice,  -- 生产科总价
+        -- 发票信息
+        i.id AS invoiceId,
+        i.invoice_no AS invoiceNo,  -- invoice编号
+        i.bg_url AS invoiceBgUrl,  -- 报关单
+        i.back_refund_date AS invoiceBackRefundDate,  -- 必须回款日期
+        i.actual_refund_date AS invoiceActualRefundDate, -- 实际回款日期,前端不用获取
+        i.deduct_url AS invoiceDeductUrl,  -- 扣款单
+        i.actual_receivable_amount AS invoiceActualReceivableAmount, -- 实际应收金额
+        i.actual_payed_amount1 AS invoiceActualPayedAmount1, -- 实际收款金额1
+        i.actual_payed_amount2 AS invoiceActualPayedAmount2, -- 实际收款金额2
+        i.actual_payed_amount3 AS invoiceActualPayedAmount3, -- 实际收款金额3
+        i.other_amount AS invoiceOtherAmount,  -- 其他费用
+        i.status AS invoiceStatus,  -- invoice状态
+        i.deduct_amount AS invoiceDeductAmount, -- 扣款金额
+        i.notes AS invoiceNotes,   -- invoice备注
+        -- 生产科付款信息
+        p.id AS checkId,
+        p.check_no AS checkNo,  -- checkNo编号
+        p.status AS checkPaystatus,  -- checkNo状态
+        p.deduct_amount AS checkDeductAmount, -- 扣款金额
+        p.actual_payed_date AS checkActualPayedDate, -- 实际收款时间,前段不用获取
+        p.deduct_dept AS checkDeductDept, -- 扣款部门
+        p.department_invoice_status AS checkDepartmentInvoiceStatus, -- 发票状态
+        p.actual_payed_amount3 AS checkActualPayedAmount3, -- 实际付款金额3
+        p.actual_payed_amount2 AS checkActualPayedAmount2, -- 实际付款金额2
+        p.actual_payed_amount1 AS checkActualPayedAmount1, -- 实际付款金额1
+        p.actual_payed_amount AS checkActualPayedAmount,   -- 实际应付金额
+        p.payed_date AS checkPayedDate,    -- 必须付款日期
+        p.deduct_url AS checkDeductUrl,    -- 扣款单
+        p.notes AS checkNotes,             -- checkNo备注
+        p.invoice_url AS checkInvoiceUrl   -- 发票
+        FROM order_base_info o
+        LEFT JOIN invoice_bill_order AS i
+        ON o.id = i.order_id AND i.enable_flag = 10
+        LEFT JOIN produce_payment_check_bill_order AS p
+        ON o.id = p.order_id AND p.enable_flag = 10
+        LEFT JOIN order_profit_analysis AS a
+        ON o.id = a.order_id AND a.enable_flag = 10
+        WHERE o.enable_flag = 10
+        <if test="queryVO.invoiceNo != null and queryVO.invoiceNo != ''">
+            AND i.invoice_no = #{queryVO.invoiceNo}
+        </if>
+        <if test="queryVO.checkNo != null and queryVO.checkNo != ''">
+            AND p.check_no = #{queryVO.checkNo}
+        </if>
+        <if test="queryVO.invoiceStatus != null">
+            AND i.status = #{queryVO.invoiceStatus}
+        </if>
+        <if test="queryVO.checkNoStatus != null">
+            AND p.status = #{queryVO.checkNoStatus}
+        </if>
+        <if test="queryVO.customerCode != null and queryVO.customerCode != ''">
+            AND o.customer_code = #{queryVO.customerCode}
+        </if>
+        <if test="queryVO.projectNo != null and queryVO.projectNo != ''">
+            AND o.project_no = #{queryVO.projectNo}
+        </if>
+        <if test="queryVO.productionDepartment != null and queryVO.productionDepartment != ''">
+            AND o.production_department = #{queryVO.productionDepartment}
+        </if>
+        <if test="queryVO.innerNo != null and queryVO.innerNo != ''">
+            AND o.inner_no = #{queryVO.innerNo}
+        </if>
+        <if test="queryVO.customerPo != null and queryVO.customerPo != ''">
+            AND o.customer_po = #{queryVO.customerPo}
+        </if>
+        <if test="queryVO.invoiceStartTime != null">
+            AND DATE(i.create_time) &gt;= LEFT(#{queryVO.invoiceStartTime}, 10)
+        </if>
+        <if test="queryVO.invoiceEndTime != null">
+            AND DATE(i.create_time) &lt;= LEFT(#{queryVO.invoiceEndTime}, 10)
+        </if>
+        <if test="queryVO.checkStartTime != null ">
+            AND DATE(p.create_time) &gt;= LEFT(#{queryVO.checkStartTime}, 10)
+        </if>
+        <if test="queryVO.checkEndTime != null">
+            AND DATE(p.create_time) &lt;= LEFT(#{queryVO.checkEndTime}, 10)
+        </if>
+        <if test="queryVO.createStartTime !=null">
+            AND DATE(o.create_time) &gt;= LEFT(#{queryVO.createStartTime}, 10)
+        </if>
+        <if test="queryVO.createEndTime != null">
+            AND DATE(o.create_time) &lt;= LEFT(#{queryVO.createEndTime}, 10)
+        </if>
+        <if test="queryVO.productionDepartmentConsignStartTime != null ">
+            AND DATE(o.production_department_consign_time)  &gt;= LEFT(#{queryVO.productionDepartmentConsignStartTime} , 10)
+        </if>
+        <if test="queryVO.productionDepartmentConsignEndTime != null">
+            AND DATE(o.production_department_consign_time)  &lt;= LEFT(#{queryVO.productionDepartmentConsignEndTime} , 10)
+        </if>
+        <if test="queryVO.orderHodStartTime != null ">
+            AND DATE(o.order_hod_time) &gt;= LEFT(#{queryVO.orderHodStartTime} , 10)
+        </if>
+        <if test="queryVO.orderHodEndTime != null">
+            AND DATE(o.order_hod_time) &lt;= LEFT(#{queryVO.orderHodEndTime} , 10)
+        </if>
+        <if test="queryVO.trackerUserName != null and queryVO.trackerUserName != ''">
+            AND o.create_by = #{queryVO.trackerUserName}
+        </if>
+        <if test="queryVO.businessUserName != null and queryVO.businessUserName != ''">
+            AND o.business_person = #{queryVO.businessUserName}
+        </if>
+        ORDER BY o.id DESC
+
+    </select>
+</mapper>