feat:1.更新邮件提示,根据不同的客户编码重新设置邮件提示。

2.产品信息添加最新信息展示

feat:1.更新邮件提示,根据不同的客户编码重新设置邮件提示。
2.产品信息添加最新信息展示
chenhang4442024
1 parent 9d5da66f
Showing 11 changed files with 320 additions and 51 deletions
src/main/java/com/order/erp/common/constant/Constant.java
src/main/java/com/order/erp/common/utils/DateUtils.java
src/main/java/com/order/erp/common/utils/EmailSendUtils.java
src/main/java/com/order/erp/controller/InvoiceBillOrderController.java
src/main/java/com/order/erp/job/OrderJob.java
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/ProducePaymentCheckBillOrderServiceImpl.java
src/main/resources/application-pre-prod.yml
src/main/resources/application.yml
@@ -343,5 +343,6 @@ public class Constant {
     public static final String FINANCE_EVENT_TITLE_INNERNO = " , 对应内部编号为 : ";
     public static final String FINANCE_EVENT_TITLE_PROJECTNO = " , 对应项目号为 : ";
+    public static final String ORDERBASEINFO_PRODUCTIONCOMMENT = " , 更新信息为 : ";
 }
@@ -203,6 +203,15 @@ public class DateUtils {
     }
     /**
+     * 获取年月日
+     *
+     */
+    public static String getYearandMountandDay() {
+        LocalDateTime localDateTime = LocalDateTime.now();
+        return localDateTime.getYear()+"-"+localDateTime.getMonthValue()+"-"+localDateTime.getDayOfMonth();
+    }
+
+    /**
      * 解析字符串日期为LocalDate
      *
      * @param dateStr
@@ -37,7 +37,7 @@ public class EmailSendUtils {
     private FreeMarkerConfigurer freeMarkerConfigurer;
     /**
-     * @Description:    发送邮件
+     * @Description:    发送邮件  发送尾期验货报告,中期验货报告,邮件提醒事件。
      * @param emailTemplateEnum  邮件事件类型
      * @param receiveemailList   收件人邮箱
      * @param orderEventJobVO   订单基本信息,订单-质检信息,等。
@@ -75,6 +75,49 @@ public class EmailSendUtils {
         }
         javaMailSender.send(mimeMessage);
     }
+
+    /**
+     * @Description:    发送邮件  只发送产品信息。
+     * @param emailTemplateEnum  邮件事件类型
+     * @param receiveemailList   收件人邮箱
+     * @param orderEventJobVO   订单基本信息,订单-质检信息,等。
+     * @Param extraString       每次更新的产品信息。
+     * @throws MessagingException
+     * @throws IOException
+     */
+
+    public  void sendEmail(EmailTemplateEnum emailTemplateEnum, List<String> receiveemailList, OrderEventJobVO orderEventJobVO,String extraString)  {
+        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()+orderEventJobVO.getBaseInfo().getProjectNo()+Constant.ORDERBASEINFO_PRODUCTIONCOMMENT+extraString);
+        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.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);
+    }
+
+
     /**
      * @Description:    发送生产指示书邮件
      * @param emailTemplateEnum  邮件事件类型
@@ -75,7 +75,7 @@ public class InvoiceBillOrderController {
     @PostMapping(value = "/export")
     @ApiOperation("导出分析列表")
     @AnonymousAccess
-    public void export(HttpServletResponse response, @RequestBody @Validated InvoiceAndCheckAnalysisVO queryVO) throws IOException, Excel4JException {
+    public void export(HttpServletResponse response, @RequestBody  InvoiceAndCheckAnalysisVO queryVO) throws IOException, Excel4JException {
         invoiceBillOrderService.export(response, queryVO);
     }
@@ -63,7 +63,7 @@ public class OrderJob {
                 .le(OrderBaseInfoDO::getCreateTime, DateUtils.format(DateTime.now().toDate(), DateUtils.DATE_TIME))
                 .ne(OrderBaseInfoDO::getOrderStatus, OrderStatusEnum.ORDER_FINISH.getStatus());
         List<OrderBaseInfoDO> ordersDOS = orderBaseInfoService.list(queryWrapper);
-
+//如果都填充完成为  1.25,如果只填写4个,则为1。
         List<OrderInfoResultVO> orderInfoResultVOS = orderBaseInfoService.wrapperOrderResultList(false, ordersDOS);
         if (CollectionUtils.isNotEmpty(orderInfoResultVOS)) {
             Set<Long> orderIds = orderInfoResultVOS.stream().filter(x -> Objects.nonNull(x.getSchedule()) && Constant.ONE == x.getSchedule()).map(OrderInfoResultVO::getId).collect(Collectors.toSet());
@@ -103,6 +103,7 @@ public class OrderOverTimeEventJob {
     private void sendEmail4OrderEvent(OrderEventEnum eventEnum, List<OrderEventJobVO> eventJobVOS) {
         HashSet<String> customerCodeList = new HashSet<>();
         for (OrderEventJobVO orderEventJob : eventJobVOS) {
+            //这里虽然没有使用redis限制住订单id,但是限制住了客户编码,要是发现redis中有发送的订单,就会设置客户编码是"",查询不出来邮件,所以就不会发送邮箱。要是没有,则会设置客户编码,会去查询。
             if (!redisUtils.hasKey(EmailTemplateEnum.byTemplate(
                     eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER + orderEventJob.getBaseInfo().getId())) {
                 customerCodeList.add(orderEventJob.getBaseInfo().getCustomerCode());
@@ -302,28 +303,174 @@ public class OrderOverTimeEventJob {
      */
     private Map<String, OrderEventJobVO> groupByOrderEvent(OrderEventJobVO eventJobVO) {
         Map<String, OrderEventJobVO> map = new HashMap<>();
-        if (filterConfirmSampleOrderEvent(eventJobVO)) {
-            map.put(OrderEventEnum.CONFIRM_SAMPLE_EVENT.getEvent(), eventJobVO);
-        }
-        if (filterOtherSampleEvent(eventJobVO)) {
-            map.put(OrderEventEnum.OTHER_SAMPLE_EVENT.getEvent(), eventJobVO);
-        }
-        if (filterBigSampleEvent(eventJobVO)) {
-            map.put(OrderEventEnum.BIG_SAMPLE_EVENT.getEvent(), eventJobVO);
-        }
-        if (filterAITEXSGSTestEvent(eventJobVO)) {
-            map.put(OrderEventEnum.AITEX_SGS_TEST_EVENT.getEvent(), eventJobVO);
-        }
-        if (filterBarcodeArrivalEvent(eventJobVO)) {
-            map.put(OrderEventEnum.BARCODE_ARRIVAL_EVENT.getEvent(), eventJobVO);
-        }
-        if (filterLatestDCEvent(eventJobVO)) {
-            map.put(OrderEventEnum.LATEST_DC_EVENT.getEvent(), eventJobVO);
-        }
-        if (filterEndCheckDateEvent(eventJobVO)) {
-            map.put(OrderEventEnum.END_CHECK_DATE_EVENT.getEvent(), eventJobVO);
+            //如果包含"-",则去掉。     A04没有处理,然后A06,A09,A08,对于返单数据,只写了订舱和包材事件,对于返单的内销是否需要订舱和包材。
+        String simpleCustomerCode = eventJobVO.getBaseInfo().getCustomerCode().substring(0, 3);
+        //把返单和不是返单分别区分。
+        if(StringUtils.isEmpty(eventJobVO.getBaseInfo().getReturnOrder())){
+            return map;
+        }else{
+            // 不是返单。
+            if(Constant.ZERO_STRING.equals(eventJobVO.getBaseInfo().getReturnOrder())){
+                if("A06".equals(simpleCustomerCode) ||  "A09".equals(simpleCustomerCode)){
+                    //如果运输方式为SF则代表内销。
+                    boolean isOutboundTypeSF=eventJobVO.getBaseInfo().getOutboundType().equals("SF");
+                    if (filterSGSTestEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.AITEX_SGS_TEST_EVENT.getEvent(), eventJobVO);
+                    }
+                    if(!isOutboundTypeSF){
+                        if (filterConfirmSampleOrderEvent(eventJobVO)) {
+                            map.put(OrderEventEnum.CONFIRM_SAMPLE_EVENT.getEvent(), eventJobVO);
+                        }
+                        if (filterBigSampleEvent(eventJobVO)) {
+                            map.put(OrderEventEnum.BIG_SAMPLE_EVENT.getEvent(), eventJobVO);
+                        }
+                        if (filterBarcodeArrivalEvent(eventJobVO)) {
+                            map.put(OrderEventEnum.BARCODE_ARRIVAL_EVENT.getEvent(), eventJobVO);
+                        }
+                        if (filterLatestDCEvent(eventJobVO)) {
+                            map.put(OrderEventEnum.LATEST_DC_EVENT.getEvent(), eventJobVO);
+                        }
+                    }
+                }else if("A05".equals(simpleCustomerCode) ||  "A07".equals(simpleCustomerCode) || "M05".equals(simpleCustomerCode) ||  "M03".equals(simpleCustomerCode)){
+                    //如果出库类型为POST则代表样品单,不需要订舱。
+                    boolean isOutboundTypePOST = eventJobVO.getBaseInfo().getOutboundType().equals("POST");
+
+                    if (filterConfirmSampleOrderEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.CONFIRM_SAMPLE_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterBigSampleEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.BIG_SAMPLE_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterBarcodeArrivalEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.BARCODE_ARRIVAL_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterSGSTestEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.AITEX_SGS_TEST_EVENT.getEvent(), eventJobVO);
+                    }
+                    if(!isOutboundTypePOST){
+                        if (filterLatestDCEvent(eventJobVO)) {
+                            map.put(OrderEventEnum.LATEST_DC_EVENT.getEvent(), eventJobVO);
+                        }
+                    }
+                }else if("A01".equals(simpleCustomerCode)){
+                    if (filterConfirmSampleOrderEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.CONFIRM_SAMPLE_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterOtherSampleEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.OTHER_SAMPLE_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterBigSampleEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.BIG_SAMPLE_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterBarcodeArrivalEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.BARCODE_ARRIVAL_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterSGSTestEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.AITEX_SGS_TEST_EVENT.getEvent(), eventJobVO);
+                    }
+                    if(filterAITEXTestEvent(eventJobVO)){
+                        map.put(OrderEventEnum.AITEX_SGS_TEST_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterLatestDCEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.LATEST_DC_EVENT.getEvent(), eventJobVO);
+                    }
+                }else if("A04".equals(simpleCustomerCode)){
+                    if (filterConfirmSampleOrderEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.CONFIRM_SAMPLE_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterBigSampleEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.BIG_SAMPLE_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterBarcodeArrivalEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.BARCODE_ARRIVAL_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterSGSTestEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.AITEX_SGS_TEST_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterLatestDCEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.LATEST_DC_EVENT.getEvent(), eventJobVO);
+                    }
+                }//除了上述几种,其他的都全部走一遍。 先注释掉。
+               /* else{
+                    if (filterConfirmSampleOrderEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.CONFIRM_SAMPLE_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterOtherSampleEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.OTHER_SAMPLE_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterBigSampleEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.BIG_SAMPLE_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterBarcodeArrivalEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.BARCODE_ARRIVAL_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterSGSTestEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.AITEX_SGS_TEST_EVENT.getEvent(), eventJobVO);
+                    }
+                    if(filterAITEXTestEvent(eventJobVO)){
+                        map.put(OrderEventEnum.AITEX_SGS_TEST_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterLatestDCEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.LATEST_DC_EVENT.getEvent(), eventJobVO);
+                    }
+                }*/
+            }else{
+            //返单。
+                if("A05".equals(simpleCustomerCode) ||  "A07".equals(simpleCustomerCode) || "M05".equals(simpleCustomerCode) ||  "M03".equals(simpleCustomerCode)){
+                    boolean isOutboundTypePOST = eventJobVO.getBaseInfo().getOutboundType().equals("POST");
+                    if (filterBarcodeArrivalEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.BARCODE_ARRIVAL_EVENT.getEvent(), eventJobVO);
+                    }
+                    if(!isOutboundTypePOST){
+                        if (filterLatestDCEvent(eventJobVO)) {
+                            map.put(OrderEventEnum.LATEST_DC_EVENT.getEvent(), eventJobVO);
+                        }
+                    }
+                }else if("A06".equals(simpleCustomerCode) ||  "A09".equals(simpleCustomerCode) || "A04".equals(simpleCustomerCode)){
+                    if (filterLatestDCEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.LATEST_DC_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterBarcodeArrivalEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.BARCODE_ARRIVAL_EVENT.getEvent(), eventJobVO);
+                    }
+                }else if("A01".equals(simpleCustomerCode)){
+
+                    if (filterBigSampleEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.BIG_SAMPLE_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterLatestDCEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.LATEST_DC_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterLatestDCEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.LATEST_DC_EVENT.getEvent(), eventJobVO);
+                    }
+                }//除了上述几种,其他的都全部走一遍。先注释掉。
+               /* else{
+                    if (filterConfirmSampleOrderEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.CONFIRM_SAMPLE_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterOtherSampleEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.OTHER_SAMPLE_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterBigSampleEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.BIG_SAMPLE_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterBarcodeArrivalEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.BARCODE_ARRIVAL_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterSGSTestEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.AITEX_SGS_TEST_EVENT.getEvent(), eventJobVO);
+                    }
+                    if(filterAITEXTestEvent(eventJobVO)){
+                        map.put(OrderEventEnum.AITEX_SGS_TEST_EVENT.getEvent(), eventJobVO);
+                    }
+                    if (filterLatestDCEvent(eventJobVO)) {
+                        map.put(OrderEventEnum.LATEST_DC_EVENT.getEvent(), eventJobVO);
+                    }
+                }*/
+            }
+            return map;
         }
-        return map;
     }
     /**
@@ -379,7 +526,7 @@ public class OrderOverTimeEventJob {
     }
-    private Boolean filterAITEXSGSTestEvent(OrderEventJobVO eventJobVO) {
+ /*   private Boolean filterAITEXSGSTestEvent(OrderEventJobVO eventJobVO) {
         int aitextestDaysBetween = 0;
         int sgstestDaysBetween = 0;
         String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
@@ -405,6 +552,48 @@ public class OrderOverTimeEventJob {
         }
         return false;
+    }*/
+
+    private Boolean filterAITEXTestEvent(OrderEventJobVO eventJobVO) {
+        int aitextestDaysBetween = 0;
+        String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
+        String aitexTestFinishResult = eventJobVO.getTrackStageInfo().getAitexTestFinishResult();
+        String aitexTestFinishTime = eventJobVO.getTrackStageInfo().getAitexTestFinishTime();
+
+        if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(aitexTestFinishResult) && StringUtils.isNotBlank(aitexTestFinishTime)) {
+            aitextestDaysBetween = getDaysBetween(aitexTestFinishResult, aitexTestFinishTime, orderHodTime);
+        }
+
+        if (StringUtils.isEmpty(aitexTestFinishResult)) {
+            LocalDate today = LocalDate.now();
+            LocalDate localDate = DateUtils.parseDate(orderHodTime);
+            if (Constant.THREE == (int) ChronoUnit.DAYS.between(today, localDate)) {
+                return true;
+            }
+        }
+
+        return Constant.THREE == aitextestDaysBetween || Constant.NEGATIVE_ONE == aitextestDaysBetween;
+    }
+
+    private Boolean filterSGSTestEvent(OrderEventJobVO eventJobVO) {
+        int sgstestDaysBetween = 0;
+        String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
+        String sgsTestFinishResult = eventJobVO.getTrackStageInfo().getSgsTestFinishResult();
+        String sgsTestFinishTime = eventJobVO.getTrackStageInfo().getSgsTestFinishTime();
+
+        if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(sgsTestFinishResult) && StringUtils.isNotBlank(sgsTestFinishTime)) {
+            sgstestDaysBetween = getDaysBetween(sgsTestFinishResult, sgsTestFinishTime, orderHodTime);
+        }
+
+        if (StringUtils.isEmpty(sgsTestFinishResult)) {
+            LocalDate today = LocalDate.now();
+            LocalDate localDate = DateUtils.parseDate(orderHodTime);
+            if (Constant.THREE == (int) ChronoUnit.DAYS.between(today, localDate)) {
+                return true;
+            }
+        }
+
+        return Constant.THREE == sgstestDaysBetween || Constant.NEGATIVE_ONE == sgstestDaysBetween;
     }
@@ -390,6 +390,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
                 queryVO.getQueryVO().setProductionDepartmentConsignEndTime(queryVO.getQueryVO().getProductionDepartmentConsignEndTime().substring(0,10)+" 23:59:59");
             }
             Set<Long> existOrderIdSet=new HashSet<>();
+            Set<Long>  filterDoubleOrderIds = new HashSet<>();
             //查询数据
             List<InvoiceIdAndCheckIdResultVO> idResultVOS = baseMapper.byQuerygetInvoiceIdAndCheckId(queryVO.getQueryVO());
             List<Long> invoiceIds = idResultVOS.stream().map(x -> x.getInvoiceId()).filter(Objects::nonNull).collect(Collectors.toList());
@@ -401,7 +402,8 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
             List<Long> existOrderIds = invoiceBillOrderDOS.stream().map(x -> x.getOrderId()).collect(Collectors.toList());
             existOrderIdSet.addAll(existOrderIds);
             List<Long> orderIdList = idResultVOS.stream().map(x -> x.getOrderId()).collect(Collectors.toList());
-            notExistOrderIds = orderIdList.stream()
+            filterDoubleOrderIds.addAll(orderIdList);
+            notExistOrderIds = filterDoubleOrderIds.stream()
                     .filter(orderId -> !existOrderIdSet.contains(orderId))
                     .collect(Collectors.toList());
@@ -1327,6 +1329,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoDOList.stream().map(order -> {
             //这里要删除对应invoiceNo号,但是为了删除后产生空指针异常,所以定义为"N/N";
             order.setInvoiceNo("N/N");
+            order.setInvoiceStatus(FinanceEnum.NOT_CREATED.getStatus());
             return order;
         }).collect(Collectors.toList());
         transactionHelper.run(() -> {
@@ -1416,17 +1419,19 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         //第二行
         Row row2 = sheet.createRow(3);
         Cell cell2 = row2.createCell(0);
-        cell2.setCellValue("提交人："+queryVO.getFinancePerson());
+        cell2.setCellValue("提交人："+queryVO.getTrackerUser());
         sheet.addMergedRegion(new CellRangeAddress(3, 4, 0, 1));
         Cell cell3 = row2.createCell(2);
         cell3.setCellValue("");
         sheet.addMergedRegion(new CellRangeAddress(3, 4, 2, 7));
         Cell cell4 = row2.createCell(8);
-        if(StringUtils.isNotBlank(queryVO.getActualRefundDate())){
+        /*if(StringUtils.isNotBlank(queryVO.getActualRefundDate())){
             cell4.setCellValue("日期："+queryVO.getActualRefundDate());
         }else{
             cell4.setCellValue("日期：");
-        }
+        }*/
+        //改为  变成当前的年月日。
+            cell4.setCellValue("日期："+DateUtils.getYearandMountandDay());
         sheet.addMergedRegion(new CellRangeAddress(3, 4, 8, 9));
         //第三行
         createMergedCell(sheet, workbook, 5, 0, 5, 6, 0, 1, "INVOICE编号");
@@ -1443,7 +1448,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
         createMergedCell(sheet, workbook, 7, 5, 7, 8, 5, 6, queryVO.getTotalPayAmount()!=null ? "$"+queryVO.getTotalPayAmount().setScale(2, BigDecimal.ROUND_HALF_UP) : "");
         createMergedCell(sheet, workbook, 7, 7, 7, 8, 7, 7, queryVO.getOtherAmount() != null ? "$"+queryVO.getOtherAmount().setScale(2, BigDecimal.ROUND_HALF_UP) : "");
         createMergedCell(sheet, workbook, 7, 8, 7, 8, 8, 8, queryVO.getBackRefundDate() != null ? queryVO.getBackRefundDate() : "");
-        createMergedCell(sheet, workbook, 7, 9, 7, 8, 9, 9, queryVO.getActualRefundDate() != null ? queryVO.getActualRefundDate() : "");
+        createMergedCell(sheet, workbook, 7, 9, 7, 8, 9, 9,  "");
         //第五行
         createMergedCell(sheet, workbook, 9, 0, 9, 10, 0, 1, "收款单位");
         createMergedCell(sheet, workbook, 9, 2, 9, 10, 2, 9, queryVO.getPayee());
@@ -230,7 +230,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             // 填充质检信息
             fillInspectionStageInfo(resultVOList);
-            // 填充发票信息
+            // 填充发票信息       对于填充发票信息和填充生产科对账单号,其实不需要在这里写了,而且这里只是填充了invoice号和check号,这里的代码是填充数据,达到一个进度条的效果,既然没有根据是否填充发票来填充进度条,这里就不需要写。
             fillInvoiceNo(resultVOList);
             //第四版  start
 /*            //需要填充生产科对账单号信息
@@ -886,9 +886,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         Set<Long> orderIds = orderInfoResultVOList.stream().map(OrderInfoResultVO::getId).collect(Collectors.toSet());
-      /*  List<InvoiceBillMappingDO> invoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
-                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .in(InvoiceBillMappingDO::getOrderId, orderIds));*/
         List<InvoiceBillOrderDO> invoiceBillOrderDOList = invoiceBillOrderService.list(new LambdaQueryWrapper<InvoiceBillOrderDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .in(InvoiceBillOrderDO::getOrderId, orderIds));
@@ -988,7 +985,7 @@ end
         if (CollectionUtils.isEmpty(orderInfoResultVOList)) {
             return;
         }
-
+        //这里是判断基本,跟单,质检,项目报告书是否每一个栏都填写了。
         orderInfoResultVOList.forEach(x -> {
             int i = 0;
             if (isFillOrderBaseInfo(x)) {
@@ -1545,6 +1542,8 @@ end
         OrderBaseInfoDO baseInfoDO = new OrderBaseInfoDO();
         BeanUtils.copyProperties(baseInfoVO, baseInfoDO);
         baseInfoDO.setOrderStatus(OrderStatusEnum.CREATE_FINISH.getStatus());
+        baseInfoDO.setCheckStatus(FinanceEnum.NOT_CREATED.getStatus());
+        baseInfoDO.setInvoiceStatus(FinanceEnum.NOT_CREATED.getStatus());
         save(baseInfoDO);
         OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(baseInfoDO.getId(),
@@ -1747,15 +1746,29 @@ end
                         String extra=updateVO.getBaseInfo().getProductionComment().substring(productionComment.length());
                         //当新填写的产品意见是以句号开始,就不换行。
                        if(extra.substring(0,2).contains("。")){
-                           sendProductionCommentEmail(orderBaseInfoDo,updateVO.getBaseInfo().getProductionComment());
+                           //去除逗号,传入方法里面作为更新的信息。
+                           String prefix = extra.substring(0, 2).replace("。", "");
+                           String extraString = prefix + extra.substring(2);
+                           sendProductionCommentEmail(orderBaseInfoDo,updateVO.getBaseInfo().getProductionComment(),extraString);
                         }else{
                            //其他情况就需要换行
                         stringBuilder.append("\n").append(date + ": " + newProductionComment[newProductionComment.length - 1].trim());
                         updateVO.getBaseInfo().setProductionComment(stringBuilder.toString());
-                        sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+                        sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString(), newProductionComment[newProductionComment.length - 1].trim());
                     }
                 }else{
-                    sendProductionCommentEmail(orderBaseInfoDo,updateVO.getBaseInfo().getProductionComment());
+                    //一定是输入信息比上一次少,不为通过或者不通过。
+                    if(orderBaseInfoDo.getProductionComment().length() > updateVO.getBaseInfo().getProductionComment().length() ){
+                        sendProductionCommentEmail(orderBaseInfoDo,updateVO.getBaseInfo().getProductionComment(),"1");
+                    }else{
+                        //这里一定是通过或者未通过。截取通过后面的字符。
+                        int index = updateVO.getBaseInfo().getProductionComment().lastIndexOf("通过");
+                        String lastString = updateVO.getBaseInfo().getProductionComment().substring(index + 2);
+                        //获取新输入的信息,并且对信息进行去除多于符号。
+                        String trimmedInput = lastString.replaceFirst("^[\\s,，。.;]*", "");
+                        sendProductionCommentEmail(orderBaseInfoDo,updateVO.getBaseInfo().getProductionComment(),trimmedInput);
+                    }
+
                 }
             }
             buildUpdateVO(updateVO.getBaseInfo(), orderBaseInfoDo);
@@ -2081,7 +2094,7 @@ end
 //这个方法的作用就是:她们反应对于内部编号相同的订单,就不需要发送四个测试结果的产品意见信息,不然创建一个订单选择测试结果后就发送四个测试结果,太麻烦了,所以这里根据项目号和测试结果进行区分。
     public void setEmailSendUtilsRedis(OrderBaseInfoDO orderBaseInfoDo,String resultText,String productionComment){
         if(!redisUtils.hasKey(orderBaseInfoDo.getInnerNo()+Constant.CROSS_BAR_CHARACTER+resultText)){
-            sendProductionCommentEmail(orderBaseInfoDo,productionComment);
+            sendProductionCommentEmail(orderBaseInfoDo,productionComment,resultText);
             redisUtils.set(orderBaseInfoDo.getInnerNo()+Constant.CROSS_BAR_CHARACTER+resultText, "1", 90, TimeUnit.DAYS);
         }
     }
@@ -2626,7 +2639,7 @@ end
         }
     }
-    private void sendProductionCommentEmail(OrderBaseInfoDO orderBaseInfoDo, String productionComment) {
+    private void sendProductionCommentEmail(OrderBaseInfoDO orderBaseInfoDo, String productionComment,String lastString) {
         List<AdminUserDO> adminList = adminUserService.list(new LambdaQueryWrapper<AdminUserDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                 .in(AdminUserDO::getUserName, Arrays.asList(orderBaseInfoDo.getBusinessPerson(), orderBaseInfoDo.getCreateBy(), orderBaseInfoDo.getProductionDepartment())));
@@ -2655,7 +2668,12 @@ end
                     orderEventJobVO.getBaseInfo().setProductionComment(productionComment);
                     orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(orderBaseInfoDo.getProductionDepartmentConsignTime().substring(0, 10));
                     //目前是选择的是跟单员邮箱和业务员邮箱。
-                    emailSendUtils.sendEmail(EmailTemplateEnum.PRODUCE_IDEA, emailList, orderEventJobVO);
+                    if(!"1".equals(lastString)){
+                        emailSendUtils.sendEmail(EmailTemplateEnum.PRODUCE_IDEA, emailList, orderEventJobVO,lastString);
+                    }else{
+                        emailSendUtils.sendEmail(EmailTemplateEnum.PRODUCE_IDEA, emailList, orderEventJobVO,"无更新信息!");
+                    }
+
                 }
             }
         }
@@ -201,6 +201,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
                     queryVO.getQueryVO().setProductionDepartmentConsignEndTime(queryVO.getQueryVO().getProductionDepartmentConsignEndTime().substring(0,10)+" 23:59:59");
                 }
              Set<Long> existOrderIdSet=new HashSet<>();
+             Set<Long> filterDoubleOrderIds=new HashSet<>();
              //查询数据 
                 List<InvoiceIdAndCheckIdResultVO> idResultVOS = invoiceBillOrderMapper.byQuerygetInvoiceIdAndCheckId(queryVO.getQueryVO());
                 List<Long> checkIds = idResultVOS.stream().map(x -> x.getCheckId()).filter(Objects::nonNull).collect(Collectors.toList());
@@ -211,7 +212,8 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
                 List<Long> existOrderIds = checkBillOrderDOS.stream().map(x -> x.getOrderId()).collect(Collectors.toList());
                 existOrderIdSet.addAll(existOrderIds);
                 List<Long> orderIdList = idResultVOS.stream().map(x -> x.getOrderId()).collect(Collectors.toList());
-                notExistOrderIds = orderIdList.stream()
+                filterDoubleOrderIds.addAll(orderIdList);
+                notExistOrderIds = filterDoubleOrderIds.stream()
                         .filter(orderId -> !existOrderIdSet.contains(orderId))
                         .collect(Collectors.toList());
             }else{
@@ -904,7 +906,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
             throw new BusinessException("应付款单据已审核通过,无法编辑");
         }
         //todo  已完成。
-        checkCommitApply(deductInfoVO.getId());
+//        checkCommitApply(deductInfoVO.getId());
         checkApply(new ArrayList<>(Arrays.asList(deductInfoVO.getId())));
         //需要判断一下是否为空?不然知己以逗号分隔会报错。
         if(StringUtils.isNotBlank(checkBillOrderDO.getDeductUrl())){
@@ -951,7 +953,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
                throw new BusinessException("已完成收款,无法更新!");
         }
         //todo  已完成。
-        checkCommitApply(amountInfoVO.getId());
+//        checkCommitApply(amountInfoVO.getId());
         checkApply(new ArrayList<>(Arrays.asList(amountInfoVO.getId())));
         checkBillOrderDO.setActualPayedAmount1(amountInfoVO.getActualPayedAmount1() != null ? amountInfoVO.getActualPayedAmount1().setScale(2, BigDecimal.ROUND_HALF_UP) : BigDecimal.ZERO.setScale(2, BigDecimal.ROUND_HALF_UP));
@@ -1212,6 +1214,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         List<OrderBaseInfoDO> orderBaseInfoDOS = orderBaseInfoDOList.stream().map(order -> {
             //这里要删除对应invoiceNo号,但是为了删除后产生空指针异常,所以定义为"N/N";
             order.setCheckNo("N/N");
+            order.setCheckStatus(FinanceEnum.NOT_CREATED.getStatus());
             return order;
         }).collect(Collectors.toList());
         transactionHelper.run(() -> {
@@ -1346,17 +1349,18 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         //第二行
         Row row2 = sheet.createRow(3);
         Cell cell2 = row2.createCell(0);
-        cell2.setCellValue("提交人："+queryVO.getFinancePerson());
+        cell2.setCellValue("提交人："+(StringUtils.isNotBlank(queryVO.getTrackerUser()) ? queryVO.getTrackerUser() : ""));
         sheet.addMergedRegion(new CellRangeAddress(3, 4, 0, 1));
         Cell cell3 = row2.createCell(2);
         cell3.setCellValue("");
         sheet.addMergedRegion(new CellRangeAddress(3, 4, 2, 7));
         Cell cell4 = row2.createCell(8);
-        if(StringUtils.isNotBlank(queryVO.getActualPayedDate())){
+       /* if(StringUtils.isNotBlank(queryVO.getActualPayedDate())){
             cell4.setCellValue("日期："+queryVO.getActualPayedDate());
         }else{
             cell4.setCellValue("日期：");
-        }
+        }*/
+        cell4.setCellValue("日期："+DateUtils.getYearandMountandDay());
         sheet.addMergedRegion(new CellRangeAddress(3, 4, 8, 9));
         //第三行
         createMergedCell(sheet, workbook, 5, 0, 5, 6, 0, 1, "生产科对账单号");
@@ -1373,7 +1377,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         createMergedCell(sheet, workbook, 7, 5, 7, 8, 5, 6, queryVO.getTotalActualPayedAmount()!=null? "￥"+queryVO.getTotalActualPayedAmount().setScale(2, BigDecimal.ROUND_HALF_UP):"");
         createMergedCell(sheet, workbook, 7, 7, 7, 8, 7, 7, queryVO.getUnPayedAmount()!=null? "￥"+queryVO.getUnPayedAmount().setScale(2, BigDecimal.ROUND_HALF_UP):"");
         createMergedCell(sheet, workbook, 7, 8, 7, 8, 8, 8, queryVO.getPayedDate()!=null?queryVO.getPayedDate():"");
-        createMergedCell(sheet, workbook, 7, 9, 7, 8, 9, 9, queryVO.getActualPayedDate()!=null?queryVO.getActualPayedDate():"");
+        createMergedCell(sheet, workbook, 7, 9, 7, 8, 9, 9, "");
         //第五行
         createMergedCell(sheet, workbook, 9, 0, 9, 10, 0, 1, "部门经理审核");
         createMergedCell(sheet, workbook, 9, 2, 9, 10, 2, 4, "财务审核");
@@ -57,9 +57,9 @@ spring:
     testWhileIdle: true
     testOnBorrow: true
     testOnReturn: true
-    password: Erp@test123456
+    password: eJ8(bD6]wN6=gI5=
     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
+    url: jdbc:mysql://47.104.8.35:3307/order-erp-test-real?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
 server:
-  port: 18000
+  port: 18001
 spring:
   profiles: