1.生产指示书添加图片

2.中期/尾期验货报告,尾期验货日期发送给所有质检员 3.产品意见发送全部信息

1.生产指示书添加图片
2.中期/尾期验货报告,尾期验货日期发送给所有质检员 3.产品意见发送全部信息
chenhang4442024
1 parent 9a1e5de5
Showing 7 changed files with 173 additions and 51 deletions
src/main/java/com/order/erp/common/utils/EasyPdfUtils.java
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/resources/images/alterego.png
src/main/resources/images/jqtc.png
src/main/resources/templates/mail.ftl
@@ -17,6 +17,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import wiki.xsx.core.pdf.component.image.XEasyPdfImage;
+import wiki.xsx.core.pdf.component.image.XEasyPdfImageType;
 import wiki.xsx.core.pdf.component.table.XEasyPdfCell;
 import wiki.xsx.core.pdf.component.table.XEasyPdfRow;
 import wiki.xsx.core.pdf.component.table.XEasyPdfTable;
@@ -24,13 +25,16 @@ import wiki.xsx.core.pdf.doc.*;
 import wiki.xsx.core.pdf.handler.XEasyPdfHandler;
 import javax.annotation.Resource;
+import java.awt.*;
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URL;
 import java.util.*;
+import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 //待拷贝start。
@@ -171,61 +175,67 @@ public class EasyPdfUtils {
         }*/
         //第二版  线上版。
-        try {
-            // 每页最大行数
-            int rowsPerPage = 10;
-            int totalRows = pdfVOList.size();
-            int totalPages = (int) Math.ceil((double) totalRows / rowsPerPage);
-
-            // 固定页面大小 (1700F 宽, 1000F 高)
-            XEasyPdfPageRectangle pageSize = XEasyPdfPageRectangle.create(1700F, 1000F);
-
-            // 计算总计
-            Integer totalOrderCount = 0;
-            BigDecimal totalPrice = new BigDecimal(Constant.ZERO);
-
-            for (OrderProducePdfVO producePdfVO : pdfVOList) {
-                totalOrderCount += Objects.nonNull(producePdfVO.getOrderCount()) ? producePdfVO.getOrderCount() : Constant.ZERO;
-                totalPrice = totalPrice.add(new BigDecimal(Objects.nonNull(producePdfVO.getProductionDepartmentTotalPrice()) ? producePdfVO.getProductionDepartmentTotalPrice() : Constant.ZERO).setScale(2, RoundingMode.HALF_UP));
+        try{
+//设置页面大小(1700F宽,1000F高)
+            XEasyPdfPageRectangle pageSize=XEasyPdfPageRectangle.create(1700F,1000F);
+
+//计算订单的总数和总价
+            Integer totalOrderCount=0;
+            BigDecimal totalPrice=new BigDecimal(Constant.ZERO);
+
+//计算所有订单的总量和总价
+            for(OrderProducePdfVO producePdfVO:pdfVOList){
+                totalOrderCount+=Objects.nonNull(producePdfVO.getOrderCount())?producePdfVO.getOrderCount():Constant.ZERO;
+                totalPrice=totalPrice.add(new BigDecimal(Objects.nonNull(producePdfVO.getProductionDepartmentTotalPrice())?producePdfVO.getProductionDepartmentTotalPrice():Constant.ZERO).setScale(2,RoundingMode.HALF_UP));
             }
-            int currentIndex = 1; // 初始化当前编号
-
-            for (int page = 0; page < totalPages; page++) {
-                // 计算当前页的数据
-                int startRow = page * rowsPerPage;
-                int endRow = Math.min(startRow + rowsPerPage, totalRows);
-                List<OrderProducePdfVO> pageData = pdfVOList.subList(startRow, endRow);
-                boolean isLastPage = (page == totalPages - 1);
-                // 创建表格并填充数据
-                XEasyPdfTable table = createTable(pageData, companyName, currentIndex, isLastPage, totalOrderCount, totalPrice);
-                currentIndex += pageData.size(); // 更新编号
-
-                // 创建页面
-                XEasyPdfPage pdfPage = XEasyPdfHandler.Page.build(pageSize, table);
-                document.addPage(pdfPage);
+            int currentIndex=1;//初始化当前记录的编号
+            int totalRows=pdfVOList.size();//获取总行数
+            int currentPageRows=0;//当前页面行数计数器
+            List<OrderProducePdfVO>currentPageData=new ArrayList<>();//当前页的数据
+            boolean isLastPage=false;//标记是否为最后一页
+
+            for(int i=0;i<totalRows;i++){
+                OrderProducePdfVO producePdfVO=pdfVOList.get(i);
+                currentPageData.add(producePdfVO);//将当前订单数据加入当前页面的数据列表
+                currentPageRows++;//当前页面行数+1
+
+//动态计算当前页面是否满了（基于内容长度和当前页面行数）
+                if(isPageFull(producePdfVO,currentPageRows)||i==totalRows-1){
+                    isLastPage=(i==totalRows-1);//如果是最后一条记录，则标记为最后一页
+
+//创建表格并填充数据
+                    XEasyPdfTable table=createTable(currentPageData,companyName,currentIndex,isLastPage,totalOrderCount,totalPrice);
+                    currentIndex+=currentPageData.size();//更新编号
+
+//创建并添加页面
+                    XEasyPdfPage pdfPage=XEasyPdfHandler.Page.build(pageSize,table);
+                    document.addPage(pdfPage);
+
+//清空当前页数据，准备下一页
+                    currentPageData.clear();
+                    currentPageRows=0;
+                }
             }
-            // 添加页脚
+//添加页脚以显示页码
             document.setGlobalFooter(XEasyPdfHandler.Footer.build(
                     XEasyPdfHandler.Text.build(
-                                    XEasyPdfHandler.Page.getCurrentPagePlaceholder() +
-                                            "/" +
-                                            XEasyPdfHandler.Page.getTotalPagePlaceholder())
+                                    XEasyPdfHandler.Page.getCurrentPagePlaceholder()+"/"+XEasyPdfHandler.Page.getTotalPagePlaceholder())
                             .setFontSize(10F)
                             .setHorizontalStyle(XEasyPdfPositionStyle.CENTER)
                             .setDefaultFontStyle(XEasyPdfDefaultFontStyle.LIGHT)
             ));
-            // 开启总页码占位符替换
+//开启总页码占位符替换
             document.enableReplaceTotalPagePlaceholder();
+//返回生成的PDF文档
             return document;
-        } catch (Exception e) {
+        }catch(Exception e){
             e.printStackTrace();
             return null;
         }
-
     }
     /**
@@ -247,6 +257,20 @@ public class EasyPdfUtils {
         return cell;
     }
+    private XEasyPdfCell createImageCell(InputStream imageStream, float width,float height) {
+        XEasyPdfImage image = XEasyPdfHandler.Image.build(imageStream, XEasyPdfImageType.PNG).
+                setHeight(250F).setWidth(250F).
+                setMarginTop(0F).setMarginLeft(0F).
+                setVerticalStyle(XEasyPdfPositionStyle.CENTER).setHorizontalStyle(XEasyPdfPositionStyle.CENTER);
+
+        XEasyPdfCell cell = XEasyPdfHandler.Table.Row.Cell.build(width, height).
+                addContent(image).
+                setVerticalStyle(XEasyPdfPositionStyle.CENTER).
+                setHorizontalStyle(XEasyPdfPositionStyle.CENTER).
+                enableCenterStyle().enableComponentSelfStyle();
+        return cell;
+    }
+
     /**
      * @param text
      * @param width
@@ -399,12 +423,32 @@ public class EasyPdfUtils {
         }
         List<XEasyPdfCell> signList = new ArrayList<>(2);
+        ClassLoader classLoader = getClass().getClassLoader();
+        InputStream imageStream = null;
         if ("青岛吉庆天成饰品有限公司".equals(companyName)) {
             signList.add(createCell("吉庆天成签字+日期：", 640F, 80F, 20F, XEasyPdfDefaultFontStyle.BOLD, XEasyPdfPositionStyle.CENTER, XEasyPdfPositionStyle.LEFT));
+            imageStream = classLoader.getResourceAsStream("images/jqtc.png");
         } else {
             signList.add(createCell("翱特逸格签字+日期：", 640F, 80F, 20F, XEasyPdfDefaultFontStyle.BOLD, XEasyPdfPositionStyle.CENTER, XEasyPdfPositionStyle.LEFT));
+            imageStream  = classLoader.getResourceAsStream("images/alterego.png");
+        }
+        if (imageStream != null) {
+            XEasyPdfCell imageCell = createImageCell(imageStream, 150F,150F);
+            // 设置图片超出边框的效果
+            imageCell.setMarginLeft(-380F)
+                     .setMarginTop(0F)
+                    .disableBorder();
+           signList.add(imageCell);
+            try {
+                imageStream.close();
+            } catch (IOException e) {
+                System.out.println("关闭图片流时发生错误：" + e.getMessage());
+            }
+        }else {
+            log.info("图片资源未找到或不存在");
         }
-        signList.add(createCell("外加工签字+日期：", 1020F, 80F, 20F, XEasyPdfDefaultFontStyle.BOLD, XEasyPdfPositionStyle.CENTER, XEasyPdfPositionStyle.LEFT));
+
+        signList.add(createCell("外加工签字+日期：", 1020F, 80F, 20F, XEasyPdfDefaultFontStyle.BOLD, XEasyPdfPositionStyle.CENTER, XEasyPdfPositionStyle.LEFT).setMarginLeft(230F));
         rowList.add(XEasyPdfHandler.Table.Row.build(signList));
         table.addRow(rowList);
@@ -412,6 +456,15 @@ public class EasyPdfUtils {
         return table;
     }
+//新代码9:22
+//根据当前行数和"产品意见"的长度动态判断页面是否已经满了
+
+    private boolean isPageFull(OrderProducePdfVO producePdfVO,int currentPageRows){
+        int maxRowsPerPage=9;//假设初始每页最多可以放10行数据
+        int extraRowsForComment=(int)Math.ceil((double)producePdfVO.getProductionComment().length()/25);//假设每50个字符占一行
+//如果当前行数+根据"产品意见"计算出的额外行数超过每页最大行数，返回true表示页面已满
+        return(currentPageRows+extraRowsForComment)>=maxRowsPerPage;
+    }
 }
 //待拷贝end。
 \ No newline at end of file
@@ -8,13 +8,18 @@ import com.order.erp.common.constant.Constant;
 import com.order.erp.common.utils.*;
 import com.order.erp.domain.EmailTemplateEnum;
 import com.order.erp.domain.OrderEventEnum;
+import com.order.erp.domain.RoleEnum;
 import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.admin.AdminRoleDO;
 import com.order.erp.domain.dto.admin.AdminUserDO;
+import com.order.erp.domain.dto.admin.AdminUserRoleDO;
 import com.order.erp.domain.dto.order.OrderBaseInfoDO;
 import com.order.erp.domain.dto.order.OrderInspectionStageDO;
 import com.order.erp.domain.dto.order.OrderTrackStageDO;
 import com.order.erp.domain.dto.order.ReceiveEmailMappingDO;
 import com.order.erp.domain.vo.order.*;
+import com.order.erp.service.admin.AdminRoleService;
+import com.order.erp.service.admin.AdminUserRoleService;
 import com.order.erp.service.admin.AdminUserService;
 import com.order.erp.service.order.*;
 import lombok.extern.slf4j.Slf4j;
@@ -64,6 +69,8 @@ public class OrderOverTimeEventJob {
     @Resource
     private AdminUserService adminUserService;
+    @Resource
+    private AdminUserRoleService adminUserRoleService;
     /**
      * 凌晨1点执行，一天一次
@@ -123,7 +130,7 @@ public class OrderOverTimeEventJob {
                     return null;
                 }).filter(Objects::nonNull)
                 .collect(Collectors.toList());
-        //如果为尾期验货事件的话,需要从订单中的生产科角色中得到邮箱。而不是从邮件配置中得到邮箱。
+        //如果为尾期验货事件的话,需要从订单中的生产科角色中得到邮箱。而不是从邮件配置中得到邮箱。并且还需要发送给所有的质检员。
         if (OrderEventEnum.END_CHECK_DATE_EVENT.equals(eventEnum)) {
             for (OrderEventJobVO orderEventJob : eventJobVOS) {
                 if (!redisUtils.hasKey(EmailTemplateEnum.byTemplate(
@@ -137,6 +144,19 @@ public class OrderOverTimeEventJob {
                     AdminUserDO productionDepartmentUser = adminUserService.getOne(new LambdaQueryWrapper<AdminUserDO>()
                             .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                             .eq(AdminUserDO::getUserName, productionDepartment));
+                    //得到所有的质检员。由于删除了角色,但是用户角色表中的信息没有删除,所以不能直接通过用户角色表拿角色,然后发邮件,需校验。
+                    List<AdminUserRoleDO> UserRoleList = adminUserRoleService.list(new LambdaQueryWrapper<AdminUserRoleDO>()
+                            .eq(AdminUserRoleDO::getRoleId, RoleEnum.INSPECT_USER.getId()));
+                    Set<Long> userIdList = UserRoleList.stream().map(AdminUserRoleDO::getUserId).collect(Collectors.toSet());
+                    List<AdminUserDO> produceList = adminUserService.list(new LambdaQueryWrapper<AdminUserDO>()
+                            .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                            .in(AdminUserDO::getId, userIdList)
+                            .eq(AdminUserDO::getStatus,Constant.ENABLE_TEN));
+                    List<String> produceEmailList = produceList.stream().map(AdminUserDO::getEmail).filter(Objects::nonNull)
+                            .flatMap(email -> Arrays.asList(email.split("[,，]+")).stream())
+                            .map(String::trim)
+                            .filter(s -> !s.isEmpty())
+                            .collect(Collectors.toList());
                     log.info("------------------------------------------------------------------------------------");
                     //得到订单的尾期验货日期的邮件配置中的邮箱。
                     LambdaQueryWrapper<ReceiveEmailMappingDO> receiveEmailMappingDOLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -167,6 +187,9 @@ public class OrderOverTimeEventJob {
                                 .filter(Objects::nonNull)
                                 .collect(Collectors.toList());
                         List<String> combineEmail =  new ArrayList<>(emails);
+                        if(CollectionUtils.isNotEmpty(produceEmailList)){
+                            combineEmail.addAll(produceEmailList);
+                        }
                         combineEmail.addAll(productionEmail);
                         emailSendUtils.sendEmail(EmailTemplateEnum.byTemplate(eventEnum.getTemplateId()),
                                 combineEmail, orderEventJob);
@@ -203,6 +203,7 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
             throw new BusinessException("用户名已存在");
         }
         if (StringUtils.isNotBlank(adminUserVO.getNickName())) {
+            //后续如果根据名称找用户,使用userName比较,不要使用NickName比较。
             adminUserDo.setUserName(adminUserVO.getNickName());
         }
         adminUserDo.setGender("男");
@@ -27,12 +27,14 @@ import com.order.erp.domain.*;
 import com.order.erp.domain.dto.BaseDO;
 import com.order.erp.domain.dto.SystemSettingDO;
 import com.order.erp.domain.dto.admin.AdminUserDO;
+import com.order.erp.domain.dto.admin.AdminUserRoleDO;
 import com.order.erp.domain.dto.order.*;
 import com.order.erp.domain.vo.ProducePdfVO;
 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.AdminUserRoleService;
 import com.order.erp.service.admin.AdminUserService;
 import com.order.erp.service.order.*;
 import freemarker.template.TemplateException;
@@ -135,6 +137,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Resource
     private ReceiveEmailMappingService receiveEmailMappingService;
+    @Resource
+    private AdminUserRoleService adminUserRoleService;
     /**
@@ -904,7 +908,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if (CollectionUtils.isEmpty(trackStageDOS)) {
             return;
         }
-        Map<Long, OrderTrackStageDO> trackStageDOMap = trackStageDOS.stream().collect(Collectors.toMap(OrderTrackStageDO::getOrderId, Function.identity()));
+        Map<Long, OrderTrackStageDO> trackStageDOMap = trackStageDOS.stream().collect(Collectors.toMap(OrderTrackStageDO::getOrderId, Function.identity(),(existing, replacement) -> existing));
         orderInfoResultVOList.forEach(result -> {
             if (trackStageDOMap.containsKey(result.getId())) {
                 OrderTrackStageDO trackStageDO = trackStageDOMap.get(result.getId());
@@ -2203,6 +2207,14 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if (CollectionUtils.isEmpty(orderProfitAnalysisList) || producePdfVO.getIds().size() != orderProfitAnalysisList.size()) {
             return ServerResult.fail("利润分析未填写,无法进行生成!");
         }
+        List<OrderFieldLockApplyDO> orderFieldLockApplyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderFieldLockApplyDO::getOrderId, producePdfVO.getIds())
+                .eq(OrderFieldLockApplyDO::getType, ApplyTypeEnum.ORDER_PROFIT_APPLY.getType())
+                .eq(OrderFieldLockApplyDO::getStatus,ApplyStatusEnum.WAIT_AUDIT.getStatus()));
+        if(CollectionUtils.isNotEmpty(orderFieldLockApplyDOS)){
+            return ServerResult.fail("订单中包含利润未审批的订单,无法生成！");
+        }
         ProducePdfVO producePdf = pdfUtils.createProducePdf(pdfUtils.build(producePdfVO.getIds()), "生产指示书.pdf", producePdfVO.getCompanyName());
         return ServerResult.success(producePdf);
     }
@@ -2319,7 +2331,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     if(CollectionUtils.isNotEmpty(producePdfVO.getPersonList())){
                         List<AdminUserDO> personUser = adminUserService.list(new LambdaQueryWrapper<AdminUserDO>()
                                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                                .in(AdminUserDO::getNickName, producePdfVO.getPersonList()));
+                                .in(AdminUserDO::getUserName, producePdfVO.getPersonList()));
                         if(CollectionUtils.isNotEmpty(personUser)){
                             List<String> personList = personUser.stream().map(AdminUserDO::getEmail).filter(Objects::nonNull)
                                     .flatMap(email -> Arrays.asList(email.split("[,，]+")).stream())
@@ -2386,6 +2398,19 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                             .last("limit 1");
                 }
                 ReceiveEmailMappingDO receiveEmailMappingDO = receiveEmailMappingService.getOne( receiveEmailMappingDOLambdaQueryWrapper);
+                //得到所有的质检员。由于删除了角色,但是用户角色表中的信息没有删除,所以不能直接通过用户角色表拿角色,然后发邮件,需校验。
+                List<AdminUserRoleDO> UserRoleList = adminUserRoleService.list(new LambdaQueryWrapper<AdminUserRoleDO>()
+                        .eq(AdminUserRoleDO::getRoleId, RoleEnum.INSPECT_USER.getId()));
+                Set<Long> userIdList = UserRoleList.stream().map(AdminUserRoleDO::getUserId).collect(Collectors.toSet());
+                List<AdminUserDO> produceList = adminUserService.list(new LambdaQueryWrapper<AdminUserDO>()
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .in(AdminUserDO::getId, userIdList)
+                        .eq(AdminUserDO::getStatus,Constant.ENABLE_TEN));
+                List<String> produceEmailList = produceList.stream().map(AdminUserDO::getEmail).filter(Objects::nonNull)
+                        .flatMap(email -> Arrays.asList(email.split("[,，]+")).stream())
+                        .map(String::trim)
+                        .filter(s -> !s.isEmpty())
+                        .collect(Collectors.toList());
                 List<String> emailList = new ArrayList<>();
                 if (Objects.nonNull(receiveEmailMappingDO)) {
@@ -2401,6 +2426,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 if (CollectionUtils.isNotEmpty(emails) && CollectionUtils.isNotEmpty(emailList)) {
                     List<String> emailLists = emailList.stream().flatMap(email -> Arrays.stream(email.split("[,，]+"))).collect(Collectors.toList());
                     List<String> combineEmail = new ArrayList<>(emails);
+                    if(CollectionUtils.isNotEmpty(produceEmailList)){
+                        combineEmail.addAll(produceEmailList);
+                    }
                     combineEmail.addAll(emailLists);
                     //尾期验货报告。
@@ -2424,6 +2452,19 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                             .last("limit 1");
                 }
                 ReceiveEmailMappingDO receiveEmailMappingDO = receiveEmailMappingService.getOne( receiveEmailMappingDOLambdaQueryWrapper);
+                //得到所有的质检员。由于删除了角色,但是用户角色表中的信息没有删除,所以不能直接通过用户角色表拿角色,然后发邮件,需校验。
+                List<AdminUserRoleDO> UserRoleList = adminUserRoleService.list(new LambdaQueryWrapper<AdminUserRoleDO>()
+                        .eq(AdminUserRoleDO::getRoleId, RoleEnum.INSPECT_USER.getId()));
+                Set<Long> userIdList = UserRoleList.stream().map(AdminUserRoleDO::getUserId).collect(Collectors.toSet());
+                List<AdminUserDO> produceList = adminUserService.list(new LambdaQueryWrapper<AdminUserDO>()
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .in(AdminUserDO::getId, userIdList)
+                        .eq(AdminUserDO::getStatus,Constant.ENABLE_TEN));
+                List<String> produceEmailList = produceList.stream().map(AdminUserDO::getEmail).filter(Objects::nonNull)
+                        .flatMap(email -> Arrays.asList(email.split("[,，]+")).stream())
+                        .map(String::trim)
+                        .filter(s -> !s.isEmpty())
+                        .collect(Collectors.toList());
                 List<String> emailList = new ArrayList<>();
                 if (Objects.nonNull(receiveEmailMappingDO)) {
                     List<ReceiveEmailConfigItemVO> receiveEmailConfigItemVOList = JSON.parseObject(
@@ -2438,6 +2479,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 if (CollectionUtils.isNotEmpty(emails) && CollectionUtils.isNotEmpty(emailList)) {
                     List<String> emailLists = emailList.stream().flatMap(email -> Arrays.stream(email.split("[,，]+"))).collect(Collectors.toList());
                     List<String> combineEmail = new ArrayList<>(emails);
+                    if(CollectionUtils.isNotEmpty(produceEmailList)){
+                        combineEmail.addAll(produceEmailList);
+                    }
                     combineEmail.addAll(emailLists);
                     //中期验货报告。
                     emailSendUtils.sendEmail(EmailTemplateEnum.MID_CHECK_REPORT_TEMPLATE, combineEmail, orderEventJobVO);
@@ -2469,10 +2513,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     orderEventJobVO.getBaseInfo().setPoColor(orderBaseInfoDo.getPoColor());
                     orderEventJobVO.getBaseInfo().setSmallPicUrl(orderBaseInfoDo.getSmallPicUrl());
                     orderEventJobVO.getBaseInfo().setOrderCount(orderBaseInfoDo.getOrderCount());
-                    String[] split = productionComment.split("\n");
-                    String[] split1 = split[split.length - 1].split("[:：]+");
-                    String lastProductionComment = split1[split1.length - 1];
-                    orderEventJobVO.getBaseInfo().setProductionComment(lastProductionComment);
+//                    String[] split = productionComment.split("\n");
+//                    String[] split1 = split[split.length - 1].split("[:：]+");
+                    //这里需要设置不单单只发送最后一条消息。应该是所有的消息。
+//                    String lastProductionComment = split1[split1.length - 1];
+                    orderEventJobVO.getBaseInfo().setProductionComment(productionComment);
                     orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(orderBaseInfoDo.getProductionDepartmentConsignTime().substring(0, 10));
                     //目前是选择的是跟单员邮箱和业务员邮箱。
                     emailSendUtils.sendEmail(EmailTemplateEnum.PRODUCE_IDEA, emailList, orderEventJobVO);
@@ -43,7 +43,7 @@
             <td> 客户SYSTEM</td>
             <td> PO COLOR</td>
             <td> 订单图片</td>
-            <td> 生产要求</td>
+            <td> 产品意见</td>
             <td> 数量 </td>
             <td> 生产科拖货时间</td>
             <td> 包装类型</td>
@@ -58,7 +58,7 @@
             <td> 客户SYSTEM</td>
             <td> PO COLOR</td>
             <td> 订单图片</td>
-            <td> 生产要求</td>
+            <td> 产品意见</td>
             <td> 数量 </td>
             <td> 生产科拖货时间</td>
             <td> 包装类型</td>
@@ -80,7 +80,7 @@
             <td> 客户SYSTEM</td>
             <td> PO COLOR</td>
             <td> 订单图片</td>
-            <td> 生产要求</td>
+            <td> 产品意见</td>
             <td> 数量</td>
             <td> 生产科拖货时间</td>
         <#elseif title=="产品意见信息" >
@@ -91,7 +91,7 @@
                 <td> 客户SYSTEM</td>
                 <td> PO COLOR</td>
                 <td> 订单图片</td>
-                <td> 生产要求</td>
+                <td> 产品意见</td>
                 <td> 数量</td>
                 <td> 生产科拖货时间</td>
         <#else>
@@ -103,7 +103,7 @@
                 <td> 客户SYSTEM</td>
                 <td> PO COLOR</td>
                 <td> 订单图片</td>
-                <td> 生产要求</td>
+                <td> 产品意见</td>
                 <td> 数量</td>
                 <td> 生产科拖货时间</td>
                 <td> 订单上的HOD时间</td>