Merge branch 'ch-prod' into 'main'

Ch prod See merge request !1

Merge branch 'ch-prod' into 'main'
Ch prod See merge request !1
chwork
2 parents bfb51ca5 8d9b8e04
Showing 68 changed files with 3472 additions and 222 deletions
pom.xml
sql/dml_erp_bill_v2.sql
sql/table.sql
src/main/java/com/order/erp/common/constant/Constant.java
src/main/java/com/order/erp/common/utils/EmailSendUtils.java
src/main/java/com/order/erp/controller/EmailTemplateController.java
src/main/java/com/order/erp/controller/InvoiceBillOrderController.java
src/main/java/com/order/erp/controller/LocalStorageController.java
src/main/java/com/order/erp/controller/OrderController.java
src/main/java/com/order/erp/controller/OrderOpinionLonController.java
src/main/java/com/order/erp/controller/ProducePaymentCheckBillOrderController.java
src/main/java/com/order/erp/controller/ReceiveEmailMappingController.java
src/main/java/com/order/erp/domain/dto/order/CheckBillMappingDO.java
src/main/java/com/order/erp/domain/dto/order/InvoiceBillMappingDO.java
src/main/java/com/order/erp/domain/dto/order/InvoiceBillOrderDO.java
src/main/java/com/order/erp/domain/dto/order/OrderOpinionLogDO.java
src/main/java/com/order/erp/domain/dto/order/OrderTrackStageDO.java
src/main/java/com/order/erp/domain/dto/order/ProducePaymentCheckBillOrderDO.java
src/main/java/com/order/erp/domain/vo/FileRespVO.java
src/main/java/com/order/erp/domain/vo/order/CheckBillMappingQueryVO.java
@@ -282,17 +282,6 @@
             <version>${x-easypdf-pdfbox.version}</version>
         </dependency>
-        <!--email邮件配置-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-mail</artifactId>
-        </dependency>
-
-        <!--Freemarker-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
-        </dependency>
     </dependencies>
     <build>
         <finalName>order-erp.service-1.0-SNAPSHOT</finalName>
+DROP TABLE IF EXISTS `invoice_bill_order`;
+CREATE TABLE `invoice_bill_order` (
+          `id` bigint NOT NULL AUTO_INCREMENT,
+          `invoice_no` varchar(64)  NOT NULL COMMENT '发票单号',
+          `bg_url` varchar(512)  default NULL COMMENT '报关单url地址',
+          `back_refund_date` varchar(64) default null COMMENT '必须回款日期',
+          `actual_refund_date` varchar(64) default null COMMENT '实际回款日期',
+          `deduct_amount` decimal(20,6) DEFAULT NULL COMMENT '发生扣款金额',
+          `deduct_url` varchar(512)  default NULL COMMENT '扣款单url地址',
+          `actual_receivable_amount` decimal(20,6) DEFAULT NULL COMMENT '实际应收金额',
+          `actual_payed_amount1` decimal(20,6) DEFAULT NULL COMMENT '实际应付金额1',
+          `actual_payed_amount2` decimal(20,6) DEFAULT NULL COMMENT '实际应付金额2',
+          `actual_payed_amount3` decimal(20,6) DEFAULT NULL COMMENT '实际应付金额3',
+          `other_amount` decimal(20,6) DEFAULT NULL COMMENT '其他费用金额',
+          `status`    INT          NOT NULL COMMENT '总经理审核状态 0：待审核、1：审核通过，2：审核驳回',
+          `enable_flag`    INT          NOT NULL COMMENT '是否可用 10-可用 20-删除',
+          `create_time`    DATETIME     NOT NULL COMMENT '创建时间',
+          `create_by`      varchar(64)  NOT NULL COMMENT '创建人',
+          `modify_time`    DATETIME     DEFAULT NULL COMMENT '修改时间',
+          `modify_by`      varchar(64)  DEFAULT NULL COMMENT '修改人',
+          `version`        INT          DEFAULT NULL COMMENT '版本号--乐观锁预留字段',
+          PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应收款账单表';
+
+DROP TABLE IF EXISTS `invoice_bill_mapping`;
+CREATE TABLE `invoice_bill_mapping` (
+          `id` bigint NOT NULL AUTO_INCREMENT,
+          `invoice_no` varchar(64)  NOT NULL COMMENT '发票单号',
+          `invoice_bill_id` bigint DEFAULT '0' COMMENT 'invoice账单id',
+          `order_id` bigint DEFAULT '0' COMMENT '订单id',
+          `enable_flag`    INT          NOT NULL COMMENT '是否可用 10-可用 20-删除',
+          `create_time`    DATETIME     NOT NULL COMMENT '创建时间',
+          `create_by`      varchar(64)  NOT NULL COMMENT '创建人',
+          `modify_time`    DATETIME     DEFAULT NULL COMMENT '修改时间',
+          `modify_by`      varchar(64)  DEFAULT NULL COMMENT '修改人',
+          `version`        INT          DEFAULT NULL COMMENT '版本号--乐观锁预留字段',
+          PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应收款账单关联订单映射表';
+
+
+DROP TABLE IF EXISTS `produce_payment_check_bill_order`;
+CREATE TABLE `produce_payment_check_bill_order` (
+          `id` bigint NOT NULL AUTO_INCREMENT,
+          `check_no` varchar(64)  NOT NULL COMMENT '生产科对账单',
+          `invoice_url` varchar(512)  default NULL COMMENT '发票url地址',
+          `deduct_pdf_url` varchar(512)  default NULL COMMENT '扣款单url地址',
+          `payed_date` varchar(64) default null COMMENT '生产科应付款日期',
+          `deduct_dept` varchar(64) default null COMMENT '生产科扣款责任部门',
+          `deduct_amount` decimal(20,6) DEFAULT NULL COMMENT '生产科扣款金额',
+          `actual_payed_amount` decimal(20,6) DEFAULT NULL COMMENT '实际应付金额',
+          `status`    INT          NOT NULL COMMENT '总经理审核状态 0：待审核、1：审核通过，2：审核驳回',
+          `enable_flag`    INT          NOT NULL COMMENT '是否可用 10-可用 20-删除',
+          `create_time`    DATETIME     NOT NULL COMMENT '创建时间',
+          `create_by`      varchar(64)  NOT NULL COMMENT '创建人',
+          `modify_time`    DATETIME     DEFAULT NULL COMMENT '修改时间',
+          `modify_by`      varchar(64)  DEFAULT NULL COMMENT '修改人',
+          `version`        INT          DEFAULT NULL COMMENT '版本号--乐观锁预留字段',
+          PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生产科对账单应收账单';
+
+DROP TABLE IF EXISTS `check_bill_mapping`;
+CREATE TABLE `check_bill_mapping` (
+          `id` bigint NOT NULL AUTO_INCREMENT,
+          `check_no` varchar(64)  NOT NULL COMMENT '生产科对账单号',
+          `check_bill_id` bigint DEFAULT '0' COMMENT 'check账单id',
+          `order_id` bigint DEFAULT '0' COMMENT '订单id',
+          `enable_flag`    INT          NOT NULL COMMENT '是否可用 10-可用 20-删除',
+          `create_time`    DATETIME     NOT NULL COMMENT '创建时间',
+          `create_by`      varchar(64)  NOT NULL COMMENT '创建人',
+          `modify_time`    DATETIME     DEFAULT NULL COMMENT '修改时间',
+          `modify_by`      varchar(64)  DEFAULT NULL COMMENT '修改人',
+          `version`        INT          DEFAULT NULL COMMENT '版本号--乐观锁预留字段',
+          PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生产科对账单应收账单映射表';
+
@@ -83,31 +83,35 @@ CREATE TABLE `order_completion_report` (
 DROP TABLE IF EXISTS `order_track_stage`;
-CREATE TABLE `order_track_stage` (
-          `id` bigint NOT NULL AUTO_INCREMENT,
-          `order_id` bigint NOT NULL COMMENT '订单id',
-          `pp_time`  varchar(64)  DEFAULT NULL COMMENT 'pp date',
-          `pp_confirm_result` varchar(64)  DEFAULT NULL COMMENT 'pp样品确认意见',
-          `eso_sample_send_time`  varchar(64)  DEFAULT NULL COMMENT 'EXTRA,SHOWROOM,ONLINE sample发送时间',
-          `shippment_sample_send_time`  varchar(64)  DEFAULT NULL COMMENT 'shippment sample 发送时间',
-          `shippment_sample_confirm_result`  varchar(64)  DEFAULT NULL COMMENT 'shipment sample确认意见',
-          `self_test_pass_time`  varchar(64)  DEFAULT NULL COMMENT '自测通过时间',
-          `aitex_test_send_time`  varchar(64)  DEFAULT NULL COMMENT 'Aitex测试发送时间',
-          `aitex_test_finish_result`  varchar(64)  DEFAULT NULL COMMENT 'Aitex测试结果',
-          `sgs_test_send_time`  varchar(64)  DEFAULT NULL COMMENT 'SGS测试发送时间',
-          `sgs_test_finish_result`  varchar(64)  DEFAULT NULL COMMENT 'SGS测试结果',
-          `barcode_sticker_arrival_time`  varchar(64)  DEFAULT NULL COMMENT 'Barcode sticker arrival time',
-          `latest_arrival_time`  varchar(64)  DEFAULT NULL COMMENT '最晚包材到货时间',
-          `latest_bk_time`  varchar(64)  DEFAULT NULL COMMENT '最晚订舱+报关资料时间',
-          `order_status`    INT          NOT NULL COMMENT '订单状态',
-          `enable_flag`    INT          NOT NULL COMMENT '是否可用 10-可用 20-删除',
-          `create_time`    DATETIME     NOT NULL COMMENT '创建时间',
-          `create_by`      varchar(64)  NOT NULL COMMENT '创建人',
-          `modify_time`    DATETIME     DEFAULT NULL COMMENT '修改时间',
-          `modify_by`      varchar(64)  DEFAULT NULL COMMENT '修改人',
-          `version`        INT          DEFAULT NULL COMMENT '版本号--乐观锁预留字段',
-          PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='订单-跟单环节';
+CREATE TABLE `order_track_stage`  (
+         `id` bigint NOT NULL AUTO_INCREMENT,
+         `order_id` bigint NOT NULL COMMENT '订单id',
+         `pp_time` varchar(64)  DEFAULT NULL COMMENT 'pp date',
+         `pp_confirm_result` varchar(64)  DEFAULT NULL COMMENT 'pp样品确认意见',
+         `pp_confirm_time` varchar(64)  DEFAULT NULL COMMENT 'pp样品确认时间',
+         `eso_sample_send_time` varchar(64)  DEFAULT NULL COMMENT 'EXTRA,SHOWROOM,ONLINE sample发送时间',
+         `shippment_sample_send_time` varchar(64)  NULL DEFAULT NULL COMMENT 'shippment sample 发送时间',
+         `shippment_sample_confirm_result` varchar(64)  DEFAULT NULL COMMENT 'shipment sample确认意见',
+         `shippment_sample_confirm_time` varchar(64)  DEFAULT NULL COMMENT 'shipment sample确认时间',
+         `self_test_pass_time` varchar(64)  DEFAULT NULL COMMENT '自测通过时间',
+         `aitex_test_send_time` varchar(64)  DEFAULT NULL COMMENT 'Aitex测试发送时间',
+         `aitex_test_finish_result` varchar(64)  DEFAULT NULL COMMENT 'Aitex测试结果',
+         `aitex_test_finish_time` varchar(64)  DEFAULT NULL COMMENT 'Aitex确认时间',
+         `sgs_test_send_time` varchar(64)  DEFAULT NULL COMMENT 'SGS测试发送时间',
+         `sgs_test_finish_result` varchar(64)  NULL COMMENT 'SGS测试结果',
+         `sgs_test_finish_time` varchar(64)  COMMENT 'SGS确认时间',
+         `barcode_sticker_arrival_time` varchar(64)  DEFAULT NULL COMMENT 'Barcode sticker arrival time',
+         `latest_arrival_time` varchar(64)  DEFAULT NULL COMMENT '最晚包材到货时间',
+         `latest_bk_time` varchar(64)  DEFAULT NULL COMMENT '最晚订舱+报关资料时间',
+         `order_status` INT NOT NULL COMMENT '订单状态',
+         `enable_flag` INT NOT NULL COMMENT '是否可用 10-可用 20-删除',
+         `create_time` DATETIME NOT NULL COMMENT '创建时间',
+         `create_by` varchar(64)  NOT NULL COMMENT '创建人',
+         `modify_time` DATETIME NULL DEFAULT NULL COMMENT '修改时间',
+         `modify_by` varchar(64)  DEFAULT NULL COMMENT '修改人',
+         `version` INT  DEFAULT NULL COMMENT '版本号--乐观锁预留字段',
+         PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT = '订单-跟单环节' ;
 DROP TABLE IF EXISTS `order_inspection_stage`;
@@ -224,4 +228,21 @@ CREATE TABLE `system_setting` (
           `modify_by`      varchar(64)  DEFAULT NULL COMMENT '修改人',
           `version`        INT          DEFAULT NULL COMMENT '版本号--乐观锁预留字段',
           PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='系统配置';
 \ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='系统配置';
+
+DROP TABLE IF EXISTS `receive_email_mapping`;
+CREATE TABLE `receive_email_mapping`  (
+         `id` bigint NOT NULL AUTO_INCREMENT,
+         ` type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '类型',
+          `type_value` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '类型值',
+          `config_infos` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '配置信息 json',
+          `enable_flag` int NOT NULL COMMENT '是否可用 10-可用 20-删除',
+          `create_time` datetime NOT NULL COMMENT '创建时间',
+          `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '创建人',
+          `modify_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
+          `modify_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '修改人',
+          `version` int NULL DEFAULT NULL COMMENT '版本号--乐观锁预留字段',
+           PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 94 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '邮件接收人信息绑定表' ROW_FORMAT = Dynamic;
+
+
@@ -166,6 +166,7 @@ public class Constant {
     public static final int TWENTY_FIRST = 21;
+    public static final int HUNDRED=100;
     public static final int THOUSAND = 1000;
     public static final String DATE_TIME = "yyyy-MM-dd HH:mm:ss";
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.domain.EmailTemplateEnum;
-import com.order.erp.domain.email.OrderProductEmailVO;
 import com.order.erp.domain.vo.order.OrderEventJobVO;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
@@ -50,31 +49,31 @@ public class EmailSendUtils {
         if(CollectionUtils.isEmpty(receiveemailList) && emailTemplateEnum ==null && ObjectUtils.isNull(orderEventJobVO)){
             throw new BusinessException(ServerResultCode.PARAM_ERROR);
         }
-            MimeMessage mimeMessage = javaMailSender.createMimeMessage();
-            MimeMessageHelper helper= null;
-            Map<String, Object> map = new HashMap<>();
-            map.put("context",emailTemplateEnum.getContent());
-            map.put("title",emailTemplateEnum.getTitle());
-            map.put("data",orderEventJobVO);
-            Template template = null;
-            //设置收件人
-            String[] receiveemailListArray = receiveemailList.toArray(new String[receiveemailList.size()]);
-            try {
-                helper = new MimeMessageHelper(mimeMessage,true);
+        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
+        MimeMessageHelper helper= null;
+        Map<String, Object> map = new HashMap<>();
+        map.put("context",emailTemplateEnum.getContent());
+        map.put("title",emailTemplateEnum.getTitle());
+        map.put("data",orderEventJobVO);
+        Template template = null;
+        //设置收件人
+        String[] receiveemailListArray = receiveemailList.toArray(new String[receiveemailList.size()]);
+        try {
+            helper = new MimeMessageHelper(mimeMessage,true);
             //设置邮件的主题
-                helper.setSubject(emailTemplateEnum.getTitle());
+            helper.setSubject(emailTemplateEnum.getTitle());
             //设置发件人
-                helper.setFrom(sendEmail);
-                helper.setTo(receiveemailListArray);
-                helper.setSentDate(new Date());
-                template = freeMarkerConfigurer.getConfiguration().getTemplate("mail.ftl");
-                StringWriter stringWriter = new StringWriter();
-                template.process(map,stringWriter);
-                helper.setText(stringWriter.toString(),true);
-            } catch (TemplateException | IOException  | MessagingException e) {
-                throw new RuntimeException("邮件发送失败！");
+            helper.setFrom(sendEmail);
+            helper.setTo(receiveemailListArray);
+            helper.setSentDate(new Date());
+            template = freeMarkerConfigurer.getConfiguration().getTemplate("mail.ftl");
+            StringWriter stringWriter = new StringWriter();
+            template.process(map,stringWriter);
+            helper.setText(stringWriter.toString(),true);
+        } catch (TemplateException | IOException  | MessagingException e) {
+            throw new RuntimeException("邮件发送失败！");
         }
-            javaMailSender.send(mimeMessage);
+        javaMailSender.send(mimeMessage);
     }
     /**
      * @Description:    发送生产指示书邮件
@@ -89,23 +88,23 @@ public class EmailSendUtils {
         if (CollectionUtils.isEmpty(receiveemailList) && emailTemplateEnum == null && ObjectUtils.isNull(pdfFile)) {
             throw new BusinessException(ServerResultCode.PARAM_ERROR);
         }
-            MimeMessage mimeMessage = javaMailSender.createMimeMessage();
-            //设置收件人
-            String[] receiveemailListArray = receiveemailList.toArray(new String[receiveemailList.size()]);
-            MimeMessageHelper helper = null;
-            try {
-                helper = new MimeMessageHelper(mimeMessage, true);
+        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
+        //设置收件人
+        String[] receiveemailListArray = receiveemailList.toArray(new String[receiveemailList.size()]);
+        MimeMessageHelper helper = null;
+        try {
+            helper = new MimeMessageHelper(mimeMessage, true);
             //设置邮件的主题
-                helper.setSubject(emailTemplateEnum.getTitle());
+            helper.setSubject(emailTemplateEnum.getTitle());
             //设置发件人
-                helper.setFrom(sendEmail);
-                helper.setTo(receiveemailListArray);
-                helper.setSentDate(new Date());
-                helper.setText(emailTemplateEnum.getContent());
-                helper.addAttachment(pdfFile.getName(), pdfFile);
-            } catch (MessagingException e) {
-                throw new RuntimeException("邮件发送失败！");
-            }
-            javaMailSender.send(mimeMessage);
+            helper.setFrom(sendEmail);
+            helper.setTo(receiveemailListArray);
+            helper.setSentDate(new Date());
+            helper.setText(emailTemplateEnum.getContent());
+            helper.addAttachment(pdfFile.getName(), pdfFile);
+        } catch (MessagingException e) {
+            throw new RuntimeException("邮件发送失败！");
         }
+        javaMailSender.send(mimeMessage);
+    }
 }
 \ No newline at end of file
@@ -2,8 +2,6 @@ package com.order.erp.controller;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.jsr303.OperateGroup;
-import com.order.erp.common.utils.EasyPdfUtils;
-import com.order.erp.common.utils.FileUtil;
 import com.order.erp.domain.vo.order.EmailTemplateQueryVO;
 import com.order.erp.domain.vo.order.EmailTemplateVO;
 import com.order.erp.service.order.EmailTemplateService;
@@ -14,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
-import java.io.File;
 /**
  * 邮件模板表(EmailTemplate)表控制层
@@ -31,24 +28,6 @@ public class EmailTemplateController {
     @Resource
     private EmailTemplateService emailTemplateService;
-    @Resource
-    private EasyPdfUtils pdfUtils;
-
-    /**
-     * 分页查询
-     *
-     * @param emailTemplateQueryVO 查询条件
-     * @return 查询结果
-     */
-    @PostMapping("/test")
-    public ServerResult test(@RequestBody @Validated({OperateGroup.List.class}) EmailTemplateQueryVO emailTemplateQueryVO) {
-
-
-        pdfUtils.createProducePdf(pdfUtils.build(), "testPagePlaceholder.pdf");
-
-        return ServerResult.success();
-    }
-
     /**
      * 分页查询
      *
+package com.order.erp.controller;
+
+import com.order.erp.common.annotation.AnonymousAccess;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.excel4j.exceptions.Excel4JException;
+import com.order.erp.common.jsr303.OperateGroup;
+import com.order.erp.domain.vo.order.*;
+import com.order.erp.service.order.InvoiceBillOrderService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)表控制层
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@RestController
+@RequestMapping("/order/erp/invoice_bill")
+public class InvoiceBillOrderController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private InvoiceBillOrderService invoiceBillOrderService;
+
+    /**
+     * 分页查询
+     *
+     * @param invoiceBillOrderQueryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/list_by_page")
+    public ServerResult listByPage(@RequestBody @Validated({OperateGroup.List.class}) InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
+        return invoiceBillOrderService.listByPage(invoiceBillOrderQueryVO);
+    }
+
+    /**
+     * 基础订单查询
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/list_base_order_info_by")
+    public ServerResult listBaseOrderInfoBy(@RequestBody @Validated InvoiceBaseOrderQueryVO queryVO) {
+        return invoiceBillOrderService.listBaseOrderInfoBy(queryVO);
+    }
+
+    /**
+     * 分析列表
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/list_analysis_by")
+    public ServerResult listAnalysisBy(@RequestBody @Validated({OperateGroup.List.class}) InvoiceBillAnalysisVO queryVO) {
+        return invoiceBillOrderService.listAnalysisBy(queryVO);
+    }
+
+    /**
+     * 导出分析列表
+     *
+     * @param queryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping(value = "/export")
+    @ApiOperation("导出分析列表")
+    @AnonymousAccess
+    public void export(HttpServletResponse response, @RequestBody @Validated InvoiceBillAnalysisVO queryVO) throws IOException, Excel4JException {
+        invoiceBillOrderService.export(response, queryVO);
+    }
+
+    /**
+     * 创建invoice单据
+     *
+     * @param createVO 数据VO
+     * @return 新增结果
+     */
+    @PostMapping("/create")
+    public ServerResult create(@RequestBody InvoiceBillCreateVO createVO) {
+        return invoiceBillOrderService.create(createVO);
+    }
+
+    /**
+     * 获取必须回款日期
+     *
+     * @param createVO 数据VO
+     * @return 新增结果
+     */
+    @PostMapping("/get_back_refund_date")
+    public ServerResult getBackRefundDate(@RequestBody InvoiceBillCreateVO createVO) {
+        return invoiceBillOrderService.getBackRefundDate(createVO);
+    }
+
+    /**
+     * 更新扣款信息
+     *
+     * @param deductInfoVO 数据VO
+     * @return 编辑结果
+     */
+    @PostMapping("/update_deduct_info")
+    public ServerResult updateDeductInfo(@RequestBody InvoiceBillDeductInfoVO deductInfoVO) {
+        return invoiceBillOrderService.updateDeductInfo(deductInfoVO);
+    }
+
+    /**
+     * 更新其他金额信息
+     *
+     * @param amountInfoVO 数据VO
+     * @return 编辑结果
+     */
+    @PostMapping("/update_amount_info")
+    public ServerResult updateAmountInfo(@RequestBody InvoiceBillAmountInfoVO amountInfoVO) {
+        return invoiceBillOrderService.updateAmountInfo(amountInfoVO);
+    }
+
+    /**
+     * 提交审核
+     *
+     * @param commitApplyVO 数据VO
+     * @return 编辑结果
+     */
+    @PostMapping("/commit_apply")
+    public ServerResult commitApply(@RequestBody InvoiceBillCommitApplyVO commitApplyVO) {
+        return invoiceBillOrderService.commitApply(commitApplyVO);
+    }
+
+    /**
+     * 删除数据
+     *
+     * @param invoiceBillOrderQueryVO 查询条件
+     * @return 删除是否成功
+     */
+    @PostMapping("/delete_by_id")
+    public ServerResult deleteById(@RequestBody InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
+        return invoiceBillOrderService.deleteById(invoiceBillOrderQueryVO);
+    }
+
+}
+
@@ -31,11 +31,18 @@ public class LocalStorageController {
         return localStorageService.create(name, file);
     }
-    @ApiOperation("上传文件到oss服务")
+    @ApiOperation("上传图片到oss服务")
     @PostMapping(value = "/upload_oss")
     @AnonymousAccess
     public ServerResult upload2oss(@RequestParam String name, @RequestParam("file") MultipartFile file) {
         return localStorageService.uploadByAliOss(name, file);
     }
+    @ApiOperation("上传文件到oss服务")
+    @PostMapping(value = "/upload_file_oss")
+    @AnonymousAccess
+    public ServerResult uploadFile2oss(@RequestParam String name, @RequestParam("file") MultipartFile file) {
+        return localStorageService.uploadFileByAliOss(name, file);
+    }
+
 }
 \ No newline at end of file
@@ -156,5 +156,7 @@ public class OrderController {
     public ServerResult check(@RequestBody OrderBaseInfoQueryVO orderBaseInfoQueryVO) {
         return orderBaseInfoService.check(orderBaseInfoQueryVO);
     }
+
+
 }
@@ -3,10 +3,13 @@ package com.order.erp.controller;
 import com.order.erp.common.annotation.AnonymousAccess;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.dto.order.OrderOpinionLogDO;
+import com.order.erp.domain.vo.order.OrderOpinionLogVO;
 import com.order.erp.service.order.OrderOpinionLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -29,8 +32,8 @@ public class OrderOpinionLonController {
     @PostMapping("/query_by_id")
     @ApiOperation("查询订单的跟单结果记录")
     @AnonymousAccess
-    public ServerResult queryById(OrderOpinionLogDO orderOpinionLogDO){
-       return  orderOpinionLogService.queryById(orderOpinionLogDO);
+    public ServerResult queryById(@RequestBody @Validated OrderOpinionLogVO orderOpinionLogVo){
+       return  orderOpinionLogService.queryById(orderOpinionLogVo);
     }
 }
+package com.order.erp.controller;
+
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.jsr303.OperateGroup;
+import com.order.erp.domain.vo.order.ProducePaymentCheckBillOrderQueryVO;
+import com.order.erp.domain.vo.order.ProducePaymentCheckBillOrderVO;
+import com.order.erp.service.order.ProducePaymentCheckBillOrderService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)表控制层
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@RestController
+@RequestMapping("/order/erp/check_bill/")
+public class ProducePaymentCheckBillOrderController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private ProducePaymentCheckBillOrderService producePaymentCheckBillOrderService;
+
+    /**
+     * 分页查询
+     *
+     * @param producePaymentCheckBillOrderQueryVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/list")
+    public ServerResult list(@RequestBody @Validated({OperateGroup.List.class}) ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
+        return producePaymentCheckBillOrderService.list(producePaymentCheckBillOrderQueryVO);
+    }
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param producePaymentCheckBillOrderQueryVO 查询条件
+     * @return 单条数据
+     */
+    @PostMapping("/query_by_id")
+    public ServerResult queryById(@RequestBody ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
+        return producePaymentCheckBillOrderService.queryById(producePaymentCheckBillOrderQueryVO);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param producePaymentCheckBillOrderVO 数据VO
+     * @return 新增结果
+     */
+    @PostMapping("/add")
+    public ServerResult add(@RequestBody ProducePaymentCheckBillOrderVO producePaymentCheckBillOrderVO) {
+        return producePaymentCheckBillOrderService.add(producePaymentCheckBillOrderVO);
+    }
+
+    /**
+     * 编辑数据
+     *
+     * @param producePaymentCheckBillOrderVO 数据VO
+     * @return 编辑结果
+     */
+    @PostMapping("/edit")
+    public ServerResult edit(@RequestBody ProducePaymentCheckBillOrderVO producePaymentCheckBillOrderVO) {
+        return producePaymentCheckBillOrderService.edit(producePaymentCheckBillOrderVO);
+    }
+
+    /**
+     * 删除数据
+     *
+     * @param producePaymentCheckBillOrderQueryVO 查询条件
+     * @return 删除是否成功
+     */
+    @PostMapping("/delete_by_id")
+    public ServerResult deleteById(@RequestBody ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
+        return producePaymentCheckBillOrderService.deleteById(producePaymentCheckBillOrderQueryVO);
+    }
+
+}
+
 package com.order.erp.controller;
+import com.order.erp.common.annotation.AnonymousAccess;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.dto.order.ReceiveEmailMappingDO;
 import com.order.erp.domain.vo.order.ReceiveEmailMappingQueryVO;
@@ -34,6 +35,7 @@ public class ReceiveEmailMappingController {
      * @return 查询结果
      */
     @PostMapping("/list")
+    @AnonymousAccess
     public ServerResult list() {
         return receiveEmailMappingService.listGetAll();
     }
@@ -46,6 +48,7 @@ public class ReceiveEmailMappingController {
      * @return 新增结果
      */
     @PostMapping("/add")
+    @AnonymousAccess
     public ServerResult add(@RequestBody ReceiveEmailMappingVO receiveEmailMappingVO) {
         return receiveEmailMappingService.add(receiveEmailMappingVO);
     }
@@ -57,6 +60,7 @@ public class ReceiveEmailMappingController {
      * @return 编辑结果
      */
     @PostMapping("/edit")
+    @AnonymousAccess
     public ServerResult edit(@RequestBody ReceiveEmailMappingVO receiveEmailMappingVO) {
         return receiveEmailMappingService.edit(receiveEmailMappingVO);
     }
@@ -68,6 +72,7 @@ public class ReceiveEmailMappingController {
      * @return 删除是否成功
      */
     @PostMapping("/delete_by_id")
+    @AnonymousAccess
     public ServerResult deleteById(@RequestBody ReceiveEmailMappingVO receiveEmailMappingVO) {
         return receiveEmailMappingService.deleteById(receiveEmailMappingVO);
     }
@@ -78,6 +83,7 @@ public class ReceiveEmailMappingController {
      * @return 实例对象
      */
     @PostMapping("/query_by_id")
+    @AnonymousAccess
     public ServerResult queryById(@RequestBody ReceiveEmailMappingQueryVO receiveEmailMappingQueryVO) {
         return receiveEmailMappingService.queryById(receiveEmailMappingQueryVO);
     }
@@ -89,6 +95,7 @@ public class ReceiveEmailMappingController {
      * @return  操作结果
      */
     @PostMapping("/opt")
+    @AnonymousAccess
     public ServerResult opt(@RequestBody ReceiveEmailMappingDO receiveEmailMappingDo) {
         return receiveEmailMappingService.opt(receiveEmailMappingDo);
     }
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.order.erp.domain.dto.BaseDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 生产科对账单应收账单映射表(CheckBillMapping)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:36
+ */
+@TableName("check_bill_mapping")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class CheckBillMappingDO extends BaseDO implements Serializable {
+    private static final long serialVersionUID = 199786248752278040L;
+
+    private Long id;
+    /**
+     * 生产科对账单号
+     */
+    private String checkNo;
+    /**
+     * check账单id
+     */
+    private Long checkBillId;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+}
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.order.erp.domain.dto.BaseDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 应收款账单关联订单映射表(InvoiceBillMapping)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:36
+ */
+@TableName("invoice_bill_mapping")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillMappingDO extends BaseDO implements Serializable {
+
+    private Long id;
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+    /**
+     * invoice账单id
+     */
+    private Long invoiceBillId;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+}
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.order.erp.domain.dto.BaseDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@TableName("invoice_bill_order")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillOrderDO extends BaseDO implements Serializable {
+
+    private Long id;
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+    /**
+     * 报关单url地址
+     */
+    private String bgUrl;
+    /**
+     * 必须回款日期
+     */
+    private String backRefundDate;
+    /**
+     * 实际回款日期
+     */
+    private String actualRefundDate;
+
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal deductAmount;
+    /**
+     * 扣款单url地址
+     */
+    private String deductUrl;
+    /**
+     * 实际应收金额
+     */
+    private BigDecimal actualReceivableAmount;
+    /**
+     * 实际应付金额1
+     */
+    private BigDecimal actualPayedAmount1;
+    /**
+     * 实际应付金额2
+     */
+    private BigDecimal actualPayedAmount2;
+    /**
+     * 实际应付金额3
+     */
+    private BigDecimal actualPayedAmount3;
+    /**
+     * 其他费用金额
+     */
+    private BigDecimal otherAmount;
+    /**
+     * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer status;
+
+}
@@ -5,6 +5,7 @@ import com.order.erp.domain.dto.BaseDO;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 /**
@@ -26,7 +27,7 @@ public class OrderOpinionLogDO extends BaseDO implements Serializable {
     /**
      * 订单id
      */
-     private long orderId;
+     private Long orderId;
     /**
      * 意见类型(SGS/Aitex/SHIPPMENT/PP/产品意见)
      */
@@ -37,7 +37,7 @@ public class OrderTrackStageDO extends BaseDO implements Serializable {
      * pp样品确认意见
      */
     private String ppConfirmResult;
-    /**tring
+    /**
      * pp样品确认时间
      * */
     private String ppConfirmTime;
+package com.order.erp.domain.dto.order;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.order.erp.domain.dto.BaseDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@TableName("produce_payment_check_bill_order")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProducePaymentCheckBillOrderDO extends BaseDO implements Serializable {
+
+    private Long id;
+    /**
+     * 生产科对账单
+     */
+    private String checkNo;
+    /**
+     * 发票url地址
+     */
+    private String invoiceUrl;
+    /**
+     * 扣款单url地址
+     */
+    private String deductPdfUrl;
+    /**
+     * 生产科应付款日期
+     */
+    private String payedDate;
+    /**
+     * 生产科扣款责任部门
+     */
+    private String deductDept;
+    /**
+     * 生产科扣款金额
+     */
+    private Double deductAmount;
+    /**
+     * 实际应付金额
+     */
+    private Double actualPayedAmount;
+    /**
+     * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer status;
+
+}
+package com.order.erp.domain.vo;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 文件上传实体类
+ *
+ * @author xms
+ * @since 2023-10-08 14:52:27
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class FileRespVO implements Serializable {
+
+    /**
+     * file地址
+     */
+    private String fileUrl;
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 生产科对账单应收账单映射表(CheckBillMapping)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:37
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class CheckBillMappingQueryVO extends BasePageVO implements Serializable {
+
+    private List<Long> ids;
+
+
+    private Long id;
+    /**
+     * 生产科对账单号
+     */
+    private String checkNo;
+    /**
+     * check账单id
+     */
+    private Long checkBillId;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+
+}
+
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 生产科对账单应收账单映射表(CheckBillMapping)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:37
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class CheckBillMappingVO implements Serializable {
+
+    private Long id;
+    /**
+     * 生产科对账单号
+     */
+    private String checkNo;
+    /**
+     * check账单id
+     */
+    private Long checkBillId;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBaseOrderQueryVO extends BasePageVO implements Serializable {
+
+    /**
+     * 发票单号
+     */
+    @NotBlank(message = "发票单号不能为空")
+    private String invoiceNo;
+}
+
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单 -- 其他金额信息
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillAmountInfoVO implements Serializable {
+
+    private Long id;
+
+    /**
+     * 报关单url地址
+     */
+    private String bgUrl;
+
+    /**
+     * 实际应收金额
+     */
+    private BigDecimal actualReceivableAmount;
+    /**
+     * 实际应付金额1
+     */
+    private BigDecimal actualPayedAmount1;
+    /**
+     * 实际应付金额2
+     */
+    private BigDecimal actualPayedAmount2;
+    /**
+     * 实际应付金额3
+     */
+    private BigDecimal actualPayedAmount3;
+    /**
+     * 其他费用金额
+     */
+    private BigDecimal otherAmount;
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillAnalysisExportVO implements Serializable {
+
+    private Long id;
+
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+
+    /**
+     * 客户总价$
+     */
+    private BigDecimal customerTotalPrice;
+
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal deductAmount;
+
+    /**
+     * 实际应收金额
+     */
+    private BigDecimal actualReceivableAmount;
+
+    /**
+     * 实际应付金额
+     */
+    private BigDecimal actualPayedAmount;
+
+    /**
+     * 实际应收 - 实际应付
+     * 其他费用金额汇总
+     */
+    private BigDecimal otherAmount;
+
+    /**
+     * 实际应收 - 实际应付 - 其他费用金额汇总
+     * 其他费用金额合计
+     */
+    private BigDecimal otherTotalAmount;
+
+    /**
+     * 必须回款日期
+     */
+    private String backRefundDate;
+
+    /**
+     * 实际回款日期
+     */
+    private String actualRefundDate;
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillAnalysisResultVO implements Serializable {
+
+
+    /**
+     * 导出列表
+     */
+    private List<InvoiceBillAnalysisExportVO> exportVOS;
+
+    /**
+     * 合计数据
+     */
+
+    /**
+     * 客户总价$
+     */
+    private BigDecimal customerTotalPrice;
+
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal deductAmount;
+
+    /**
+     * 实际应收金额
+     */
+    private BigDecimal actualReceivableAmount;
+
+    /**
+     * 实际应付金额
+     */
+    private BigDecimal actualPayedAmount;
+
+    /**
+     * 实际应收 - 实际应付
+     * 其他费用金额汇总
+     */
+    private BigDecimal otherAmount;
+
+    /**
+     * 实际应收 - 实际应付 - 其他费用金额汇总
+     * 其他费用金额合计
+     */
+    private BigDecimal otherTotalAmount;
+
+    /**
+     * 合计数据
+     */
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 应收款账单 -- 分析
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillAnalysisVO extends InvoiceBillOrderQueryVO implements Serializable {
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 应收款账单 -- 提交审核
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillCommitApplyVO implements Serializable {
+
+    private Long id;
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillCreateVO implements Serializable {
+    private static final long serialVersionUID = 543899167451834300L;
+
+    private Long id;
+
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+
+    /**
+     * 报关单url地址
+     */
+    private String bgUrl;
+
+    /**
+     * 必须回款日期
+     */
+    private String backRefundDate;
+
+    /**
+     * 订单id集合
+     */
+    private List<Long> orderIds;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单 -- 扣款信息
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillDeductInfoVO implements Serializable {
+
+    private Long id;
+
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal deductAmount;
+
+    /**
+     * 扣款单url地址
+     */
+    private String deductUrl;
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 应收款账单关联订单映射表(InvoiceBillMapping)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:36
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillMappingQueryVO extends BasePageVO implements Serializable {
+    private static final long serialVersionUID = -10772282327497511L;
+
+    private List<Long> ids;
+
+
+    private Long id;
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+    /**
+     * invoice账单id
+     */
+    private Long invoiceBillId;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+
+}
+
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 应收款账单关联订单映射表(InvoiceBillMapping)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:36
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillMappingVO implements Serializable {
+    private static final long serialVersionUID = -55765026730369748L;
+
+    private Long id;
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+    /**
+     * invoice账单id
+     */
+    private Long invoiceBillId;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillOrderQueryVO extends BasePageVO implements Serializable {
+
+    private List<Long> ids;
+
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+
+    /**
+     * 总经理审核状态 -1，未提交审核，0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer status;
+
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+
+    /**
+     * 项目号
+     */
+    private String projectNo;
+
+    /**
+     * 生产科
+     */
+    private String productionDepartment;
+
+    /**
+     * 内部编号
+     */
+    private String innerNo;
+
+    /**
+     * 客户po号
+     */
+    private String customerPo;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+}
+
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceBillOrderVO implements Serializable {
+    private static final long serialVersionUID = 543899167451834300L;
+
+    private Long id;
+
+    /**
+     * 发票单号
+     */
+    private String invoiceNo;
+
+    /**
+     * 报关单url地址
+     */
+    private String bgUrl;
+
+    /**
+     * 必须回款日期
+     */
+    private String backRefundDate;
+
+    /**
+     * 发生扣款金额
+     */
+    private BigDecimal deductAmount;
+
+    /**
+     * 扣款单url地址
+     */
+    private String deductUrl;
+
+    /**
+     * 实际应收金额
+     */
+    private BigDecimal actualReceivableAmount;
+
+    /**
+     * 实际应付金额1
+     */
+    private BigDecimal actualPayedAmount1;
+
+    /**
+     * 实际应付金额2
+     */
+    private BigDecimal actualPayedAmount2;
+
+    /**
+     * 实际应付金额3
+     */
+    private BigDecimal actualPayedAmount3;
+
+    /**
+     * 其他费用金额
+     */
+    private BigDecimal otherAmount;
+
+    /**
+     * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer status;
+
+
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.dto.order.OrderBaseInfoDO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 应收款账单 -- holdTime
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceHoldTimeItemVO implements Serializable {
+
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+
+    /**
+     * 订单hold时间
+     */
+    private String holdTime;
+
+    /**
+     * 基础订单信息
+     */
+    private OrderBaseInfoDO baseInfoDO;
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:33
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class InvoiceOrderBaseItemVO implements Serializable {
+
+    private Long orderId;
+
+    /**
+     * invoice编码
+     */
+    private String invoiceCode;
+
+    /**
+     * 客户编码
+     */
+    private String customerCode;
+
+    /**
+     * 客户总价$
+     */
+    private BigDecimal customerTotalPrice;
+
+
+}
@@ -22,6 +22,10 @@ public class OrderBaseInfoVO implements Serializable {
     private Long id;
     /**
+     * 发票单号
+     */
+    private String invoiceNo;
+    /**
      * 客户编码
      */
     private String customerCode;
@@ -113,4 +117,4 @@ public class OrderBaseInfoVO implements Serializable {
      */
     private String businessPerson;
 -}
+}
 \ No newline at end of file
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * @Author:ch
+ * @createTime:2024-08-07
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderOpinionLogVO {
+    private Long id;
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+    /**
+     * 意见类型(SGS/Aitex/SHIPPMENT/PP/产品意见)
+     */
+    private String opinionType;
+
+    /**
+     * 更新字段
+     */
+    private String field;
+}
+package com.order.erp.domain.vo.order;
+
+import com.order.erp.domain.vo.BasePageVO;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProducePaymentCheckBillOrderQueryVO extends BasePageVO implements Serializable {
+
+    private List<Long> ids;
+
+
+    private Long id;
+    /**
+     * 生产科对账单
+     */
+    private String checkNo;
+    /**
+     * 发票url地址
+     */
+    private String invoiceUrl;
+    /**
+     * 扣款单url地址
+     */
+    private String deductPdfUrl;
+    /**
+     * 生产科应付款日期
+     */
+    private String payedDate;
+    /**
+     * 生产科扣款责任部门
+     */
+    private String deductDept;
+    /**
+     * 生产科扣款金额
+     */
+    private Double deductAmount;
+    /**
+     * 实际应付金额
+     */
+    private Double actualPayedAmount;
+    /**
+     * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer status;
+
+
+}
+
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProducePaymentCheckBillOrderVO implements Serializable {
+    private static final long serialVersionUID = 239047702576286556L;
+
+    private Long id;
+    /**
+     * 生产科对账单
+     */
+    private String checkNo;
+    /**
+     * 发票url地址
+     */
+    private String invoiceUrl;
+    /**
+     * 扣款单url地址
+     */
+    private String deductPdfUrl;
+    /**
+     * 生产科应付款日期
+     */
+    private String payedDate;
+    /**
+     * 生产科扣款责任部门
+     */
+    private String deductDept;
+    /**
+     * 生产科扣款金额
+     */
+    private Double deductAmount;
+    /**
+     * 实际应付金额
+     */
+    private Double actualPayedAmount;
+    /**
+     * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
+     */
+    private Integer status;
+
+
+}
@@ -28,6 +28,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import static com.order.erp.common.utils.DateUtils.DATE;
+import static com.order.erp.common.utils.DateUtils.DATE_TIME;
+
 /**
  * @author: xms
@@ -62,7 +65,7 @@ public class OrderOverTimeEventJob {
     /**
      * 凌晨1点执行，一天一次
      */
-    @Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "0 * * * * *")
     //存储的日期都必须为yyyy-MM-dd HH:mm:ss。
     public void checkOverTimeExecuteV2() {
         List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.getEventList();
@@ -87,7 +90,6 @@ public class OrderOverTimeEventJob {
      */
     //发送邮件。
     private void sendEmail4OrderEvent(OrderEventEnum eventEnum, List<OrderEventJobVO> eventJobVOS) {
-
         HashSet<String> customerCodeList = new HashSet<>();
         for (OrderEventJobVO orderEventJob : eventJobVOS) {
             if (!redisUtils.hasKey(EmailTemplateEnum.byTemplate(
@@ -117,21 +119,28 @@ public class OrderOverTimeEventJob {
                 }).filter(Objects::nonNull)
                 .collect(Collectors.toList());
         //如果为尾期验货事件的话,需要从订单中的生产科角色中得到邮箱。而不是从邮件配置中得到邮箱。
-        if (OrderEventEnum.END_CHECK_DATE_EVENT.equals(eventEnum)) {
+        if (OrderEventEnum.END_CHECK_DATE_EVENT.equals(eventEnum) ) {
             for (OrderEventJobVO orderEventJob : eventJobVOS) {
-                String productionDepartment = orderEventJob.getBaseInfo().getProductionDepartment();
-                //根据订单的生产科得到生产科用户信息。
-                AdminUserDO productionDepartmentUser = adminUserService.getOne(new LambdaQueryWrapper<AdminUserDO>()
-                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                        .eq(AdminUserDO::getUserName, productionDepartment));
-                List<String> productionEmail = Arrays.asList(productionDepartmentUser.getEmail().split("[,，]+"))
-                        .stream().map(String::trim)
-                        .collect(Collectors.toList());
-                emailSendUtils.sendEmail(EmailTemplateEnum.byTemplate(eventEnum.getTemplateId()),
-                        productionEmail, orderEventJob);
-                redisUtils.set(EmailTemplateEnum.byTemplate(
-                                eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER + orderEventJob.getBaseInfo().getId(),
-                        orderEventJob, 90, TimeUnit.DAYS);
+                if (!redisUtils.hasKey(EmailTemplateEnum.byTemplate(
+                        eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER + orderEventJob.getBaseInfo().getId())) {
+                    //转化一下日期格式,为yyyy-MM-dd。
+                    OrderBaseInfoVO orderBaseInfoFormat = getDateFormat(orderEventJob.getBaseInfo().getProductionDepartmentConsignTime(), orderEventJob.getBaseInfo().getOrderHodTime());
+                    orderEventJob.getBaseInfo().setProductionDepartmentConsignTime(orderBaseInfoFormat.getProductionDepartmentConsignTime());
+                    orderEventJob.getBaseInfo().setOrderHodTime(orderBaseInfoFormat.getOrderHodTime());
+                    String productionDepartment = orderEventJob.getBaseInfo().getProductionDepartment();
+                    //根据订单的生产科得到生产科用户信息。
+                    AdminUserDO productionDepartmentUser = adminUserService.getOne(new LambdaQueryWrapper<AdminUserDO>()
+                            .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                            .eq(AdminUserDO::getUserName, productionDepartment));
+                    List<String> productionEmail = Arrays.asList(productionDepartmentUser.getEmail().split("[,，]+"))
+                            .stream().map(String::trim)
+                            .collect(Collectors.toList());
+                    emailSendUtils.sendEmail(EmailTemplateEnum.byTemplate(eventEnum.getTemplateId()),
+                            productionEmail, orderEventJob);
+                    redisUtils.set(EmailTemplateEnum.byTemplate(
+                                    eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER +orderEventJob.getBaseInfo().getId(),
+                            orderEventJob, 90, TimeUnit.DAYS);
+                }
             }
         } else {
             Set<Map<String, List<String>>> set = receiveEmailMappingDOS.stream().map(x -> {
@@ -154,6 +163,10 @@ public class OrderOverTimeEventJob {
             for (OrderEventJobVO orderEventJob : eventJobVOS) {
                 for (Map<String, List<String>> map : set) {
                     if (orderEventJob.getBaseInfo().getCustomerCode().equals(map.keySet().iterator().next())) {
+                        //转化一下日期格式,为yyyy-MM-dd。
+                        OrderBaseInfoVO orderBaseInfoFormat = getDateFormat(orderEventJob.getBaseInfo().getProductionDepartmentConsignTime(), orderEventJob.getBaseInfo().getOrderHodTime());
+                        orderEventJob.getBaseInfo().setProductionDepartmentConsignTime(orderBaseInfoFormat.getProductionDepartmentConsignTime());
+                        orderEventJob.getBaseInfo().setOrderHodTime(orderBaseInfoFormat.getOrderHodTime());
                         emailSendUtils.sendEmail(EmailTemplateEnum.byTemplate(eventEnum.getTemplateId()),
                                 map.get(map.keySet().iterator().next()), orderEventJob);
                         redisUtils.set(EmailTemplateEnum.byTemplate(
@@ -277,7 +290,7 @@ public class OrderOverTimeEventJob {
         if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(esoSampleSendTime)) {
             LocalDate orderHodTimelocalDate = DateUtils.parseDate(orderHodTime);
             LocalDate esoSampleSendTimelocalDate = DateUtils.parseDate(esoSampleSendTime);
-            if (ChronoUnit.DAYS.between(esoSampleSendTimelocalDate, orderHodTimelocalDate) == Constant.SEVEN) {
+            if (ChronoUnit.DAYS.between(esoSampleSendTimelocalDate, orderHodTimelocalDate) == Constant.FOURTEEN) {
                 return true;
             }
@@ -288,7 +301,7 @@ public class OrderOverTimeEventJob {
     private Boolean filterBigSampleEvent(OrderEventJobVO eventJobVO) {
         String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
         String shippmentSampleConfirmResult = eventJobVO.getTrackStageInfo().getShippmentSampleConfirmResult();
-        String shippmentSampleConfirmTime = eventJobVO.getTrackStageInfo().getShippmentSampleSendTime();
+        String shippmentSampleConfirmTime = eventJobVO.getTrackStageInfo().getShippmentSampleConfirmTime();
         if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(shippmentSampleConfirmResult) && StringUtils.isNotBlank(shippmentSampleConfirmTime)) {
             int daysBetween = getDaysBetween(shippmentSampleConfirmResult, shippmentSampleConfirmTime, orderHodTime);
             if (daysBetween == Constant.SEVEN || daysBetween == Constant.NEGATIVE_ONE) {
@@ -300,18 +313,21 @@ public class OrderOverTimeEventJob {
     private Boolean filterAITEXSGSTestEvent(OrderEventJobVO eventJobVO) {
+        int aitextestDaysBetween=0;
+        int sgstestDaysBetween=0;
         String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
         String aitexTestFinishResult = eventJobVO.getTrackStageInfo().getAitexTestFinishResult();
         String sgsTestFinishResult = eventJobVO.getTrackStageInfo().getSgsTestFinishResult();
         String sgsTestFinishTime = eventJobVO.getTrackStageInfo().getSgsTestFinishTime();
         String aitexTestFinishTime = eventJobVO.getTrackStageInfo().getAitexTestFinishTime();
-        if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(aitexTestFinishResult) && StringUtils.isNotBlank(aitexTestFinishTime) ||
-                StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(sgsTestFinishResult) && StringUtils.isNotBlank(sgsTestFinishTime)) {
-            int aitextestDaysBetween = getDaysBetween(aitexTestFinishResult, aitexTestFinishTime, orderHodTime);
-            int sgstestDaysBetween = getDaysBetween(sgsTestFinishResult, sgsTestFinishTime, orderHodTime);
-            if (aitextestDaysBetween == Constant.THREE || sgstestDaysBetween == Constant.LOCK_ERROR_TIMES || aitextestDaysBetween == Constant.NEGATIVE_ONE || sgstestDaysBetween == Constant.NEGATIVE_ONE) {
-                return true;
-            }
+        if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(aitexTestFinishResult) && StringUtils.isNotBlank(aitexTestFinishTime)){
+            aitextestDaysBetween = getDaysBetween(aitexTestFinishResult, aitexTestFinishTime, orderHodTime);
+        }
+        if(StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(sgsTestFinishResult) && StringUtils.isNotBlank(sgsTestFinishTime)){
+            sgstestDaysBetween = getDaysBetween(sgsTestFinishResult, sgsTestFinishTime, orderHodTime);
+        }
+        if (Constant.THREE == aitextestDaysBetween  || Constant.THREE == sgstestDaysBetween || Constant.NEGATIVE_ONE == aitextestDaysBetween   || Constant.NEGATIVE_ONE == sgstestDaysBetween  ) {
+            return true;
         }
         return false;
@@ -321,7 +337,7 @@ public class OrderOverTimeEventJob {
     private Boolean filterBarcodeArrivalEvent(OrderEventJobVO eventJobVO) {
         String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
         String lastArrivalTime = eventJobVO.getTrackStageInfo().getLatestArrivalTime();
-        if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(lastArrivalTime)) {
+        if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(lastArrivalTime) && !(lastArrivalTime.contains("ok"))) {
             LocalDate orderHodTimelocalDate = DateUtils.parseDate(orderHodTime);
             LocalDate lastArrivalTimelocalDate = DateUtils.parseDate(lastArrivalTime);
             if (ChronoUnit.DAYS.between(lastArrivalTimelocalDate, orderHodTimelocalDate) == Constant.SEVEN) {
@@ -334,7 +350,7 @@ public class OrderOverTimeEventJob {
     private Boolean filterLatestDCEvent(OrderEventJobVO eventJobVO) {
         String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
         String latestBkTime = eventJobVO.getTrackStageInfo().getLatestBkTime();
-        if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(latestBkTime)) {
+        if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(latestBkTime) && !(latestBkTime.contains("ok"))) {
             LocalDate latestBkTimelocalDate = DateUtils.parseDate(latestBkTime);
             LocalDate orderHodTimelocalDate = DateUtils.parseDate(orderHodTime);
             if (ChronoUnit.DAYS.between(latestBkTimelocalDate, orderHodTimelocalDate) == Constant.ENABLE_TEN) {
@@ -369,4 +385,15 @@ public class OrderOverTimeEventJob {
         }
         return Constant.ZERO;
     }
-}
+
+    public OrderBaseInfoVO  getDateFormat(String productionDepartmentConsignTime,String orderHodTime){
+        String substring = productionDepartmentConsignTime.substring(0, 10);
+        String substring1 = orderHodTime.substring(0, 10);
+        String productionDepartmentConsignTimeFormat = DateUtils.format(DateUtils.parseDate(substring, DATE), DateUtils.DATE);
+        String orderHodTimeFormat = DateUtils.format(DateUtils.parseDate(substring1,DATE), DateUtils.DATE);
+        OrderBaseInfoVO orderBaseInfoVO = new OrderBaseInfoVO();
+        orderBaseInfoVO.setProductionDepartmentConsignTime(productionDepartmentConsignTimeFormat);
+        orderBaseInfoVO.setOrderHodTime(orderHodTimeFormat);
+        return orderBaseInfoVO;
+    }
+}
 \ No newline at end of file
+package com.order.erp.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.order.erp.domain.dto.order.CheckBillMappingDO;
+
+/**
+ * 生产科对账单应收账单映射表(CheckBillMapping)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:37
+ */
+public interface CheckBillMappingMapper extends BaseMapper<CheckBillMappingDO> {
+
+
+}
+
+package com.order.erp.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.order.erp.domain.dto.order.InvoiceBillMappingDO;
+
+/**
+ * 应收款账单关联订单映射表(InvoiceBillMapping)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:36
+ */
+public interface InvoiceBillMappingMapper extends BaseMapper<InvoiceBillMappingDO> {
+
+
+}
+
+package com.order.erp.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+public interface InvoiceBillOrderMapper extends BaseMapper<InvoiceBillOrderDO> {
+
+
+}
+
@@ -31,7 +31,8 @@ public interface OrderBaseInfoMapper extends BaseMapper&lt;OrderBaseInfoDO&gt; {
     List<QueryProjectNoAndInnerNoDto> queryProjectNoAndInnerNoDto(@Param("flag") Boolean flag,
                                                                   @Param("dto") QueryProjectNoAndInnerNoDto dto);
-    @Select("SELECT * FROM order_base_info WHERE order_status!=50 and enable_flag=10 and DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(create_time);")
+//    @Select("SELECT * FROM order_base_info WHERE order_status!=50 and enable_flag=10 and DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(create_time);")
+@Select("SELECT * FROM order_base_info WHERE  enable_flag=10 and DATE_SUB(CURDATE(), INTERVAL 3 MONTH) <= date(create_time);")
      List<OrderBaseInfoDO> getEventList();
 }
+package com.order.erp.mapper.order;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.order.erp.domain.dto.order.ProducePaymentCheckBillOrderDO;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+public interface ProducePaymentCheckBillOrderMapper extends BaseMapper<ProducePaymentCheckBillOrderDO> {
+
+
+}
+
@@ -21,5 +21,7 @@ public interface ReceiveEmailMappingMapper extends BaseMapper&lt;ReceiveEmailMappin
     ReceiveEmailMappingDO getReceiveEmailMappingDO(@Param("id") Long id);
 @Select("select * from receive_email_mapping where enable_flag in (#{10},#{30})")
     List<ReceiveEmailMappingDO> listGetAll(@Param("10")int enableFlag,@Param("30") int enableFlag1);
+    @Select("select * from receive_email_mapping where type_value = #{typeValue}")
+    List<ReceiveEmailMappingDO> byTypeValueReceiveEmailMappingDO(@Param("typeValue") String  typeValue);
 }
@@ -24,6 +24,14 @@ public interface LocalStorageService extends IService&lt;LocalStorageDO&gt; {
      */
     ServerResult uploadByAliOss(String name, MultipartFile file);
+    /**
+     *
+     * @param name
+     * @param file
+     * @return
+     */
+    ServerResult uploadFileByAliOss(String name, MultipartFile file);
+
     ServerResult create(String name, MultipartFile file);
     /**
@@ -97,6 +97,8 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
     @Resource
     private DataScope dataScope;
+    @Resource
+    private DictionaryService dictionaryService;
     /**
      * 通过ID查询单条数据
      * <p>
@@ -181,14 +183,19 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         if (Objects.nonNull(adminUserVO.getId())) {
             adminUserVO.setId(null);
         }
-        List<AdminUserDO> userDOS = list(new LambdaQueryWrapper<AdminUserDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+        List<AdminUserDO> byPhoneUserDOS = list(new LambdaQueryWrapper<AdminUserDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(AdminUserDO::getPhone, adminUserVO.getPhone()));
-        if (CollectionUtils.isNotEmpty(userDOS)) {
+        if (CollectionUtils.isNotEmpty(byPhoneUserDOS)) {
             throw new BusinessException("手机号已被注册");
         }
+        List<AdminUserDO> byUserNameUserDOS = list(new LambdaQueryWrapper<AdminUserDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(AdminUserDO::getUserName, adminUserVO.getUserName()));
+        if (CollectionUtils.isNotEmpty(byUserNameUserDOS)) {
+            throw new BusinessException("用户名已存在");
+        }
         AdminUserDO adminUserDo = BeanUtil.copyProperties(adminUserVO, AdminUserDO.class);
-        if (StringUtils.isNotBlank(adminUserVO.getUserName())) {
-            adminUserDo.setNickName(adminUserVO.getUserName());
+        if(StringUtils.isNotBlank(adminUserVO.getEmail())){
+            adminUserDo.setEmail(adminUserVO.getEmail());
         }
         if (StringUtils.isNotBlank(adminUserVO.getNickName())) {
             adminUserDo.setUserName(adminUserVO.getNickName());
@@ -206,6 +213,17 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
             roleIds.add(adminUserVO.getRoleId());
             authRole(AdminAuthUserVO.builder().userId(adminUserDo.getId()).roleIds(roleIds).build());
         }
+        //创建生产科角色顺便添加到dictionary的生产科中。
+        if(Constant.SIX==adminUserVO.getRoleId().intValue()){
+            DictionaryVO dictionaryVO = new DictionaryVO();
+            dictionaryVO.setRemark("生产科");
+            dictionaryVO.setDictCode("productionDepartment");
+            dictionaryVO.setDictName("生产科");
+            dictionaryVO.setDictValue(adminUserVO.getNickName());
+            int count = dictionaryService.count();
+            dictionaryVO.setSort(count+1);
+            dictionaryService.add(dictionaryVO);
+        }
         return ServerResult.success();
     }
@@ -14,6 +14,7 @@ import com.order.erp.common.utils.FileUtil;
 import com.order.erp.common.utils.StringUtils;
 import com.order.erp.config.AliOssConfig;
 import com.order.erp.domain.dto.LocalStorageDO;
+import com.order.erp.domain.vo.FileRespVO;
 import com.order.erp.domain.vo.ImageRespVO;
 import com.order.erp.domain.vo.LocalStorageQueryVO;
 import com.order.erp.domain.vo.LocalStorageVO;
@@ -51,6 +52,26 @@ public class LocalStorageServiceImpl extends ServiceImpl&lt;LocalStorageMapper, Loc
     private long maxSize;
     @Override
+    public ServerResult uploadFileByAliOss(String name, MultipartFile file) {
+        FileUtil.checkSize(maxSize, file.getSize());
+        String fileName = AliOssUtil.getUniqueFileName(name);
+        String tempFileName = "Thumbnails" + Constant.CROSS_BAR_CHARACTER + fileName;
+        FileRespVO fileRespVO = new FileRespVO();
+        try {
+            File tempFile = new File(path + "files" + File.separator + tempFileName);
+            if (AliOssUtil.upload(AliOssConfig.ALIYUN_BUCKET, fileName, file.getBytes())) {
+                String fileUrl = AliOssUtil.createUrl(AliOssConfig.ALIYUN_BUCKET, fileName, new DateTime().plusYears(Constant.ENABLE_TEN).toDate());
+                fileRespVO.setFileUrl(fileUrl);
+                FileUtil.del(tempFile);
+            }
+            return ServerResult.success(fileRespVO);
+        } catch (Exception e) {
+            log.error("上传文件异常：{}", e.getMessage());
+            throw new BusinessException(ServerResultCode.UPLOAD_IMAGES_ERROR);
+        }
+    }
+
+    @Override
     public ServerResult uploadByAliOss(String name, MultipartFile file) {
         FileUtil.checkSize(maxSize, file.getSize());
         String fileName = AliOssUtil.getUniqueFileName(name);
+package com.order.erp.service.order;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.order.CheckBillMappingDO;
+import com.order.erp.domain.vo.order.CheckBillMappingQueryVO;
+import com.order.erp.domain.vo.order.CheckBillMappingVO;
+
+/**
+ * 生产科对账单应收账单映射表(CheckBillMapping)表服务接口
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:37
+ */
+public interface CheckBillMappingService extends IService<CheckBillMappingDO> {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param checkBillMappingQueryVO 主键
+     * @return 实例对象
+     */
+    ServerResult queryById(CheckBillMappingQueryVO checkBillMappingQueryVO);
+
+    /**
+     * 分页查询
+     *
+     * @param checkBillMappingQueryVO 筛选条件
+     * @return 查询结果
+     */
+    ServerResult list(CheckBillMappingQueryVO checkBillMappingQueryVO);
+
+    /**
+     * 新增数据
+     *
+     * @param checkBillMappingVO 数据VO
+     * @return 新增结果
+     */
+    ServerResult add(CheckBillMappingVO checkBillMappingVO);
+
+    /**
+     * 修改数据
+     *
+     * @param checkBillMappingVO 数据VO
+     * @return 编辑结果
+     */
+    ServerResult edit(CheckBillMappingVO checkBillMappingVO);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param checkBillMappingQueryVO 筛选条件
+     * @return 是否成功
+     */
+    ServerResult deleteById(CheckBillMappingQueryVO checkBillMappingQueryVO);
+
+}
+package com.order.erp.service.order;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.order.InvoiceBillMappingDO;
+import com.order.erp.domain.vo.order.InvoiceBillMappingQueryVO;
+import com.order.erp.domain.vo.order.InvoiceBillMappingVO;
+
+/**
+ * 应收款账单关联订单映射表(InvoiceBillMapping)表服务接口
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:36
+ */
+public interface InvoiceBillMappingService extends IService<InvoiceBillMappingDO> {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param invoiceBillMappingQueryVO 主键
+     * @return 实例对象
+     */
+    ServerResult queryById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO);
+
+    /**
+     * 分页查询
+     *
+     * @param invoiceBillMappingQueryVO 筛选条件
+     * @return 查询结果
+     */
+    ServerResult list(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO);
+
+    /**
+     * 新增数据
+     *
+     * @param invoiceBillMappingVO 数据VO
+     * @return 新增结果
+     */
+    ServerResult add(InvoiceBillMappingVO invoiceBillMappingVO);
+
+    /**
+     * 修改数据
+     *
+     * @param invoiceBillMappingVO 数据VO
+     * @return 编辑结果
+     */
+    ServerResult edit(InvoiceBillMappingVO invoiceBillMappingVO);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param invoiceBillMappingQueryVO 筛选条件
+     * @return 是否成功
+     */
+    ServerResult deleteById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO);
+
+}
+package com.order.erp.service.order;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
+import com.order.erp.domain.vo.order.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)表服务接口
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+public interface InvoiceBillOrderService extends IService<InvoiceBillOrderDO> {
+
+    /**
+     * 分页查询
+     *
+     * @param invoiceBillOrderQueryVO 筛选条件
+     * @return 查询结果
+     */
+    ServerResult listByPage(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO);
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    ServerResult listBaseOrderInfoBy(InvoiceBaseOrderQueryVO queryVO);
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    ServerResult listAnalysisBy(InvoiceBillAnalysisVO queryVO);
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    ServerResult export(HttpServletResponse response, InvoiceBillAnalysisVO queryVO) throws IOException;
+
+    /**
+     * 新增数据
+     *
+     * @param createVO 数据VO
+     * @return 新增结果
+     */
+    ServerResult create(InvoiceBillCreateVO createVO);
+
+    /**
+     *
+     * @param createVO
+     * @return
+     */
+    ServerResult getBackRefundDate(InvoiceBillCreateVO createVO);
+
+    /**
+     * 更新扣款信息
+     *
+     * @param deductInfoVO 数据VO
+     * @return 编辑结果
+     */
+    ServerResult updateDeductInfo(InvoiceBillDeductInfoVO deductInfoVO);
+
+    /**
+     * 更新其他金额信息
+     *
+     * @param amountInfoVO
+     * @return
+     */
+    ServerResult updateAmountInfo(InvoiceBillAmountInfoVO amountInfoVO);
+
+    /**
+     * 提交审核
+     *
+     * @param commitApplyVO
+     * @return
+     */
+    ServerResult commitApply(InvoiceBillCommitApplyVO commitApplyVO);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param invoiceBillOrderQueryVO 筛选条件
+     * @return 是否成功
+     */
+    ServerResult deleteById(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO);
+
+}
@@ -6,7 +6,9 @@ import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.excel4j.exceptions.Excel4JException;
 import com.order.erp.domain.dto.order.OrderBaseInfoDO;
 import com.order.erp.domain.vo.order.*;
+import freemarker.template.TemplateException;
+import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
@@ -89,7 +91,7 @@ public interface OrderBaseInfoService extends IService&lt;OrderBaseInfoDO&gt; {
      * @param updateVO 数据VO
      * @return 编辑结果
      */
-    ServerResult edit(OrderUpdateVO updateVO);
+    ServerResult edit(OrderUpdateVO updateVO) ;
     /**
      * 通过主键删除数据
@@ -99,6 +101,7 @@ public interface OrderBaseInfoService extends IService&lt;OrderBaseInfoDO&gt; {
      */
     ServerResult deleteById(OrderBaseInfoQueryVO orderBaseInfoQueryVO);
+
     long countByOrderStatus(Integer orderFinish);
     long countRecentMonthByOrderStatus(Integer orderFinish);
@@ -113,4 +116,5 @@ public interface OrderBaseInfoService extends IService&lt;OrderBaseInfoDO&gt; {
     ServerResult checkChargeOrderCount(List<Long> orderIds);
     List<OrderBaseInfoDO>  getEventList();
+
 }
@@ -3,8 +3,9 @@ package com.order.erp.service.order;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.dto.order.OrderOpinionLogDO;
+import com.order.erp.domain.vo.order.OrderOpinionLogVO;
 public interface OrderOpinionLogService extends IService<OrderOpinionLogDO> {
-    ServerResult queryById(OrderOpinionLogDO orderOpinionLogDO);
+    ServerResult queryById(OrderOpinionLogVO orderOpinionLogVo);
 }
+package com.order.erp.service.order;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.domain.dto.order.ProducePaymentCheckBillOrderDO;
+import com.order.erp.domain.vo.order.ProducePaymentCheckBillOrderQueryVO;
+import com.order.erp.domain.vo.order.ProducePaymentCheckBillOrderVO;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)表服务接口
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+public interface ProducePaymentCheckBillOrderService extends IService<ProducePaymentCheckBillOrderDO> {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param producePaymentCheckBillOrderQueryVO 主键
+     * @return 实例对象
+     */
+    ServerResult queryById(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO);
+
+    /**
+     * 分页查询
+     *
+     * @param producePaymentCheckBillOrderQueryVO 筛选条件
+     * @return 查询结果
+     */
+    ServerResult list(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO);
+
+    /**
+     * 新增数据
+     *
+     * @param producePaymentCheckBillOrderVO 数据VO
+     * @return 新增结果
+     */
+    ServerResult add(ProducePaymentCheckBillOrderVO producePaymentCheckBillOrderVO);
+
+    /**
+     * 修改数据
+     *
+     * @param producePaymentCheckBillOrderVO 数据VO
+     * @return 编辑结果
+     */
+    ServerResult edit(ProducePaymentCheckBillOrderVO producePaymentCheckBillOrderVO);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param producePaymentCheckBillOrderQueryVO 筛选条件
+     * @return 是否成功
+     */
+    ServerResult deleteById(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO);
+
+}
+package com.order.erp.service.order.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.utils.PageUtils;
+import com.order.erp.domain.dto.order.CheckBillMappingDO;
+import com.order.erp.domain.vo.order.CheckBillMappingQueryVO;
+import com.order.erp.domain.vo.order.CheckBillMappingVO;
+import com.order.erp.mapper.order.CheckBillMappingMapper;
+import com.order.erp.service.order.CheckBillMappingService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 生产科对账单应收账单映射表(CheckBillMapping)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:37
+ */
+@Slf4j
+@Service
+public class CheckBillMappingServiceImpl extends ServiceImpl<CheckBillMappingMapper, CheckBillMappingDO> implements CheckBillMappingService {
+
+
+    /**
+     * 通过ID查询单条数据
+     * <p>
+     * checkBillMappingQueryVO 主键
+     *
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult queryById(CheckBillMappingQueryVO checkBillMappingQueryVO) {
+        if (Objects.isNull(checkBillMappingQueryVO.getId())) {
+            return ServerResult.fail("id 不能为空");
+        }
+        CheckBillMappingDO CheckBillMappingDo = getById(checkBillMappingQueryVO.getId());
+        if (Objects.isNull(CheckBillMappingDo)) {
+            return ServerResult.success(null);
+        }
+        return ServerResult.success(BeanUtil.copyProperties(CheckBillMappingDo, CheckBillMappingVO.class));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param checkBillMappingQueryVO 筛选条件
+     * @return 查询结果
+     */
+    @Override
+    public ServerResult list(CheckBillMappingQueryVO checkBillMappingQueryVO) {
+
+        LambdaQueryWrapper<CheckBillMappingDO> queryWapper = new LambdaQueryWrapper<CheckBillMappingDO>()
+                .eq(CheckBillMappingDO::getEnableFlag, Constant.ENABLE_TEN)
+                .orderByDesc(CheckBillMappingDO::getId);
+        Page page = new Page<>(checkBillMappingQueryVO.getPage(), checkBillMappingQueryVO.getPageSize());
+        IPage<CheckBillMappingDO> iPage = page(page, queryWapper);
+        checkBillMappingQueryVO.setTotal(Long.valueOf(iPage.getTotal()).intValue());
+        return ServerResult.success(PageUtils.getPageReturn(null, checkBillMappingQueryVO));
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param checkBillMappingVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult add(CheckBillMappingVO checkBillMappingVO) {
+        //todo 校验
+        if (Objects.nonNull(checkBillMappingVO.getId())) {
+            checkBillMappingVO.setId(null);
+        }
+        CheckBillMappingDO checkBillMappingDo = BeanUtil.copyProperties(checkBillMappingVO, CheckBillMappingDO.class);
+
+        save(checkBillMappingDo);
+
+        return ServerResult.success();
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param checkBillMappingVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult edit(CheckBillMappingVO checkBillMappingVO) {
+        //todo 校验
+        if (Objects.isNull(checkBillMappingVO.getId())) {
+            return ServerResult.fail("id 不能为空");
+        }
+        CheckBillMappingDO checkBillMappingDo = BeanUtil.copyProperties(checkBillMappingVO, CheckBillMappingDO.class);
+
+        updateById(checkBillMappingDo);
+
+        return ServerResult.success();
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param checkBillMappingQueryVO 筛选条件
+     * @return 是否成功
+     */
+    @Override
+    public ServerResult deleteById(CheckBillMappingQueryVO checkBillMappingQueryVO) {
+        List<Long> ids = checkBillMappingQueryVO.getIds();
+        if (CollUtil.isEmpty(ids)) {
+            return ServerResult.fail("ids 参数不能为空");
+        }
+        List<CheckBillMappingDO> checkBillMappingList = listByIds(ids);
+        if (CollUtil.isEmpty(checkBillMappingList)) {
+            return ServerResult.success();
+        }
+        //todo 校验是否可以逻辑删除
+        LambdaUpdateWrapper<CheckBillMappingDO> updateWrapper = new LambdaUpdateWrapper<CheckBillMappingDO>()
+                .in(CheckBillMappingDO::getId, ids)
+                .set(CheckBillMappingDO::getEnableFlag, Constant.UNABLE_TWENTY);
+        update(updateWrapper);
+        return ServerResult.success();
+    }
+}
+package com.order.erp.service.order.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.utils.PageUtils;
+import com.order.erp.domain.dto.order.InvoiceBillMappingDO;
+import com.order.erp.domain.vo.order.InvoiceBillMappingQueryVO;
+import com.order.erp.domain.vo.order.InvoiceBillMappingVO;
+import com.order.erp.mapper.order.InvoiceBillMappingMapper;
+import com.order.erp.service.order.InvoiceBillMappingService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 应收款账单关联订单映射表(InvoiceBillMapping)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:36
+ */
+@Slf4j
+@Service
+public class InvoiceBillMappingServiceImpl extends ServiceImpl<InvoiceBillMappingMapper, InvoiceBillMappingDO> implements InvoiceBillMappingService {
+
+
+    /**
+     * 通过ID查询单条数据
+     * <p>
+     * invoiceBillMappingQueryVO 主键
+     *
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult queryById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO) {
+        if (Objects.isNull(invoiceBillMappingQueryVO.getId())) {
+            return ServerResult.fail("id 不能为空");
+        }
+        InvoiceBillMappingDO InvoiceBillMappingDo = getById(invoiceBillMappingQueryVO.getId());
+        if (Objects.isNull(InvoiceBillMappingDo)) {
+            return ServerResult.success(null);
+        }
+        return ServerResult.success(BeanUtil.copyProperties(InvoiceBillMappingDo, InvoiceBillMappingVO.class));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param invoiceBillMappingQueryVO 筛选条件
+     * @return 查询结果
+     */
+    @Override
+    public ServerResult list(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO) {
+
+        LambdaQueryWrapper<InvoiceBillMappingDO> queryWapper = new LambdaQueryWrapper<InvoiceBillMappingDO>()
+                .eq(InvoiceBillMappingDO::getEnableFlag, Constant.ENABLE_TEN)
+                .orderByDesc(InvoiceBillMappingDO::getId);
+        Page page = new Page<>(invoiceBillMappingQueryVO.getPage(), invoiceBillMappingQueryVO.getPageSize());
+        IPage<InvoiceBillMappingDO> iPage = page(page, queryWapper);
+        invoiceBillMappingQueryVO.setTotal(Long.valueOf(iPage.getTotal()).intValue());
+        return ServerResult.success(PageUtils.getPageReturn(null, invoiceBillMappingQueryVO));
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param invoiceBillMappingVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult add(InvoiceBillMappingVO invoiceBillMappingVO) {
+        //todo 校验
+        if (Objects.nonNull(invoiceBillMappingVO.getId())) {
+            invoiceBillMappingVO.setId(null);
+        }
+        InvoiceBillMappingDO invoiceBillMappingDo = BeanUtil.copyProperties(invoiceBillMappingVO, InvoiceBillMappingDO.class);
+
+        save(invoiceBillMappingDo);
+
+        return ServerResult.success();
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param invoiceBillMappingVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult edit(InvoiceBillMappingVO invoiceBillMappingVO) {
+        //todo 校验
+        if (Objects.isNull(invoiceBillMappingVO.getId())) {
+            return ServerResult.fail("id 不能为空");
+        }
+        InvoiceBillMappingDO invoiceBillMappingDo = BeanUtil.copyProperties(invoiceBillMappingVO, InvoiceBillMappingDO.class);
+
+        updateById(invoiceBillMappingDo);
+
+        return ServerResult.success();
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param invoiceBillMappingQueryVO 筛选条件
+     * @return 是否成功
+     */
+    @Override
+    public ServerResult deleteById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO) {
+        List<Long> ids = invoiceBillMappingQueryVO.getIds();
+        if (CollUtil.isEmpty(ids)) {
+            return ServerResult.fail("ids 参数不能为空");
+        }
+        List<InvoiceBillMappingDO> invoiceBillMappingList = listByIds(ids);
+        if (CollUtil.isEmpty(invoiceBillMappingList)) {
+            return ServerResult.success();
+        }
+        //todo 校验是否可以逻辑删除
+        LambdaUpdateWrapper<InvoiceBillMappingDO> updateWrapper = new LambdaUpdateWrapper<InvoiceBillMappingDO>()
+                .in(InvoiceBillMappingDO::getId, ids)
+                .set(InvoiceBillMappingDO::getEnableFlag, Constant.UNABLE_TWENTY);
+        update(updateWrapper);
+        return ServerResult.success();
+    }
+}
+package com.order.erp.service.order.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.stupdit1t.excel.common.PoiWorkbookType;
+import com.github.stupdit1t.excel.core.ExcelHelper;
+import com.github.stupdit1t.excel.style.CellPosition;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.constant.ServerResultCode;
+import com.order.erp.common.exception.BusinessException;
+import com.order.erp.common.utils.DateUtils;
+import com.order.erp.common.utils.StringUtils;
+import com.order.erp.common.utils.TransactionHelper;
+import com.order.erp.config.DataScope;
+import com.order.erp.domain.ApplyStatusEnum;
+import com.order.erp.domain.ApplyTypeEnum;
+import com.order.erp.domain.RoleEnum;
+import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.SystemSettingDO;
+import com.order.erp.domain.dto.order.*;
+import com.order.erp.domain.vo.order.*;
+import com.order.erp.mapper.order.InvoiceBillOrderMapper;
+import com.order.erp.service.SystemSettingService;
+import com.order.erp.service.order.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 应收款账单表(InvoiceBillOrder)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:34
+ */
+@Slf4j
+@Service
+public class InvoiceBillOrderServiceImpl extends ServiceImpl<InvoiceBillOrderMapper, InvoiceBillOrderDO> implements InvoiceBillOrderService {
+
+
+    @Resource
+    private OrderBaseInfoService orderBaseInfoService;
+
+    @Resource
+    private OrderProfitAnalysisService profitAnalysisService;
+
+    @Resource
+    private InvoiceBillMappingService invoiceBillMappingService;
+
+    @Resource
+    private OrderFieldLockApplyService orderFieldLockApplyService;
+
+    @Resource
+    private SystemSettingService systemSettingService;
+
+    @Resource
+    private DataScope dataScope;
+
+    @Resource
+    private TransactionHelper transactionHelper;
+
+
+    /**
+     * 分页查询
+     *
+     * @param queryVO 筛选条件
+     * @return 查询结果
+     */
+    @Override
+    public ServerResult listByPage(InvoiceBillOrderQueryVO queryVO) {
+        LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
+        Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
+        IPage<InvoiceBillOrderDO> iPage = page(page, queryWrapper);
+        return ServerResult.success(iPage);
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private LambdaQueryWrapper<InvoiceBillOrderDO> getQueryWrapper(InvoiceBillOrderQueryVO queryVO) {
+        LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = new LambdaQueryWrapper<InvoiceBillOrderDO>()
+                .eq(InvoiceBillOrderDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(StringUtils.isNotBlank(queryVO.getInvoiceNo()), InvoiceBillOrderDO::getInvoiceNo, queryVO.getInvoiceNo())
+                .eq(Objects.nonNull(queryVO.getStatus()), InvoiceBillOrderDO::getStatus, queryVO.getStatus())
+                .ge(StringUtils.isNotBlank(queryVO.getStartTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getStartTime())
+                .le(StringUtils.isNotBlank(queryVO.getEndTime()), InvoiceBillOrderDO::getCreateTime, queryVO.getEndTime())
+                .orderByDesc(InvoiceBillOrderDO::getId);
+        if (CollectionUtils.isNotEmpty(queryVO.getIds())) {
+            queryWrapper.in(InvoiceBillOrderDO::getId, queryVO.getIds());
+        } else {
+            Set<Long> billOrderIds = filterBillOrderIdsBy(queryVO);
+            queryWrapper.in(CollectionUtils.isNotEmpty(billOrderIds), InvoiceBillOrderDO::getId, billOrderIds);
+        }
+        return queryWrapper;
+    }
+
+    @Override
+    public ServerResult listBaseOrderInfoBy(InvoiceBaseOrderQueryVO queryVO) {
+        List<InvoiceBillMappingDO> mappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(InvoiceBillMappingDO::getInvoiceNo, queryVO.getInvoiceNo()));
+        if (CollectionUtils.isEmpty(mappingDOS)) {
+            return ServerResult.success();
+        }
+        Set<Long> orderIds = mappingDOS.stream().map(InvoiceBillMappingDO::getOrderId).collect(Collectors.toSet());
+        return ServerResult.success(orderBaseInfoService.listByIds(orderIds));
+    }
+
+    @Override
+    public ServerResult listAnalysisBy(InvoiceBillAnalysisVO queryVO) {
+        return ServerResult.success(getAnalysisResult(queryVO));
+    }
+
+    @Override
+    public ServerResult export(HttpServletResponse response, InvoiceBillAnalysisVO queryVO) throws IOException {
+        InvoiceBillAnalysisResultVO resultVO = getAnalysisResult(queryVO);
+        if (Objects.isNull(resultVO)) {
+            throw new BusinessException("数据为空，不能导出！");
+        }
+        List<Map<String, Object>> list = buildExportMapVOS(resultVO);
+        if (CollectionUtils.isNotEmpty(list)) {
+            List<String> keys = new ArrayList<>(list.get(Constant.ZERO).keySet());
+
+            ExcelHelper.opsExport(PoiWorkbookType.XLSX)
+                    .opsSheet(list)
+                    .opsHeader().simple().texts(keys).done()
+                    .opsColumn().fields(keys).done()
+                    .height(CellPosition.CELL, 750)
+                    .done()
+                    .export(response.getOutputStream());
+        }
+        return ServerResult.success();
+    }
+
+    /**
+     * @param resultVO
+     * @return
+     */
+    private List<Map<String, Object>> buildExportMapVOS(InvoiceBillAnalysisResultVO resultVO) throws IOException {
+        List<InvoiceBillAnalysisExportVO> exportVOS = resultVO.getExportVOS();
+        List<Map<String, Object>> list = new ArrayList<>();
+        int i = 0;
+        for (InvoiceBillAnalysisExportVO exportVO : exportVOS) {
+            Map<String, Object> map = new LinkedHashMap<>();
+            map.put("编号", i++);
+            map.put("客户编码", exportVO.getCustomerCode());
+            map.put("INVOICE编码", exportVO.getInvoiceNo());
+            map.put("客户总金额汇总", exportVO.getCustomerTotalPrice());
+            map.put("客户扣款金额汇总", exportVO.getDeductAmount());
+            map.put("实际应收金额", exportVO.getActualReceivableAmount());
+            map.put("实际收款金额汇总", exportVO.getActualPayedAmount());
+            map.put("其他费用金额汇总", exportVO.getOtherAmount());
+            map.put("其他费用合计", exportVO.getOtherTotalAmount());
+            map.put("必须回款日期", exportVO.getBackRefundDate());
+            map.put("实际回款日期", exportVO.getActualRefundDate());
+            list.add(map);
+        }
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("编号", "合计");
+        map.put("客户编码", "");
+        map.put("INVOICE编码", "");
+        map.put("客户总金额汇总", resultVO.getCustomerTotalPrice());
+        map.put("客户扣款金额汇总", resultVO.getDeductAmount());
+        map.put("实际应收金额", resultVO.getActualReceivableAmount());
+        map.put("实际收款金额汇总", resultVO.getActualPayedAmount());
+        map.put("其他费用金额汇总", resultVO.getOtherAmount());
+        map.put("其他费用合计", resultVO.getOtherTotalAmount());
+        map.put("必须回款日期", "");
+        map.put("实际回款日期", "");
+        list.add(map);
+        return list;
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private InvoiceBillAnalysisResultVO getAnalysisResult(InvoiceBillAnalysisVO queryVO) {
+        LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = getQueryWrapper(queryVO);
+        List<InvoiceBillOrderDO> invoiceBillOrderDOS = list(queryWrapper);
+        if (CollectionUtils.isEmpty(invoiceBillOrderDOS)) {
+            return null;
+        }
+        Set<Long> ids = invoiceBillOrderDOS.stream().map(InvoiceBillOrderDO::getId).collect(Collectors.toSet());
+        List<InvoiceBillMappingDO> invoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(InvoiceBillMappingDO::getInvoiceBillId, ids));
+        if (CollectionUtils.isEmpty(invoiceBillMappingDOS)) {
+            return null;
+        }
+        Map<Long, InvoiceBillMappingDO> orderBillMap = invoiceBillMappingDOS.stream().collect(Collectors.toMap(InvoiceBillMappingDO::getOrderId, Function.identity(), (x, y) -> x));
+        List<InvoiceOrderBaseItemVO> itemVOS = getInvoiceOrderBaseItems(orderBillMap);
+        Map<String, InvoiceBillOrderDO> invoiceBillOrderDOMap = invoiceBillOrderDOS.stream().collect(Collectors.toMap(InvoiceBillOrderDO::getInvoiceNo, Function.identity(), (x, y) -> x));
+        Map<String, List<InvoiceOrderBaseItemVO>> baseItemMap = itemVOS.stream().collect(Collectors.groupingBy(InvoiceOrderBaseItemVO::getInvoiceCode));
+        List<InvoiceBillAnalysisExportVO> exportVOS = wrapperAnalysisExport(invoiceBillOrderDOMap, baseItemMap);
+        return wrapperAnalysisResultVO(exportVOS);
+    }
+
+    /**
+     * @param exportVOS
+     * @return
+     */
+    private InvoiceBillAnalysisResultVO wrapperAnalysisResultVO(List<InvoiceBillAnalysisExportVO> exportVOS) {
+        if (CollectionUtils.isEmpty(exportVOS)) {
+            return null;
+        }
+        InvoiceBillAnalysisResultVO resultVO = InvoiceBillAnalysisResultVO.builder().exportVOS(exportVOS).build();
+        BigDecimal customerTotalPrice = new BigDecimal(Constant.ZERO);
+        BigDecimal deductAmount = new BigDecimal(Constant.ZERO);
+        BigDecimal actualReceivableAmount = new BigDecimal(Constant.ZERO);
+        BigDecimal actualPayedAmount = new BigDecimal(Constant.ZERO);
+        BigDecimal otherAmount = new BigDecimal(Constant.ZERO);
+        BigDecimal otherTotalAmount = new BigDecimal(Constant.ZERO);
+        for (InvoiceBillAnalysisExportVO exportVO : exportVOS) {
+            if (Objects.nonNull(exportVO.getCustomerTotalPrice())) {
+                customerTotalPrice = customerTotalPrice.add(exportVO.getCustomerTotalPrice());
+            }
+            if (Objects.nonNull(exportVO.getDeductAmount())) {
+                deductAmount = deductAmount.add(exportVO.getDeductAmount());
+            }
+            if (Objects.nonNull(exportVO.getActualReceivableAmount())) {
+                actualReceivableAmount = actualReceivableAmount.add(exportVO.getActualReceivableAmount());
+            }
+            if (Objects.nonNull(exportVO.getActualPayedAmount())) {
+                actualPayedAmount = actualPayedAmount.add(exportVO.getActualPayedAmount());
+            }
+            if (Objects.nonNull(exportVO.getOtherAmount())) {
+                otherAmount = customerTotalPrice.add(exportVO.getOtherAmount());
+            }
+            if (Objects.nonNull(exportVO.getOtherTotalAmount())) {
+                otherTotalAmount = otherTotalAmount.add(exportVO.getOtherTotalAmount());
+            }
+        }
+        resultVO.setCustomerTotalPrice(customerTotalPrice);
+        resultVO.setDeductAmount(deductAmount);
+        resultVO.setActualReceivableAmount(actualReceivableAmount);
+        resultVO.setActualPayedAmount(actualPayedAmount);
+        resultVO.setOtherAmount(otherAmount);
+        resultVO.setOtherTotalAmount(otherTotalAmount);
+        return resultVO;
+    }
+
+    /**
+     * @param invoiceBillOrderDOMap
+     * @param baseItemMap
+     * @return
+     */
+    private List<InvoiceBillAnalysisExportVO> wrapperAnalysisExport(Map<String, InvoiceBillOrderDO> invoiceBillOrderDOMap, Map<String, List<InvoiceOrderBaseItemVO>> baseItemMap) {
+        if (CollectionUtils.isEmpty(invoiceBillOrderDOMap)) {
+            return Collections.emptyList();
+        }
+        List<InvoiceBillAnalysisExportVO> results = new ArrayList<>();
+        for (Map.Entry<String, InvoiceBillOrderDO> entry : invoiceBillOrderDOMap.entrySet()) {
+            InvoiceBillOrderDO invoiceBillOrderDO = entry.getValue();
+            List<InvoiceBillAnalysisExportVO> exportVOS = transfer2analysisExportVO(invoiceBillOrderDO, baseItemMap);
+            if (CollectionUtils.isNotEmpty(exportVOS)) {
+                results.addAll(exportVOS);
+            }
+        }
+        return results;
+    }
+
+    /**
+     * @param invoiceBillOrderDO
+     * @param baseItemMap
+     * @return
+     */
+    private List<InvoiceBillAnalysisExportVO> transfer2analysisExportVO(InvoiceBillOrderDO invoiceBillOrderDO, Map<String, List<InvoiceOrderBaseItemVO>> baseItemMap) {
+        List<InvoiceBillAnalysisExportVO> results = new ArrayList<>();
+        String invoiceNo = invoiceBillOrderDO.getInvoiceNo();
+        if (baseItemMap.containsKey(invoiceNo)) {
+            List<InvoiceOrderBaseItemVO> baseItemVOS = baseItemMap.get(invoiceNo);
+            Map<String, List<InvoiceOrderBaseItemVO>> listMap = baseItemVOS.stream().collect(Collectors.groupingBy(InvoiceOrderBaseItemVO::getCustomerCode));
+            for (Map.Entry<String, List<InvoiceOrderBaseItemVO>> entry : listMap.entrySet()) {
+                String customerCode = entry.getKey();
+                List<InvoiceOrderBaseItemVO> itemVOS = entry.getValue();
+                InvoiceBillAnalysisExportVO exportVO = buildAnalysisExportVO(invoiceBillOrderDO);
+                exportVO.setCustomerCode(customerCode);
+                if (CollectionUtils.isEmpty(itemVOS)) {
+                    exportVO.setCustomerTotalPrice(new BigDecimal(Constant.ZERO));
+                } else {
+                    BigDecimal customerTotalPrice = new BigDecimal(Constant.ZERO);
+                    for (InvoiceOrderBaseItemVO itemVO : itemVOS) {
+                        customerTotalPrice = customerTotalPrice.add(Objects.nonNull(itemVO.getCustomerTotalPrice()) ? itemVO.getCustomerTotalPrice() : new BigDecimal(Constant.ZERO));
+                    }
+                    exportVO.setCustomerTotalPrice(customerTotalPrice);
+                }
+                results.add(exportVO);
+            }
+        }
+        return results;
+    }
+
+    /**
+     * @param invoiceBillOrderDO
+     * @return
+     */
+    private InvoiceBillAnalysisExportVO buildAnalysisExportVO(InvoiceBillOrderDO invoiceBillOrderDO) {
+        InvoiceBillAnalysisExportVO exportVO = new InvoiceBillAnalysisExportVO();
+        BeanUtils.copyProperties(invoiceBillOrderDO, exportVO);
+        BigDecimal actualPayedAmount = new BigDecimal(Constant.ZERO);
+        if (Objects.nonNull(invoiceBillOrderDO.getActualPayedAmount1())) {
+            actualPayedAmount = actualPayedAmount.add(invoiceBillOrderDO.getActualPayedAmount1());
+        }
+        if (Objects.nonNull(invoiceBillOrderDO.getActualPayedAmount2())) {
+            actualPayedAmount = actualPayedAmount.add(invoiceBillOrderDO.getActualPayedAmount2());
+        }
+        if (Objects.nonNull(invoiceBillOrderDO.getActualPayedAmount3())) {
+            actualPayedAmount = actualPayedAmount.add(invoiceBillOrderDO.getActualPayedAmount3());
+        }
+        exportVO.setActualPayedAmount(actualPayedAmount);
+        BigDecimal otherAmount = (Objects.nonNull(invoiceBillOrderDO.getActualReceivableAmount()) ? invoiceBillOrderDO.getActualReceivableAmount() : new BigDecimal(Constant.ZERO))
+                .subtract(exportVO.getActualPayedAmount());
+        exportVO.setOtherAmount(otherAmount);
+        BigDecimal otherTotalAmount = (Objects.nonNull(invoiceBillOrderDO.getActualReceivableAmount()) ? invoiceBillOrderDO.getActualReceivableAmount() : new BigDecimal(Constant.ZERO))
+                .subtract(exportVO.getActualPayedAmount()).subtract(otherAmount);
+        exportVO.setOtherTotalAmount(otherTotalAmount);
+        return exportVO;
+    }
+
+    /**
+     * @param mappingDOMap
+     * @return
+     */
+    private List<InvoiceOrderBaseItemVO> getInvoiceOrderBaseItems(Map<Long, InvoiceBillMappingDO> mappingDOMap) {
+        Set<Long> orderIds = mappingDOMap.keySet();
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(orderIds);
+        List<OrderProfitAnalysisDO> profitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(OrderProfitAnalysisDO::getOrderId, orderIds));
+        Map<Long, OrderBaseInfoDO> orderBaseInfoDOMap = orderBaseInfoDOList.stream().collect(Collectors.toMap(OrderBaseInfoDO::getId, Function.identity(), (x, y) -> x));
+        Map<Long, OrderProfitAnalysisDO> profitAnalysisDOMap = profitAnalysisDOS.stream().collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity(), (x, y) -> x));
+        List<InvoiceOrderBaseItemVO> baseItemVOS = new ArrayList<>();
+        for (Map.Entry<Long, OrderBaseInfoDO> entry : orderBaseInfoDOMap.entrySet()) {
+            Long orderId = entry.getKey();
+            OrderBaseInfoDO baseInfoDO = entry.getValue();
+            InvoiceOrderBaseItemVO itemVO = InvoiceOrderBaseItemVO.builder()
+                    .orderId(orderId)
+                    .customerCode(baseInfoDO.getCustomerCode())
+                    .build();
+            if (profitAnalysisDOMap.containsKey(orderId)) {
+                OrderProfitAnalysisDO profitAnalysisDO = profitAnalysisDOMap.get(orderId);
+                itemVO.setCustomerTotalPrice(Objects.isNull(profitAnalysisDO.getCustomerTotalPrice()) ? new BigDecimal(Constant.ZERO) : new BigDecimal(profitAnalysisDO.getCustomerTotalPrice()));
+            } else {
+                itemVO.setCustomerTotalPrice(new BigDecimal(Constant.ZERO));
+            }
+
+            if (mappingDOMap.containsKey(orderId)) {
+                InvoiceBillMappingDO mappingDO = mappingDOMap.get(orderId);
+                itemVO.setInvoiceCode(mappingDO.getInvoiceNo());
+            }
+            baseItemVOS.add(itemVO);
+        }
+        return baseItemVOS;
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private Set<Long> filterBillOrderIdsBy(InvoiceBillOrderQueryVO queryVO) {
+        List<Long> orderIds = filterOrderIdsBy(queryVO);
+        if (CollectionUtils.isEmpty(orderIds)) {
+            return null;
+        }
+        List<InvoiceBillMappingDO> mappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(CollectionUtils.isNotEmpty(orderIds), InvoiceBillMappingDO::getOrderId, orderIds));
+        if (CollectionUtils.isEmpty(mappingDOS)) {
+            Set<Long> ids = new HashSet<>();
+            ids.add(-1L);
+            return ids;
+        }
+        return mappingDOS.stream().map(InvoiceBillMappingDO::getInvoiceBillId).collect(Collectors.toSet());
+    }
+
+    /**
+     * @param queryVO
+     * @return
+     */
+    private List<Long> filterOrderIdsBy(InvoiceBillOrderQueryVO queryVO) {
+        Boolean flag = false;
+        if (StringUtils.isNotBlank(queryVO.getCustomerCode())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getProductionDepartment())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getCustomerPo())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getInnerNo())) {
+            flag = flag | true;
+        }
+        if (StringUtils.isNotBlank(queryVO.getProjectNo())) {
+            flag = flag | true;
+        }
+        if (!flag) {
+            return null;
+        }
+        LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = new LambdaQueryWrapper<OrderBaseInfoDO>()
+                .eq(OrderBaseInfoDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(StringUtils.isNotBlank(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
+                .eq(StringUtils.isNotBlank(queryVO.getProductionDepartment()), OrderBaseInfoDO::getProductionDepartment, queryVO.getProductionDepartment())
+                .eq(StringUtils.isNotBlank(queryVO.getCustomerPo()), OrderBaseInfoDO::getCustomerPo, queryVO.getCustomerPo())
+                .eq(StringUtils.isNotBlank(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo())
+                .eq(StringUtils.isNotBlank(queryVO.getProjectNo()), OrderBaseInfoDO::getProjectNo, queryVO.getProjectNo());
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(queryWrapper);
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            List<Long> orderIds = new ArrayList<>();
+            orderIds.add(-1L);
+            return orderIds;
+        }
+        return orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toList());
+    }
+
+    /**
+     * 创建invoice单据
+     *
+     * @param createVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult create(InvoiceBillCreateVO createVO) {
+        if (Objects.nonNull(createVO.getId())) {
+            createVO.setId(null);
+        }
+
+        validaBillOrder(createVO);
+
+        InvoiceBillOrderDO invoiceBillOrderDO = buildInvoiceBillOrderDO(createVO);
+
+        transactionHelper.run(() -> {
+            save(invoiceBillOrderDO);
+
+            invoiceBillMappingService.saveBatch(buildInvoiceBillMappingDOS(createVO, invoiceBillOrderDO));
+        });
+
+        return ServerResult.success();
+    }
+
+    @Override
+    public ServerResult getBackRefundDate(InvoiceBillCreateVO createVO) {
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(createVO.getOrderIds());
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            throw new BusinessException("勾选的订单信息不存在！");
+        }
+
+        InvoiceHoldTimeItemVO invoiceHoldTimeItemVO = getCustomerHoldTime(orderBaseInfoDOList);
+
+        return ServerResult.success(calculateBackRefundDate(invoiceHoldTimeItemVO));
+    }
+
+    /**
+     * @param invoiceHoldTimeItemVO
+     * @return
+     */
+    private String calculateBackRefundDate(InvoiceHoldTimeItemVO invoiceHoldTimeItemVO) {
+        Integer holdDays = getHoldTimeByCustomerCode(invoiceHoldTimeItemVO.getCustomerCode());
+        LocalDateTime holdTime = DateUtils.parse(invoiceHoldTimeItemVO.getHoldTime(), DateUtils.DATE_TIME).plusDays(holdDays);
+        return DateUtils.format(holdTime, DateUtils.DATE);
+    }
+
+    /**
+     * @param customerCode
+     * @return
+     */
+    private Integer getHoldTimeByCustomerCode(String customerCode) {
+        SystemSettingDO systemSettingDO = systemSettingService.getOne(new LambdaQueryWrapper<SystemSettingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(SystemSettingDO::getSettingCode, "customerCode").eq(SystemSettingDO::getSettingValue, customerCode)
+                .eq(SystemSettingDO::getRelationCode, "orderHodTime").last("limit 1"));
+        if (Objects.isNull(systemSettingDO)) {
+            return Constant.ZERO;
+        }
+        String holdTime = systemSettingDO.getRelationValue();
+        return StringUtils.isBlank(holdTime) ? Constant.ZERO : Integer.parseInt(holdTime);
+    }
+
+    /**
+     * @param orderBaseInfoDOList
+     * @return
+     */
+    private InvoiceHoldTimeItemVO getCustomerHoldTime(List<OrderBaseInfoDO> orderBaseInfoDOList) {
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            return null;
+        }
+
+        Map<String, OrderBaseInfoDO> holdTimeMap = new HashMap<String, OrderBaseInfoDO>();
+        String maxHoldTime = null;
+        for (OrderBaseInfoDO baseInfoDO : orderBaseInfoDOList) {
+            if (StringUtils.isNotBlank(baseInfoDO.getOrderHodTime())) {
+                holdTimeMap.put(baseInfoDO.getOrderHodTime(), baseInfoDO);
+                if (StringUtils.isBlank(maxHoldTime)) {
+                    maxHoldTime = baseInfoDO.getOrderHodTime();
+                } else if (maxHoldTime.compareTo(baseInfoDO.getOrderHodTime()) <= 0) {
+                    maxHoldTime = baseInfoDO.getOrderHodTime();
+                }
+            }
+        }
+        if (StringUtils.isBlank(maxHoldTime)) {
+            return null;
+        }
+        InvoiceHoldTimeItemVO itemVO = new InvoiceHoldTimeItemVO();
+        if (holdTimeMap.containsKey(maxHoldTime)) {
+            OrderBaseInfoDO baseInfoDO = holdTimeMap.get(maxHoldTime);
+            itemVO.setCustomerCode(baseInfoDO.getCustomerCode());
+            itemVO.setHoldTime(maxHoldTime);
+            itemVO.setBaseInfoDO(baseInfoDO);
+        }
+        return itemVO;
+    }
+
+    /**
+     * @param createVO
+     * @return
+     */
+    private InvoiceBillOrderDO buildInvoiceBillOrderDO(InvoiceBillCreateVO createVO) {
+        return InvoiceBillOrderDO.builder()
+                .invoiceNo(createVO.getInvoiceNo())
+                .bgUrl(createVO.getBgUrl())
+                .backRefundDate(createVO.getBackRefundDate())
+                .status(ApplyStatusEnum.NO_COMMIT.getStatus())
+                .build();
+    }
+
+    /**
+     * @param createVO
+     * @param invoiceBillOrderDO
+     * @return
+     */
+    private List<InvoiceBillMappingDO> buildInvoiceBillMappingDOS(InvoiceBillCreateVO createVO, InvoiceBillOrderDO invoiceBillOrderDO) {
+        return createVO.getOrderIds().stream().map(x -> {
+            return InvoiceBillMappingDO.builder()
+                    .orderId(x)
+                    .invoiceBillId(invoiceBillOrderDO.getId())
+                    .invoiceNo(invoiceBillOrderDO.getInvoiceNo())
+                    .build();
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * @param createVO
+     */
+    private void validaBillOrder(InvoiceBillCreateVO createVO) {
+        if (CollectionUtils.isEmpty(createVO.getOrderIds())) {
+            throw new BusinessException("请勾选订单！");
+        }
+
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(createVO.getOrderIds());
+        if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
+            throw new BusinessException("勾选的订单信息不存在！");
+        }
+
+        if (orderBaseInfoDOList.size() != createVO.getOrderIds().size()) {
+            throw new BusinessException("勾选的订单信息有误！");
+        }
+
+        String invoiceNo = createVO.getInvoiceNo();
+
+        List<InvoiceBillOrderDO> invoiceBillOrderDOS = list(new LambdaQueryWrapper<InvoiceBillOrderDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(InvoiceBillOrderDO::getInvoiceNo, invoiceNo));
+        if (CollectionUtils.isNotEmpty(invoiceBillOrderDOS)) {
+            throw new BusinessException("存在相同的invoice订单！");
+        }
+
+        List<InvoiceBillMappingDO> invoiceBillMappingDOList = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN).in(InvoiceBillMappingDO::getOrderId, createVO.getOrderIds()));
+        if (CollectionUtils.isNotEmpty(invoiceBillMappingDOList)) {
+            throw new BusinessException("该勾选的订单已经绑定其他账单了！");
+        }
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param deductInfoVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult updateDeductInfo(InvoiceBillDeductInfoVO deductInfoVO) {
+        if (Objects.isNull(deductInfoVO.getId())) {
+            throw new BusinessException("id 不能为空");
+        }
+        InvoiceBillOrderDO invoiceBillOrderDo = getById(deductInfoVO.getId());
+        if (Objects.isNull(invoiceBillOrderDo)) {
+            throw new BusinessException("应收款单据不存在");
+        }
+
+        checkCommitApply(invoiceBillOrderDo.getId());
+
+        invoiceBillOrderDo.setDeductUrl(deductInfoVO.getDeductUrl());
+        invoiceBillOrderDo.setDeductAmount(deductInfoVO.getDeductAmount());
+        updateById(invoiceBillOrderDo);
+        return ServerResult.success();
+    }
+
+    @Override
+    public ServerResult updateAmountInfo(InvoiceBillAmountInfoVO amountInfoVO) {
+        if (Objects.isNull(amountInfoVO.getId())) {
+            throw new BusinessException("id 不能为空");
+        }
+        InvoiceBillOrderDO invoiceBillOrderDo = getById(amountInfoVO.getId());
+        if (Objects.isNull(invoiceBillOrderDo)) {
+            throw new BusinessException("应收款单据不存在");
+        }
+
+        checkCommitApply(invoiceBillOrderDo.getId());
+
+        invoiceBillOrderDo.setBgUrl(amountInfoVO.getBgUrl());
+        invoiceBillOrderDo.setActualReceivableAmount(amountInfoVO.getActualReceivableAmount());
+        invoiceBillOrderDo.setActualPayedAmount1(amountInfoVO.getActualPayedAmount1());
+        invoiceBillOrderDo.setActualPayedAmount2(amountInfoVO.getActualPayedAmount2());
+        invoiceBillOrderDo.setActualPayedAmount3(amountInfoVO.getActualPayedAmount3());
+        invoiceBillOrderDo.setOtherAmount(amountInfoVO.getOtherAmount());
+        updateById(invoiceBillOrderDo);
+        return ServerResult.success();
+    }
+
+    /**
+     * @param id
+     */
+    private void checkCommitApply(Long id) {
+        OrderFieldLockApplyDO applyDO = orderFieldLockApplyService.getOne(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                .eq(OrderFieldLockApplyDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                .eq(OrderFieldLockApplyDO::getOrderId, id).last("limit 1"));
+        if (Objects.nonNull(applyDO)) {
+            throw new BusinessException("该账单还在审批中，请联系总经理审批后操作！");
+        }
+    }
+
+    @Override
+    public ServerResult commitApply(InvoiceBillCommitApplyVO commitApplyVO) {
+        InvoiceBillOrderDO invoiceBillOrderDO = getById(commitApplyVO.getId());
+        if (Objects.isNull(invoiceBillOrderDO)) {
+            throw new BusinessException("账单不存在！");
+        }
+        Long userId = dataScope.getLoginUserId();
+        checkApply(commitApplyVO, userId);
+
+        OrderFieldLockApplyDO applyDO = initOrderFieldLockApplyDO(invoiceBillOrderDO, userId);
+        transactionHelper.run(() -> {
+            orderFieldLockApplyService.save(applyDO);
+            invoiceBillOrderDO.setStatus(ApplyStatusEnum.WAIT_AUDIT.getStatus());
+            invoiceBillOrderDO.setActualRefundDate(DateUtils.format(LocalDateTime.now(), DateUtils.DATE));
+            updateById(invoiceBillOrderDO);
+        });
+        return ServerResult.success();
+    }
+
+    /**
+     * @param commitApplyVO
+     * @param userId
+     */
+    private void checkApply(InvoiceBillCommitApplyVO commitApplyVO, Long userId) {
+        List<OrderFieldLockApplyDO> applyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(OrderFieldLockApplyDO::getOrderId, commitApplyVO.getId())
+                .eq(OrderFieldLockApplyDO::getApplyUserId, userId)
+                .eq(OrderFieldLockApplyDO::getType, ApplyTypeEnum.INVOICE_BILL_APPLY.getType())
+                .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus()));
+        if (CollectionUtils.isNotEmpty(applyDOS)) {
+            throw new BusinessException(ServerResultCode.APPLY_UNLOCK_FIELD_EXIST);
+        }
+    }
+
+    /**
+     * @param invoiceBillOrderDO
+     * @param userId
+     * @return
+     */
+    private OrderFieldLockApplyDO initOrderFieldLockApplyDO(InvoiceBillOrderDO invoiceBillOrderDO, Long userId) {
+        OrderLockFieldVO lockFieldVO = new OrderLockFieldVO();
+        lockFieldVO.setInvoiceBillOrderDO(invoiceBillOrderDO);
+        return OrderFieldLockApplyDO.builder()
+                .applyUserId(userId)
+                .auditUserId(null)
+                .fields(JSONObject.toJSONString(lockFieldVO))
+                .orderId(invoiceBillOrderDO.getId())
+                .type(ApplyTypeEnum.INVOICE_BILL_APPLY.getType())
+                .remark(ApplyTypeEnum.INVOICE_BILL_APPLY.getDesc())
+                .status(ApplyStatusEnum.WAIT_AUDIT.getStatus())
+                .auditRoleCodes(RoleEnum.BUSINESS_USER.getCode() + Constant.COMMA_CHARACTER + RoleEnum.ADMIN.getCode())
+                .build();
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param invoiceBillOrderQueryVO 筛选条件
+     * @return 是否成功
+     */
+    @Override
+    public ServerResult deleteById(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
+        List<Long> ids = invoiceBillOrderQueryVO.getIds();
+        if (CollUtil.isEmpty(ids)) {
+            return ServerResult.fail("ids 参数不能为空");
+        }
+        List<InvoiceBillOrderDO> invoiceBillOrderList = listByIds(ids);
+        if (CollUtil.isEmpty(invoiceBillOrderList)) {
+            return ServerResult.success();
+        }
+        transactionHelper.run(() -> {
+            removeByIds(ids);
+            invoiceBillMappingService.remove(new LambdaQueryWrapper<InvoiceBillMappingDO>().in(InvoiceBillMappingDO::getInvoiceBillId, ids));
+        });
+
+        return ServerResult.success();
+    }
+}
@@ -27,6 +27,7 @@ import com.order.erp.domain.dto.SystemSettingDO;
 import com.order.erp.domain.dto.admin.AdminUserDO;
 import com.order.erp.domain.dto.order.*;
 import com.order.erp.domain.vo.order.*;
+import com.order.erp.job.OrderOverTimeEventJob;
 import com.order.erp.mapper.order.OrderBaseInfoMapper;
 import com.order.erp.service.SystemSettingService;
 import com.order.erp.service.admin.AdminUserService;
@@ -47,11 +48,14 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URL;
+import java.text.DecimalFormat;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import static com.order.erp.common.utils.DateUtils.DATE;
+
 /**
  * 订单基础信息表(OrderBaseInfo)表服务实现类
  *
@@ -114,8 +118,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Resource
     private EmailSendUtils emailSendUtils;
-    @Resource
-    private OrderOpinionLogService orderOpinionLogService;
+
     /**
      * 通过ID查询单条数据
@@ -198,6 +201,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             // 填充质检信息
             fillInspectionStageInfo(resultVOList);
+
             if (locked) {
                 // 填充字段锁定信息
                 fillLockFields(resultVOList);
@@ -357,7 +361,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("生产科拖货时间", StringUtils.isBlank(orderInfoResultVO.getProductionDepartmentConsignTime()) ?
                                 orderInfoResultVO.getProductionDepartmentConsignTime() :
-                                DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getProductionDepartmentConsignTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getProductionDepartmentConsignTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("生产科拖货时间", orderInfoResultVO.getProductionDepartmentConsignTime());
                     }
@@ -367,7 +371,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("订单上HOD时间", StringUtils.isBlank(orderInfoResultVO.getOrderHodTime()) ?
                                 orderInfoResultVO.getOrderHodTime() :
-                                DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getOrderHodTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(orderInfoResultVO.getOrderHodTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("订单上HOD时间", orderInfoResultVO.getOrderHodTime());
                     }
@@ -462,7 +466,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("pp date", StringUtils.isBlank(trackStageInfo.getPpTime()) ?
                                 trackStageInfo.getPpTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getPpTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getPpTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("pp date", trackStageInfo.getPpTime());
                     }
@@ -476,7 +480,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", StringUtils.isBlank(trackStageInfo.getEsoSampleSendTime()) ?
                                 trackStageInfo.getEsoSampleSendTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getEsoSampleSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getEsoSampleSendTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("EXTRA,SHOWROOM,ONLINE sample发送时间", trackStageInfo.getEsoSampleSendTime());
                     }
@@ -486,7 +490,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("shippment sample 发送时间", StringUtils.isBlank(trackStageInfo.getShippmentSampleSendTime()) ?
                                 trackStageInfo.getShippmentSampleSendTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getShippmentSampleSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getShippmentSampleSendTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("shippment sample 发送时间", trackStageInfo.getShippmentSampleSendTime());
@@ -502,7 +506,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("自测通过时间", StringUtils.isBlank(trackStageInfo.getSelfTestPassTime()) ?
                                 trackStageInfo.getSelfTestPassTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getSelfTestPassTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getSelfTestPassTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("自测通过时间", trackStageInfo.getSelfTestPassTime());
                     }
@@ -512,7 +516,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("Aitex测试发送时间", StringUtils.isBlank(trackStageInfo.getAitexTestSendTime()) ?
                                 trackStageInfo.getAitexTestSendTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getAitexTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getAitexTestSendTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("Aitex测试发送时间", trackStageInfo.getAitexTestSendTime());
                     }
@@ -526,7 +530,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("SGS测试发送时间", StringUtils.isBlank(trackStageInfo.getSgsTestSendTime()) ?
                                 trackStageInfo.getSgsTestSendTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getSgsTestSendTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getSgsTestSendTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("SGS测试发送时间", trackStageInfo.getSgsTestSendTime());
                     }
@@ -540,7 +544,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("Barcode sticker arrival time", StringUtils.isBlank(trackStageInfo.getBarcodeStickerArrivalTime()) ?
                                 trackStageInfo.getBarcodeStickerArrivalTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getBarcodeStickerArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getBarcodeStickerArrivalTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("Barcode sticker arrival time", trackStageInfo.getBarcodeStickerArrivalTime());
                     }
@@ -550,7 +554,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("最晚包材到货时间", StringUtils.isBlank(trackStageInfo.getLatestArrivalTime()) ?
                                 trackStageInfo.getLatestArrivalTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestArrivalTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestArrivalTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("最晚包材到货时间", trackStageInfo.getLatestArrivalTime());
                     }
@@ -560,7 +564,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("最晚订舱+报关资料时间", StringUtils.isBlank(trackStageInfo.getLatestBkTime()) ?
                                 trackStageInfo.getLatestBkTime() :
-                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestBkTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(trackStageInfo.getLatestBkTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("最晚订舱+报关资料时间", trackStageInfo.getLatestBkTime());
@@ -575,7 +579,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("中期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getMidCheckApplyTime()) ?
                                 inspectionStageInfo.getMidCheckApplyTime() :
-                                DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getMidCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getMidCheckApplyTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("中期验货申请时间", inspectionStageInfo.getMidCheckApplyTime());
                     }
@@ -593,7 +597,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     try {
                         map.put("尾期验货申请时间", StringUtils.isBlank(inspectionStageInfo.getEndCheckApplyTime()) ?
                                 inspectionStageInfo.getEndCheckApplyTime() :
-                                DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getEndCheckApplyTime(), DateUtils.DATE_TIME), DateUtils.DATE));
+                                DateUtils.format(DateUtils.parseDate(inspectionStageInfo.getEndCheckApplyTime(), DateUtils.DATE_TIME), DATE));
                     } catch (Exception e) {
                         map.put("尾期验货申请时间", inspectionStageInfo.getEndCheckApplyTime());
                     }
@@ -834,6 +838,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     /**
      * @param orderInfoResultVOList
      */
+
+
+    /**
+     * @param orderInfoResultVOList
+     */
     private void fillReportInfo(List<OrderInfoResultVO> orderInfoResultVOList) {
         if (CollectionUtils.isEmpty(orderInfoResultVOList)) {
             return;
@@ -1251,6 +1260,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if (Objects.nonNull(roleEnum) && roleEnum.getId().equals(RoleEnum.BUSINESS_USER.getId())) {
             queryVO.setBusinessPerson(Arrays.asList(dataScope.getUser().getNickName()));
         }
+        // 生产科
+        if(Objects.nonNull(roleEnum) && roleEnum.getId().equals(RoleEnum.PRODUCE_USER.getId())){
+            queryVO.setProductionDepartment(Arrays.asList(dataScope.getUser().getNickName()));
+        }
         if (StringUtils.isNotBlank(queryVO.getCommitUserPhone())) {
             AdminUserDO userDO = userService.getOne(new LambdaQueryWrapper<AdminUserDO>()
                     .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
@@ -1422,6 +1435,14 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         BeanUtils.copyProperties(baseInfoVO, baseInfoDO);
         baseInfoDO.setOrderStatus(OrderStatusEnum.CREATE_FINISH.getStatus());
         save(baseInfoDO);
+        OrderTrackStageDO orderTrackStageDO = new OrderTrackStageDO();
+        orderTrackStageDO.setOrderId(baseInfoDO.getId());
+        orderTrackStageDO.setOrderStatus(OrderStatusEnum.CREATE_FINISH.getStatus());
+        trackStageService.save(orderTrackStageDO);
+        OrderInspectionStageDO orderInspectionStageDO = new OrderInspectionStageDO();
+        orderInspectionStageDO.setOrderId(baseInfoDO.getId());
+        orderInspectionStageDO.setOrderStatus(OrderStatusEnum.CREATE_FINISH.getStatus());
+        inspectionStageService.save(orderInspectionStageDO);
         OrderProfitAnalysisVO profitAnalysisVO = orderAddVO.getProfitAnalysisInfo();
         if (Objects.nonNull(profitAnalysisVO)) {
@@ -1471,9 +1492,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         orderOptLogService.save(buildOrderOptLogDo(baseInfoDO.getId(), userId, OrderOptTypeEnum.ORDER_CREATE.getDesc(), null));
-        orderOpinionLogService.save(buildOrderOpinionLogDo(baseInfoDO.getId(),
-                OrderOpinionLogEnum.ORDER_PRODUCTION_COMMENT.getDesc(),
-                orderAddVO.getBaseInfo().getProductionComment()));
+
         return ServerResult.success();
     }
@@ -1488,9 +1507,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         return OrderOptLogDO.builder().orderId(orderId).userId(userId).fields(jsonString).optType(optType).build();
     }
-    private OrderOpinionLogDO buildOrderOpinionLogDo(Long orderId, String type, String field) {
-        return OrderOpinionLogDO.builder().orderId(orderId).opinionType(type).field(field).build();
-    }
+
     /**
      * @param updateVO
@@ -1570,7 +1587,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Override
     @Transactional
     public ServerResult edit(OrderUpdateVO updateVO) {
-
         //todo 校验
         if (Objects.isNull(updateVO.getOrderId())) {
             return ServerResult.fail("id 不能为空");
@@ -1582,17 +1598,12 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             throw new BusinessException(ServerResultCode.ORDER_BASE_INFO_EMPTY);
         }
         OrderOptLogDO optLogDO = new OrderOptLogDO();
-        List<OrderOpinionLogDO> orderOpinionLogDOList = new ArrayList<>();
         if (Objects.nonNull(updateVO.getBaseInfo())) {
+
             buildUpdateVO(updateVO.getBaseInfo(), orderBaseInfoDo);
             orderBaseInfoDo.setId(updateVO.getOrderId());
             optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_EDIT.getDesc(), JSONObject.toJSONString(updateVO));
             clearLockedField(updateVO.getOrderId(), userId, LockedFieldTypeEnum.ORDER_BASE);
-            if(!(updateVO.getBaseInfo().getProductionComment().equals(orderBaseInfoDo.getProductionComment()))){
-                OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_PRODUCTION_COMMENT.getDesc(),updateVO.getBaseInfo().getProductionComment());
-                orderOpinionLogDOList.add(orderOpinionLogDO);
-            }
-
         }
         if (Objects.nonNull(updateVO.getProfitAnalysisInfo())) {
             checkApply(updateVO.getOrderId(), userId, ApplyTypeEnum.ORDER_PROFIT_APPLY);
@@ -1624,11 +1635,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     trackStageDO.setPpTime(trackStageInfo.getPpTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getPpConfirmResult())) {
+
                     trackStageDO.setPpConfirmResult(trackStageInfo.getPpConfirmResult());
-                    if(!(trackStageInfo.getPpConfirmResult().equals(trackStageDO.getPpConfirmResult()))){
-                         OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_PP_CONFIRRM_RESULT.getDesc(),trackStageInfo.getPpConfirmResult());
-                         orderOpinionLogDOList.add(orderOpinionLogDO);
-                    }
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getEsoSampleSendTime())) {
                     trackStageDO.setEsoSampleSendTime(trackStageInfo.getEsoSampleSendTime());
@@ -1637,11 +1645,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     trackStageDO.setShippmentSampleSendTime(trackStageInfo.getShippmentSampleSendTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getShippmentSampleConfirmResult())) {
-                    trackStageDO.setShippmentSampleConfirmResult(trackStageInfo.getShippmentSampleConfirmResult());
-                    if(!(trackStageInfo.getShippmentSampleConfirmResult().equals(trackStageDO.getShippmentSampleConfirmResult()))){
-                        OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_SHIPMENT_SAMPLE_CONFIRM_RESULT.getDesc(),trackStageInfo.getShippmentSampleConfirmResult());
-                        orderOpinionLogDOList.add(orderOpinionLogDO);
-                    }
+                  trackStageDO.setShippmentSampleConfirmResult(trackStageInfo.getShippmentSampleConfirmResult());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSelfTestPassTime())) {
                     trackStageDO.setSelfTestPassTime(trackStageInfo.getSelfTestPassTime());
@@ -1650,21 +1654,15 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     trackStageDO.setAitexTestSendTime(trackStageInfo.getAitexTestSendTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getAitexTestFinishResult())) {
+
                     trackStageDO.setAitexTestFinishResult(trackStageInfo.getAitexTestFinishResult());
-                    if(!(trackStageInfo.getAitexTestFinishResult().equals(trackStageDO.getAitexTestFinishResult()))){
-                        OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc(),trackStageInfo.getAitexTestFinishResult());
-                        orderOpinionLogDOList.add(orderOpinionLogDO);
-                    }
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSgsTestSendTime())) {
                     trackStageDO.setSgsTestSendTime(trackStageInfo.getSgsTestSendTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSgsTestFinishResult())) {
+
                     trackStageDO.setSgsTestFinishResult(trackStageInfo.getSgsTestFinishResult());
-                    if(!(trackStageInfo.getSgsTestFinishResult().equals(trackStageDO.getSgsTestFinishResult()))){
-                        OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc(),trackStageInfo.getSgsTestFinishResult());
-                        orderOpinionLogDOList.add(orderOpinionLogDO);
-                    }
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getBarcodeStickerArrivalTime())) {
                     trackStageDO.setBarcodeStickerArrivalTime(trackStageInfo.getBarcodeStickerArrivalTime());
@@ -1751,21 +1749,23 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 AdminUserDO ProductionDepartmentUserDO = userService.getOne(new LambdaQueryWrapper<AdminUserDO>()
                         .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                         .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment()));
-                OrderEventJobVO orderEventJobVO = new OrderEventJobVO();
-                orderEventJobVO.setInspectionStageInfo(inspectionStageInfo);
-                //一旦修改完质检信息就自动发送邮件对应的生产科。多次编辑保存多次发送。
-                if (StringUtils.isNotBlank(inspectionStageInfo.getEndCheckApplyTime())) {
-                    //尾期验货报告。
-                    emailSendUtils.sendEmail(EmailTemplateEnum.END_CHECK_REPORT_TEMPLATE, ProductionDepartmentUserDO.getEmail(), orderEventJobVO);
+                if( Objects.nonNull(ProductionDepartmentUserDO) && StringUtils.isNotBlank(ProductionDepartmentUserDO.getEmail())){
+                sendOrderInspectionStage(updateVO,inspectionStageInfo);
                 }
-                //中期验货报告。
-                emailSendUtils.sendEmail(EmailTemplateEnum.MID_CHECK_REPORT_TEMPLATE, ProductionDepartmentUserDO.getEmail(), orderEventJobVO);
             } else {
                 inspectionStageDO = new OrderInspectionStageDO();
                 BeanUtils.copyProperties(updateVO.getInspectionStageInfo(), inspectionStageDO);
                 inspectionStageDO.setOrderId(updateVO.getOrderId());
                 inspectionStageDO.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus());
                 inspectionStageService.save(inspectionStageDO);
+                OrderBaseInfoDO orderBaseInfoDO = baseInfoService.getById(updateVO.getOrderId());
+                AdminUserDO ProductionDepartmentUserDO = userService.getOne(new LambdaQueryWrapper<AdminUserDO>()
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment()));
+                if( Objects.nonNull(ProductionDepartmentUserDO) && StringUtils.isNotBlank(ProductionDepartmentUserDO.getEmail())){
+                    sendOrderInspectionStage(updateVO,inspectionStageInfo);
+                }
+
             }
             orderBaseInfoDo.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus());
             optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_INSPECT_EDIT_APPLY.getDesc(), JSONObject.toJSONString(updateVO));
@@ -1773,7 +1773,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         updateById(orderBaseInfoDo);
         orderOptLogService.save(optLogDO);
-        orderOpinionLogService.saveBatch(orderOpinionLogDOList);
         return ServerResult.success();
     }
@@ -1943,6 +1942,16 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     }
     /**
+     * 根据订单orderId计算订单的通过率。
+     *
+     * @param orderOpinionLogVO
+     * @return
+     */
+
+
+
+
+    /**
      * 根据订单状态统计订单数量
      *
      * @param orderStatus
@@ -2037,4 +2046,36 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         List<OrderBaseInfoDO> orderBaseInfoDOList = baseMapper.getEventList();
         return orderBaseInfoDOList;
     }
+
+    private void sendOrderInspectionStage(OrderUpdateVO updateVO, OrderInspectionStageVO inspectionStageInfo){
+        OrderBaseInfoDO orderBaseInfoDO = baseInfoService.getById(updateVO.getOrderId());
+        AdminUserDO ProductionDepartmentUserDO = userService.getOne(new LambdaQueryWrapper<AdminUserDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(AdminUserDO::getUserName, orderBaseInfoDO.getProductionDepartment()));
+        OrderEventJobVO orderEventJobVO = new OrderEventJobVO();
+        orderEventJobVO.setInspectionStageInfo(inspectionStageInfo);
+        OrderBaseInfoVO orderBaseInfoVo = BeanUtil.copyProperties(orderBaseInfoDO, OrderBaseInfoVO.class);
+        orderEventJobVO.setBaseInfo(orderBaseInfoVo);
+            List<String> emails = Arrays.asList(ProductionDepartmentUserDO.getEmail().split( "[,，]+"))
+                    .stream().map(String::trim)
+                    .collect(Collectors.toList());
+            //一旦修改完质检信息就自动发送邮件对应的生产科。多次编辑保存多次发送。
+            if (StringUtils.isNotBlank(inspectionStageInfo.getEndCheckApplyTime())) {
+                String EndCheckApplyTime= inspectionStageInfo.getEndCheckApplyTime().substring(0, 10);
+                String ProductionDepartmentConsignTime =orderBaseInfoDO.getProductionDepartmentConsignTime().substring(0, 10);
+                orderEventJobVO.getInspectionStageInfo().setEndCheckApplyTime(EndCheckApplyTime);
+                orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(ProductionDepartmentConsignTime);
+                //尾期验货报告。
+                emailSendUtils.sendEmail(EmailTemplateEnum.END_CHECK_REPORT_TEMPLATE, emails, orderEventJobVO);
+            }else if(StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())){
+                String MidCheckApplyTime= inspectionStageInfo.getMidCheckApplyTime().substring(0, 10);
+                String ProductionDepartmentConsignTime =orderBaseInfoDO.getProductionDepartmentConsignTime().substring(0, 10);
+                String MidCheckApply = DateUtils.format(DateUtils.parseDate(MidCheckApplyTime, DATE), DATE);
+                String ProductionDepartmentConsign = DateUtils.format(DateUtils.parseDate(ProductionDepartmentConsignTime,DATE), DATE);
+                orderEventJobVO.getInspectionStageInfo().setMidCheckApplyTime(MidCheckApply);
+                orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(ProductionDepartmentConsign);
+                //中期验货报告。
+                emailSendUtils.sendEmail(EmailTemplateEnum.MID_CHECK_REPORT_TEMPLATE, emails, orderEventJobVO);
+            }
+    }
 }
@@ -6,6 +6,7 @@ import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.order.OrderOpinionLogDO;
+import com.order.erp.domain.vo.order.OrderOpinionLogVO;
 import com.order.erp.mapper.order.OrderOpinionLogMapper;
 import com.order.erp.service.order.OrderOpinionLogService;
 import lombok.extern.slf4j.Slf4j;
@@ -23,13 +24,15 @@ import java.util.Objects;
 @Service
 public class OrderOpinionLogServiceImpl extends ServiceImpl<OrderOpinionLogMapper, OrderOpinionLogDO> implements OrderOpinionLogService {
     @Override
-    public ServerResult queryById(OrderOpinionLogDO orderOpinionLogDO) {
-        if (Objects.isNull(orderOpinionLogDO.getId())) {
-            return ServerResult.fail("id 不能为空");
+    public ServerResult queryById(OrderOpinionLogVO orderOpinionLogVo) {
+        log.info("orderId"+orderOpinionLogVo.getOrderId());
+        System.out.println(orderOpinionLogVo);
+        if (Objects.isNull(orderOpinionLogVo.getOrderId())) {
+            return ServerResult.fail("OrderId 不能为空");
         }
         List<OrderOpinionLogDO> orderOpinionLogDOList = list(new LambdaQueryWrapper<OrderOpinionLogDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(OrderOpinionLogDO::getOrderId, orderOpinionLogDO.getOrderId())
+                .eq(OrderOpinionLogDO::getOrderId, orderOpinionLogVo.getOrderId())
                 .orderByDesc(OrderOpinionLogDO::getId));
         return ServerResult.success(orderOpinionLogDOList);
     }
+package com.order.erp.service.order.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.utils.PageUtils;
+import com.order.erp.domain.dto.order.ProducePaymentCheckBillOrderDO;
+import com.order.erp.domain.vo.order.ProducePaymentCheckBillOrderQueryVO;
+import com.order.erp.domain.vo.order.ProducePaymentCheckBillOrderVO;
+import com.order.erp.mapper.order.ProducePaymentCheckBillOrderMapper;
+import com.order.erp.service.order.ProducePaymentCheckBillOrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 生产科对账单应收账单(ProducePaymentCheckBillOrder)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-08-05 16:26:35
+ */
+@Slf4j
+@Service
+public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl<ProducePaymentCheckBillOrderMapper, ProducePaymentCheckBillOrderDO> implements ProducePaymentCheckBillOrderService {
+
+
+    /**
+     * 通过ID查询单条数据
+     * <p>
+     * producePaymentCheckBillOrderQueryVO 主键
+     *
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult queryById(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
+        if (Objects.isNull(producePaymentCheckBillOrderQueryVO.getId())) {
+            return ServerResult.fail("id 不能为空");
+        }
+        ProducePaymentCheckBillOrderDO ProducePaymentCheckBillOrderDo = getById(producePaymentCheckBillOrderQueryVO.getId());
+        if (Objects.isNull(ProducePaymentCheckBillOrderDo)) {
+            return ServerResult.success(null);
+        }
+        return ServerResult.success(BeanUtil.copyProperties(ProducePaymentCheckBillOrderDo, ProducePaymentCheckBillOrderVO.class));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param producePaymentCheckBillOrderQueryVO 筛选条件
+     * @return 查询结果
+     */
+    @Override
+    public ServerResult list(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
+
+        LambdaQueryWrapper<ProducePaymentCheckBillOrderDO> queryWapper = new LambdaQueryWrapper<ProducePaymentCheckBillOrderDO>()
+                .eq(ProducePaymentCheckBillOrderDO::getEnableFlag, Constant.ENABLE_TEN)
+                .orderByDesc(ProducePaymentCheckBillOrderDO::getId);
+        Page page = new Page<>(producePaymentCheckBillOrderQueryVO.getPage(), producePaymentCheckBillOrderQueryVO.getPageSize());
+        IPage<ProducePaymentCheckBillOrderDO> iPage = page(page, queryWapper);
+        producePaymentCheckBillOrderQueryVO.setTotal(Long.valueOf(iPage.getTotal()).intValue());
+        return ServerResult.success(PageUtils.getPageReturn(null, producePaymentCheckBillOrderQueryVO));
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param producePaymentCheckBillOrderVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult add(ProducePaymentCheckBillOrderVO producePaymentCheckBillOrderVO) {
+        //todo 校验
+        if (Objects.nonNull(producePaymentCheckBillOrderVO.getId())) {
+            producePaymentCheckBillOrderVO.setId(null);
+        }
+        ProducePaymentCheckBillOrderDO producePaymentCheckBillOrderDo = BeanUtil.copyProperties(producePaymentCheckBillOrderVO, ProducePaymentCheckBillOrderDO.class);
+
+        save(producePaymentCheckBillOrderDo);
+
+        return ServerResult.success();
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param producePaymentCheckBillOrderVO 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public ServerResult edit(ProducePaymentCheckBillOrderVO producePaymentCheckBillOrderVO) {
+        //todo 校验
+        if (Objects.isNull(producePaymentCheckBillOrderVO.getId())) {
+            return ServerResult.fail("id 不能为空");
+        }
+        ProducePaymentCheckBillOrderDO producePaymentCheckBillOrderDo = BeanUtil.copyProperties(producePaymentCheckBillOrderVO, ProducePaymentCheckBillOrderDO.class);
+
+        updateById(producePaymentCheckBillOrderDo);
+
+        return ServerResult.success();
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param producePaymentCheckBillOrderQueryVO 筛选条件
+     * @return 是否成功
+     */
+    @Override
+    public ServerResult deleteById(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
+        List<Long> ids = producePaymentCheckBillOrderQueryVO.getIds();
+        if (CollUtil.isEmpty(ids)) {
+            return ServerResult.fail("ids 参数不能为空");
+        }
+        List<ProducePaymentCheckBillOrderDO> producePaymentCheckBillOrderList = listByIds(ids);
+        if (CollUtil.isEmpty(producePaymentCheckBillOrderList)) {
+            return ServerResult.success();
+        }
+        //todo 校验是否可以逻辑删除
+        LambdaUpdateWrapper<ProducePaymentCheckBillOrderDO> updateWrapper = new LambdaUpdateWrapper<ProducePaymentCheckBillOrderDO>()
+                .in(ProducePaymentCheckBillOrderDO::getId, ids)
+                .set(ProducePaymentCheckBillOrderDO::getEnableFlag, Constant.UNABLE_TWENTY);
+        update(updateWrapper);
+        return ServerResult.success();
+    }
+}
 package com.order.erp.service.order.impl;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -73,6 +70,10 @@ public class ReceiveEmailMappingServiceImpl extends ServiceImpl&lt;ReceiveEmailMapp
      */
     @Override
     public ServerResult add(ReceiveEmailMappingVO receiveEmailMappingVO) {
+        List<ReceiveEmailMappingDO> ReceiveEmailMappingDoList = baseMapper.byTypeValueReceiveEmailMappingDO(receiveEmailMappingVO.getTypeValue());
+        if(CollectionUtils.isNotEmpty(ReceiveEmailMappingDoList)){
+            return ServerResult.fail("已存在"+receiveEmailMappingVO.getTypeValue()+"客户");
+        }
         //todo 校验
         if (Objects.nonNull(receiveEmailMappingVO.getId())) {
             receiveEmailMappingVO.setId(null);
@@ -57,13 +57,13 @@ spring:
     testWhileIdle: true
     testOnBorrow: true
     testOnReturn: true
-    password: canrd@2024
+    password: root
     time-between-eviction-runs-millis: 1000
-    url: jdbc:mysql://39.108.227.113:3307/order-erp1?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
+    url: jdbc:mysql://localhost:3306/order-erp1?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
     username: root
   redis:
     database: 0
-    host: 39.108.227.113
+    host: localhost
     lettuce:
       pool:
         max-active: 2000
@@ -76,21 +76,33 @@ spring:
     timeout: 2000
   mail:
     # 配置 SMTP 服务器地址
+#    host: smtp.163.com
     host: smtp.mxhichina.com
-    # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
+      # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
     username: system@canrd.com
-    # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
+      # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
     password: Kelude2015
-    # 邮件接收者
+      # 邮件接收者
     mailRecipient: #邮件接收者邮箱
+      # 端口号465或587（QQ邮箱发送邮件仅支持587端口协议）
+    port: 465
+
+    # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
+#    username: chenhang4442024@163.com
+    # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
+#    password: ACHWYJSXRITHTMGA
+    # 邮件接收者
+#    mailRecipient: #邮件接收者邮箱
     # 端口号465或587（QQ邮箱发送邮件仅支持587端口协议）
-    port: 587
+#    port: 25
     # 默认的邮件编码为UTF-8
     default-encoding: UTF-8
     # 配置SSL 加密工厂
     properties:
       mail:
         smtp:
+          ssl:
+            enabled: true
           socketFactoryClass: javax.net.ssl.SSLSocketFactory
         #表示开启 DEBUG 模式，这样，邮件发送过程的日志会在控制台打印出来，方便排查错误
         debug: true
+mybatis-plus:
+  configuration:
+    cache-enabled: false
+    call-setters-on-nulls: true
+    jdbc-type-for-null: 'null'
+    map-underscore-to-camel-case: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  global-config:
+    db-config:
+      capital-mode: false
+      field-strategy: NOT_NULL
+      id-type: AUTO
+      logic-delete-field: enable_flag
+      logic-delete-value: 20
+      logic-not-delete-value: 10
+  mapper-locations: classpath:/mapper/**.xml
+  type-aliases-package: com.order.erp.**.dto
+#spring:
+#  datasource:
+#    dynamic:
+#      primary: overtime #设置默认的数据源或者数据源组,默认值即为master
+#      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
+#      datasource:
+#        wms_warehouse:
+#          url: jdbc:mysql://127.0.0.1:3306/overtime?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true&rewriteBatchedStatements=true
+#          username: root
+#          password: root
+#          driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+#          druid:
+#            initial-size: 5
+#            max-active: 20
+#            max-evictable-idle-time-millis: 300000
+#            max-wait: 60000
+#            min-evictable-idle-time-millis: 300000
+#            min-idle: 5
+#            time-between-eviction-runs-millis: 60000
+#    type: com.alibaba.druid.pool.DruidDataSource
+spring:
+  servlet:
+    multipart:
+      enabled: true
+      max-file-size: 100MB
+      max-request-size: 20MB
+      file-size-threshold: 20MB
+  datasource:
+    db-type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    initial-size: 5
+    max-active: 30
+    max-wait: 30000
+    min-idle: 5
+    #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+    timeBetweenEvictionRunsMillis: 30000
+    #配置一个连接在池中最小生存的时间，单位是毫秒，30000=30s
+    minEvictableIdleTimeMillis: 30000
+    validationQuery: SELECT 'x'
+    testWhileIdle: true
+    testOnBorrow: true
+    testOnReturn: true
+    password: Erp@test123456
+    time-between-eviction-runs-millis: 1000
+    url: jdbc:mysql://47.104.8.35:3307/order-erp-pre-prod?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
+    username: root
+  redis:
+    database: 10
+    host: 47.104.8.35
+    lettuce:
+      pool:
+        max-active: 2000
+        max-idle: 10
+        max-wait: -1
+        min-idle: 3
+        time-between-eviction-runs: 100
+    password: ''
+    port: 6380
+    timeout: 2000
+  mail:
+    # 配置 SMTP 服务器地址
+    host: xxx
+    # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
+    username: xxxx
+    # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
+    password: xxx
+    # 邮件接收者
+    mailRecipient: #邮件接收者邮箱
+    # 端口号465或587（QQ邮箱发送邮件仅支持587端口协议）
+    port: 587
+    # 默认的邮件编码为UTF-8
+    default-encoding: UTF-8
+    # 配置SSL 加密工厂
+    properties:
+      mail:
+        smtp:
+          socketFactoryClass: javax.net.ssl.SSLSocketFactory
+        #表示开启 DEBUG 模式，这样，邮件发送过程的日志会在控制台打印出来，方便排查错误
+        debug: true
+
+  freemarker:
+    template-loader-path: classpath:/template/
+    suffix: .flt
+    enabled: true
+    cache: false
+    charset: UTF-8
+    content-type: text/html
+    allow-request-override: false
+    check-template-location: true
+    expose-request-attributes: false
+    expose-session-attributes: false
+    expose-spring-macro-helpers: false
+
+
+logging:
+  config: classpath:log4j2-prod.xml
+
+#登录图形验证码有效时间/分钟
+loginCode:
+  expiration: 2
+
+#密码加密传输，前端公钥加密，后端私钥解密
+rsa:
+  private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
+
+
+#jwt
+jwt:
+  header: Authorization
+  # 令牌前缀
+  token-start-with: Bearer
+  # 必须使用最少88位的Base64对该令牌进行编码
+  base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI=
+  # 令牌过期时间 此处单位/毫秒 ，默认2小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
+  token-validity-in-seconds: 720000000
+  # 在线用户key
+  online-key: online-token
+  # 验证码
+  code-key: code-key
+
+outsys:
+  sms:
+    regionId: cn-hangzhou
+    accessKeyId: LTAIZCPI7OaWud0m
+    secret: nvtGeScBwRztGeoj8WSp5OWalalgpK
+    domain: dysmsapi.aliyuncs.com
+    version: 2017-05-25
+    action: SendSms
+    signName: canrd
+    templateCode: SMS_173005236
+  email:
+    host: xxxx
+    passwordRecoverKey: xxxxx
+
+
+
+system:
+  isLoginFailureLock: true
+  loginFailureLockTime: 5
+  loginFailureLockCount: 3
+
+openai:
+  token: Bearer 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
+
+# 文件存储路径
+file:
+  path: /home/canrd/order-erp/files/
+  host: http://47.104.8.35
+  avatar: /home/order-erp/avatar/
+  # 文件大小 /M
+  maxSize: 100
+  avatarMaxSize: 5
+
+# 阿里pss图片服务
+oss:
+  endpoint: https://oss-cn-qingdao.aliyuncs.com
+  accessKeyId: LTAI5t7u1gXR2vm82sd6CkVz
+  accessKeySecret: m4NzHZZsZiauKmRO8y7DihmcGNdQk4
+  bucket: alterego
+
+
+db:
+  mysql:
+    ip: 172.17.0.1
+    port: 3306
+    user: root
+    password: 123456
+    databaseName: order-erp
+    savePath: /home/canrd/order-erp/files/backup/
@@ -76,21 +76,23 @@ spring:
     timeout: 2000
   mail:
     # 配置 SMTP 服务器地址
-    host: xxx
+    host: smtp.163.com
     # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
-    username: xxxx
+    username: chenhang4442024@163.com
     # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
-    password: xxx
+    password: ACHWYJSXRITHTMGA
     # 邮件接收者
     mailRecipient: #邮件接收者邮箱
     # 端口号465或587（QQ邮箱发送邮件仅支持587端口协议）
-    port: 587
+    port: 465
     # 默认的邮件编码为UTF-8
     default-encoding: UTF-8
     # 配置SSL 加密工厂
     properties:
       mail:
         smtp:
+          ssl:
+            enable: true
           socketFactoryClass: javax.net.ssl.SSLSocketFactory
         #表示开启 DEBUG 模式，这样，邮件发送过程的日志会在控制台打印出来，方便排查错误
         debug: true
@@ -76,25 +76,29 @@ spring:
     timeout: 2000
   mail:
     # 配置 SMTP 服务器地址
-    host: smtp.mxhichina.com
+#    host: smtp.mxhichina.com
+    host: smtp.163.com
     # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
-    username: system@canrd.com
+    username: chenhang4442024@163.com
     # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
-    password: Kelude2015
+    password: ACHWYJSXRITHTMGA
     # 邮件接收者
     mailRecipient: #邮件接收者邮箱
     # 端口号465或587（QQ邮箱发送邮件仅支持587端口协议）
-    port: 587
+    port: 465
     # 默认的邮件编码为UTF-8
     default-encoding: UTF-8
     # 配置SSL 加密工厂
     properties:
       mail:
         smtp:
+          ssl:
+            enable: true
           socketFactoryClass: javax.net.ssl.SSLSocketFactory
         #表示开启 DEBUG 模式，这样，邮件发送过程的日志会在控制台打印出来，方便排查错误
         debug: true
+
   freemarker:
     template-loader-path: classpath:/template/
     suffix: .flt
 server:
-  port: 8000
+  port: 18000
 spring:
   profiles:
@@ -4,13 +4,14 @@
     <meta charset="UTF-8">
     <title>通用邮件模板</title>
     <style>
-        #title1 {
-            background: black;
-        }
+        /*#title1 {*/
+        /*    background: black;*/
+        /*}*/
         #title1 > td {
-            color: aliceblue;
-            border-right: 1px solid white;
+            /*color: aliceblue;*/
+            /*border-right: 1px solid white;*/
+         border-right: 1px solid black;
         }
         #title2 td {
@@ -102,7 +103,7 @@
         <#if title=="中期验货报告" >
             <td>${data.baseInfo.projectNo! " "}</td>
             <td>${data.baseInfo.productionDepartment! " "}</td>
-            <td>${data.baseInfo.internalNo! " "}</td>
+            <td>${data.baseInfo.innerNo! " "}</td>
             <td>${data.baseInfo.customerPo! " "}</td>
             <td>${data.baseInfo.customerStyle! " "}</td>
             <td>${data.baseInfo.poColor! " "}</td>
@@ -117,7 +118,7 @@
         <#elseif title=="尾期验货报告">
             <td>${data.baseInfo.projectNo! " "}</td>
             <td>${data.baseInfo.productionDepartment! " "}</td>
-            <td>${data.baseInfo.internalNo! " "}</td>
+            <td>${data.baseInfo.innerNo! " "}</td>
             <td>${data.baseInfo.customerPo! " "}</td>
             <td>${data.baseInfo.customerStyle! " "}</td>
             <td>${data.baseInfo.poColor! " "}</td>