Merge branch 'fix-main-ch' into 'main'

Fix main ch See merge request !15

Merge branch 'fix-main-ch' into 'main'
Fix main ch See merge request !15
chwork
2 parents d2ff4271 25b987be
Showing 25 changed files with 1550 additions and 109 deletions
src/main/java/com/order/erp/common/utils/EasyPdfUtils.java
src/main/java/com/order/erp/common/utils/OrderFieldUtils.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/domain/EmailTemplateEnum.java
src/main/java/com/order/erp/domain/OrderOpinionLogEnum.java
src/main/java/com/order/erp/domain/dto/order/OrderBaseInfoDO.java
src/main/java/com/order/erp/domain/dto/order/OrderOpinionLogDO.java
src/main/java/com/order/erp/domain/pdf/OrderProducePdfVO.java
src/main/java/com/order/erp/domain/vo/ProducePdfVO.java
src/main/java/com/order/erp/domain/vo/order/OrderBaseFieldVO.java
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoVO.java
src/main/java/com/order/erp/domain/vo/order/OrderOpinionLogVO.java
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
src/main/java/com/order/erp/mapper/order/OrderOpinionLogMapper.java
src/main/java/com/order/erp/service/LocalStorageService.java
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
src/main/java/com/order/erp/service/impl/LocalStorageServiceImpl.java
src/main/java/com/order/erp/service/order/OrderBaseInfoService.java
src/main/java/com/order/erp/service/order/OrderOpinionLogService.java
+package com.order.erp.common.utils;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.order.erp.common.constant.Constant;
+import com.order.erp.common.exception.BusinessException;
+import com.order.erp.domain.dto.BaseDO;
+import com.order.erp.domain.dto.order.OrderBaseInfoDO;
+import com.order.erp.domain.dto.order.OrderProfitAnalysisDO;
+import com.order.erp.domain.pdf.OrderProducePdfVO;
+import com.order.erp.domain.vo.FileRespVO;
+import com.order.erp.domain.vo.ProducePdfVO;
+import com.order.erp.service.LocalStorageService;
+import com.order.erp.service.order.OrderBaseInfoService;
+import com.order.erp.service.order.OrderProfitAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+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;
+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。
+
+/**
+ * @author: xms
+ * @description: TODO
+ * @date: 2024/7/17 16:30
+ * @version: 1.0
+ */
+@Slf4j
+@Service
+public class EasyPdfUtils {
+
+    @Resource
+    private OrderBaseInfoService orderBaseInfoService;
+
+    @Resource
+    private OrderProfitAnalysisService profitAnalysisService;
+    @Resource
+    private LocalStorageService localStorageService;
+
+    @Value("${file.path}")
+    private String path;
+
+    public List<OrderProducePdfVO> build(List<Long> ids) {
+        List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(new LambdaQueryWrapper<OrderBaseInfoDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderBaseInfoDO::getId, ids));
+        Set<String> productionDepartments = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getProductionDepartment).filter(Objects::nonNull)
+                .filter(department -> !department.trim().isEmpty()).collect(Collectors.toSet());
+        if (productionDepartments.size() > 1) {
+            throw new BusinessException("订单中包含多个不同生产科,请重新选择!");
+        }
+        //得到所选订单的创建人。
+        Set<String> createByList = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getCreateBy).collect(Collectors.toSet());
+        //得到所选订单的业务员。
+        Set<String> businessPersonList=orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getBusinessPerson).collect(Collectors.toSet());
+        //去重。
+        HashSet<String> setPerson = new HashSet<>(createByList);
+        setPerson.addAll(businessPersonList);
+        List<String> personList= new ArrayList<>(setPerson);
+        Set<Long> orderIds = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toSet());
+        List<OrderProfitAnalysisDO> profitAnalysisDOS = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>().in(OrderProfitAnalysisDO::getOrderId, orderIds));
+        Map<Long, OrderProfitAnalysisDO> profitAnalysisDOMap = profitAnalysisDOS.stream().collect(Collectors.toMap(OrderProfitAnalysisDO::getOrderId, Function.identity()));
+        return orderBaseInfoDOList.stream().map(x -> {
+            OrderProducePdfVO producePdfVO = new OrderProducePdfVO();
+            BeanUtils.copyProperties(x, producePdfVO);
+            OrderProfitAnalysisDO profitAnalysisDO = profitAnalysisDOMap.get(x.getId());
+            if (Objects.nonNull(profitAnalysisDO)) {
+                producePdfVO.setProductionDepartmentPrice(profitAnalysisDO.getProductionDepartmentPrice());
+                producePdfVO.setProductionDepartmentTotalPrice(profitAnalysisDO.getProductionDepartmentTotalPrice());
+            }
+            producePdfVO.setPersonList(personList);
+            return producePdfVO;
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * @param pdfVOList
+     * @param fileName
+     * @return
+     */
+    public ProducePdfVO createProducePdf(List<OrderProducePdfVO> pdfVOList, String fileName, String companyName) {
+        Set<String> productionDepartments = pdfVOList.stream().map(OrderProducePdfVO::getProductionDepartment).filter(Objects::nonNull)
+                .filter(department -> !department.trim().isEmpty())
+                .collect(Collectors.toSet());
+        if (productionDepartments.size() > 1) {
+            throw new BusinessException("订单中包含多个不同生产科,请重新选择!");
+        }
+        String pathUri = path + "pdfs" + File.separator + AliOssUtil.getUniqueFileName(companyName);
+        OutputStream os = FileUtil.getOutputStream(pathUri);
+        XEasyPdfDocument document = createProducePdf(pdfVOList, companyName);
+        document.save(os);
+        File file = FileUtil.file(pathUri);
+        FileRespVO fileRespVO = localStorageService.getFilePath(file,companyName);
+        ProducePdfVO producePdfVO = new ProducePdfVO();
+        producePdfVO.setProductionUrl(fileRespVO.getFileUrl());
+        producePdfVO.setProductionDepartment(productionDepartments.iterator().next());
+        //得到订单的创建人和业务员。
+        producePdfVO.setProductionDepartment(productionDepartments.iterator().next());
+        Optional<List<String>> firstElementFromSet1 = pdfVOList.stream().findFirst().map(OrderProducePdfVO::getPersonList);
+        List<String> personList = firstElementFromSet1.orElse(Collections.emptyList());
+        producePdfVO.setPersonList(personList);
+        return producePdfVO;
+    }
+
+    /**
+     * @param pdfVOList
+     * @return
+     */
+    public XEasyPdfDocument createProducePdf(List<OrderProducePdfVO> pdfVOList, String companyName) {
+        // 构建文档
+        XEasyPdfDocument document = XEasyPdfHandler.Document.build();
+      /*  try {
+            // 表格
+            XEasyPdfTable table = createTable(pdfVOList, companyName);
+            XEasyPdfPage page = XEasyPdfHandler.Page.build(XEasyPdfPageRectangle.create(1700F, pdfVOList.size() * 500F), table);
+            if(pdfVOList.size()==1){
+                page = XEasyPdfHandler.Page.build(XEasyPdfPageRectangle.create(1700F, pdfVOList.size() * 1000F), table);
+            }else if(pdfVOList.size()==2){
+                // 创建页面
+                 page = XEasyPdfHandler.Page.build(XEasyPdfPageRectangle.create(1700F, pdfVOList.size() * 500F), table);
+            } else if (pdfVOList.size()==3) {
+                 page = XEasyPdfHandler.Page.build(XEasyPdfPageRectangle.create(1700F, pdfVOList.size() * 333F), table);
+            } else if (pdfVOList.size()==4) {
+                page = XEasyPdfHandler.Page.build(XEasyPdfPageRectangle.create(1700F, pdfVOList.size() * 250F), table);
+            } else if (pdfVOList.size()==5) {
+                 page = XEasyPdfHandler.Page.build(XEasyPdfPageRectangle.create(1700F, pdfVOList.size() * 200F), table);
+            } else if (pdfVOList.size()==6) {
+                 page = XEasyPdfHandler.Page.build(XEasyPdfPageRectangle.create(1700F, pdfVOList.size() * 166F), table);
+            } else if (pdfVOList.size()==7) {
+                page = XEasyPdfHandler.Page.build(XEasyPdfPageRectangle.create(1700F, pdfVOList.size() * 142F), table);
+            } else if (pdfVOList.size()==8) {
+                 page = XEasyPdfHandler.Page.build(XEasyPdfPageRectangle.create(1700F, pdfVOList.size() * 125F), table);
+            } else if (pdfVOList.size()==9) {
+                 page = XEasyPdfHandler.Page.build(XEasyPdfPageRectangle.create(1700F, pdfVOList.size() * 111F), table);
+            } else {
+                 page = XEasyPdfHandler.Page.build(XEasyPdfPageRectangle.create(1700F, pdfVOList.size() * 100F), table);
+            }
+            // 将页面添加到文档
+            document.addPage(page);
+            // 添加页脚
+            document.setGlobalFooter(XEasyPdfHandler.Footer.build(
+                    //构建文本（使用当前页占位符)
+                    XEasyPdfHandler.Text.build(
+                                    XEasyPdfHandler.Page.getCurrentPagePlaceholder() +
+                                            "/" +
+                                            XEasyPdfHandler.Page.getTotalPagePlaceholder()).
+                            setFontSize(10F).setHorizontalStyle(XEasyPdfPositionStyle.CENTER).
+                            setDefaultFontStyle(XEasyPdfDefaultFontStyle.LIGHT)
+            ));
+            // 开启总页码占位符替换
+            document.enableReplaceTotalPagePlaceholder();
+            return document;
+        } catch (Exception e) {
+            return null;
+        }*/
+
+        //第二版  线上版。
+        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;//初始化当前记录的编号
+            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())
+                            .setFontSize(10F)
+                            .setHorizontalStyle(XEasyPdfPositionStyle.CENTER)
+                            .setDefaultFontStyle(XEasyPdfDefaultFontStyle.LIGHT)
+            ));
+
+//开启总页码占位符替换
+            document.enableReplaceTotalPagePlaceholder();
+
+//返回生成的PDF文档
+            return document;
+        }catch(Exception e){
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * @param imageFile
+     * @param width
+     * @return
+     */
+    private XEasyPdfCell createImageCell(File imageFile, float width) {
+        XEasyPdfImage image = XEasyPdfHandler.Image.build(imageFile).
+                setHeight(40F).setWidth(80F).
+                setMarginTop(0F).setMarginLeft(0F).
+                setVerticalStyle(XEasyPdfPositionStyle.CENTER).setHorizontalStyle(XEasyPdfPositionStyle.CENTER);
+
+        XEasyPdfCell cell = XEasyPdfHandler.Table.Row.Cell.build(width, 60F).
+                addContent(image).
+                setVerticalStyle(XEasyPdfPositionStyle.CENTER).
+                setHorizontalStyle(XEasyPdfPositionStyle.CENTER).
+                enableCenterStyle().enableComponentSelfStyle();
+        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
+     * @return
+     */
+    private XEasyPdfCell createCell(String text, float width, float fontSize) {
+        XEasyPdfCell cell = XEasyPdfHandler.Table.Row.Cell.build(width, 50F).
+                addContent(XEasyPdfHandler.Text.build(text).
+                        setVerticalStyle(XEasyPdfPositionStyle.CENTER).
+                        setHorizontalStyle(XEasyPdfPositionStyle.CENTER).
+                        setDefaultFontStyle(XEasyPdfDefaultFontStyle.LIGHT).setFontSize(fontSize)).
+                enableCenterStyle().enableComponentSelfStyle();
+        return cell;
+    }
+
+    /**
+     * @param text
+     * @param width
+     * @return
+     */
+    private XEasyPdfCell createCell(String text, float width, float height, float fontSize, XEasyPdfDefaultFontStyle fontStyle) {
+        XEasyPdfCell cell = XEasyPdfHandler.Table.Row.Cell.build(width, height).
+                addContent(XEasyPdfHandler.Text.build(text).
+                        setVerticalStyle(XEasyPdfPositionStyle.CENTER).
+                        setHorizontalStyle(XEasyPdfPositionStyle.CENTER).
+                        setDefaultFontStyle(fontStyle).setFontSize(fontSize)).
+                enableCenterStyle().enableComponentSelfStyle();
+        return cell;
+    }
+
+    /**
+     * @param text
+     * @param width
+     * @return
+     */
+    private XEasyPdfCell createCell(String text, float width) {
+        XEasyPdfCell cell = XEasyPdfHandler.Table.Row.Cell.build(width).
+                addContent(XEasyPdfHandler.Text.build(text).
+                        setVerticalStyle(XEasyPdfPositionStyle.CENTER).
+                        setHorizontalStyle(XEasyPdfPositionStyle.CENTER).
+                        setDefaultFontStyle(XEasyPdfDefaultFontStyle.LIGHT).setFontSize(16)).
+                enableCenterStyle().enableComponentSelfStyle();
+        return cell;
+    }
+
+    /**
+     * @param text
+     * @param width
+     * @return
+     */
+    private XEasyPdfCell createCell(String text, float width, float height, float fontSize,
+                                    XEasyPdfDefaultFontStyle fontStyle,
+                                    XEasyPdfPositionStyle verticalStyle,
+                                    XEasyPdfPositionStyle horizontalStyle) {
+        XEasyPdfCell cell = XEasyPdfHandler.Table.Row.Cell.build(width, height).
+                addContent(XEasyPdfHandler.Text.build(text).
+                        setVerticalStyle(verticalStyle).
+                        setHorizontalStyle(horizontalStyle).
+                        setDefaultFontStyle(fontStyle).setFontSize(fontSize)).
+                enableCenterStyle().enableComponentSelfStyle();
+        return cell;
+    }
+
+    /**
+     * @return
+     */
+    private XEasyPdfTable createTable(List<OrderProducePdfVO> pdfVOList, String companyName, int startIndex,boolean isLastPage,Integer totalOrderCount, BigDecimal totalPrice) throws Exception {
+        XEasyPdfTable table = XEasyPdfHandler.Table.build();
+        List<XEasyPdfRow> rowList = new ArrayList<>();
+        List<XEasyPdfCell> cellList = new ArrayList<>(15);
+        List<XEasyPdfCell> header = new ArrayList<>(1);
+        if ("青岛吉庆天成饰品有限公司".equals(companyName)) {
+            header.add(createCell("青岛吉庆天成生产订单", 1660F, 70F, 24F, XEasyPdfDefaultFontStyle.BOLD));
+        } else {
+            header.add(createCell("青岛翱特逸格生产订单", 1660F, 70F, 24F, XEasyPdfDefaultFontStyle.BOLD));
+        }
+        rowList.add(XEasyPdfHandler.Table.Row.build(header));
+        // 第一行设置表头，默认标题
+        cellList.add(createCell("编号", 50F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("项目号", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("生产科", 90F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("内部编号", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("客户订单号", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("客户款号", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("REFERENCE", 100F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("订单颜色", 120F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("颜色中文", 100F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("订单图片", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("产品意见", 150F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("订单数量", 90F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("生产科交期", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("包装类型", 80F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("生产科单价", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        cellList.add(createCell("生产科总价", 110F, 60F, 16F, XEasyPdfDefaultFontStyle.BOLD));
+        rowList.add(XEasyPdfHandler.Table.Row.build(cellList));
+
+        for (int i = 0; i < pdfVOList.size(); i++) {
+            OrderProducePdfVO producePdfVO = pdfVOList.get(i);
+            String productionDepartmentConsignTime = StringUtils.isNotBlank(producePdfVO.getProductionDepartmentConsignTime()) ?
+                    DateUtils.format(DateUtils.parseDate(producePdfVO.getProductionDepartmentConsignTime(), DateUtils.DATE_TIME), DateUtils.DATE) : "";
+
+            List<XEasyPdfCell> dataCellList = new ArrayList<>(15);
+            dataCellList.add(createCell("" + (startIndex + i), 50F)); // 使用连续编号
+            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getProjectNo()) ? producePdfVO.getProjectNo() : "", 110F));
+            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getProductionDepartment()) ? producePdfVO.getProductionDepartment() : "", 90F));
+            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getInnerNo()) ? producePdfVO.getInnerNo() : "", 110F));
+            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getCustomerPo()) ? producePdfVO.getCustomerPo() : "", 110F));
+            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getCustomerStyle()) ? producePdfVO.getCustomerStyle() : "", 110F));
+            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getModeleLo()) ? producePdfVO.getModeleLo() : "", 100F));
+            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getPoColor()) ? producePdfVO.getPoColor() : "", 120F));
+            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getCnColor()) ? producePdfVO.getCnColor() : "", 100F));
+            if (StringUtils.isNotBlank(producePdfVO.getPicUrl())) {
+                URL url = new URL(producePdfVO.getPicUrl());
+                InputStream inputStream = url.openStream();
+                File imageFile = FileUtil.inputStreamToFile(inputStream, "order" + System.currentTimeMillis() + ".png");
+
+                dataCellList.add(createImageCell(imageFile, 110F));
+            } else {
+                dataCellList.add(createCell("", 110F));
+            }
+            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getProductionComment()) ? producePdfVO.getProductionComment() : "", 150F));
+            if (Constant.ZERO == producePdfVO.getOrderCount()) {
+                dataCellList.add(createCell("", 90F));
+            } else {
+                dataCellList.add(createCell("" + producePdfVO.getOrderCount(), 90F));
+            }
+            dataCellList.add(createCell(productionDepartmentConsignTime, 110F));
+            dataCellList.add(createCell(StringUtils.isNotEmpty(producePdfVO.getPacketType()) ? producePdfVO.getPacketType() : "", 80F));
+            dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentPrice()) ? "" + "￥"+producePdfVO.getProductionDepartmentPrice() : "", 110F));
+            dataCellList.add(createCell(Objects.nonNull(producePdfVO.getProductionDepartmentTotalPrice()) ? "" + "￥"+producePdfVO.getProductionDepartmentTotalPrice() : "", 110F));
+            rowList.add(XEasyPdfHandler.Table.Row.build(dataCellList));
+        }
+
+        if (isLastPage) {
+            List<XEasyPdfCell> endCellList = new ArrayList<>(15);
+            endCellList.add(createCell("合计", 50F, 16F));
+            endCellList.add(createCell("", 110F));
+            endCellList.add(createCell("", 90F));
+            endCellList.add(createCell("", 110F));
+            endCellList.add(createCell("", 110F));
+            endCellList.add(createCell("", 110F));
+            endCellList.add(createCell("", 100F));
+            endCellList.add(createCell("", 120F));
+            endCellList.add(createCell("", 100F));
+            endCellList.add(createCell("", 110F));
+            endCellList.add(createCell("", 150F));
+            endCellList.add(createCell("" + totalOrderCount, 90F, 16F));
+            endCellList.add(createCell("", 110F));
+            endCellList.add(createCell("", 80F));
+            endCellList.add(createCell("", 110F));
+            endCellList.add(createCell("￥" + totalPrice, 110F, 16F));
+            rowList.add(XEasyPdfHandler.Table.Row.build(endCellList));
+        }
+
+        List<XEasyPdfCell> signList = new ArrayList<>(2);
+        ClassLoader classLoader = getClass().getClassLoader();
+        InputStream imageStream = null;
+        if ("青岛吉庆天成饰品有限公司".equals(companyName)) {
+            signList.add(createCell("吉庆天成签字+日期：", 680F, 80F, 20F, XEasyPdfDefaultFontStyle.BOLD, XEasyPdfPositionStyle.CENTER, XEasyPdfPositionStyle.LEFT));
+            imageStream = classLoader.getResourceAsStream("images/jqtc.png");
+        } else {
+            signList.add(createCell("翱特逸格签字+日期：", 680F, 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("外加工签字+日期：", 980F, 80F, 20F, XEasyPdfDefaultFontStyle.BOLD, XEasyPdfPositionStyle.CENTER, XEasyPdfPositionStyle.LEFT).setMarginLeft(230F));
+        rowList.add(XEasyPdfHandler.Table.Row.build(signList));
+
+        table.addRow(rowList);
+        table.setHorizontalStyle(XEasyPdfPositionStyle.CENTER).setMarginLeft(10F).setMarginTop(60F).setMarginBottom(10F);
+        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
@@ -309,6 +309,9 @@ public class OrderFieldUtils {
         if (OrderLockFieldEnum.UN_LOCKED.getStatus().equals(baseFields.getBusinessPerson())) {
             return true;
         }
+        if (OrderLockFieldEnum.UN_LOCKED.getStatus().equals(baseFields.getReturnOrder())) {
+            return true;
+        }
         return false;
     }
@@ -358,6 +361,7 @@ public class OrderFieldUtils {
                 .productStyle(locked)
                 .projectNo(locked)
                 .businessPerson(locked)
+                .returnOrder(locked)
                 .build();
     }
@@ -4,6 +4,7 @@ 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.exception.BusinessException;
+import com.order.erp.domain.vo.ProducePdfVO;
 import com.order.erp.domain.vo.order.*;
 import com.order.erp.mapper.order.OrderBaseInfoMapper;
 import com.order.erp.service.order.OrderBaseInfoService;
@@ -157,6 +158,28 @@ public class OrderController {
         return orderBaseInfoService.check(orderBaseInfoQueryVO);
     }
+    /**
+     * 一次性通过率
+     *
+     * @param orderOpinionLogVO 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/passRate")
+    @AnonymousAccess
+    public ServerResult oneTimePassRate(@RequestBody OrderOpinionLogVO orderOpinionLogVO) {
+        return orderBaseInfoService.passRate(orderOpinionLogVO);
+    }
+
+    @PostMapping("/produceReport")
+    public ServerResult produceReport(@RequestBody ProducePdfVO producePdfVO) {
+        return orderBaseInfoService.produceReport(producePdfVO);
+    }
+
+    @PostMapping("/send")
+    public ServerResult send(@RequestBody ProducePdfVO producePdfVO) throws Exception {
+        return orderBaseInfoService.send(producePdfVO);
+    }
+
 }
+package com.order.erp.controller;
+
+import com.order.erp.common.annotation.AnonymousAccess;
+import com.order.erp.common.constant.ServerResult;
+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;
+
+import javax.annotation.Resource;
+
+/**
+ *
+ * 订单跟单结果记录日志表(OrderOpinionLogDO)表控制层
+ * @Author:ch
+ * @createTime:2024-08-05
+ */
+@Api(tags = "订单跟单结果记录")
+@RestController
+@RequestMapping("/order/erp/opinion/log")
+public class OrderOpinionLonController {
+
+    @Resource
+    private OrderOpinionLogService orderOpinionLogService;
+
+    @PostMapping("/query_by_id")
+    @ApiOperation("查询订单的跟单结果记录")
+    @AnonymousAccess
+    public ServerResult queryById(@RequestBody @Validated OrderOpinionLogVO orderOpinionLogVo){
+       return  orderOpinionLogService.queryById(orderOpinionLogVo);
+    }
+
+}
@@ -15,7 +15,7 @@ public enum EmailTemplateEnum {
     CONFIRM_SAMPLE_TEMPLATE("确认样确认状态", "您收到此邮件是因为您未能在规定的期限内完成以下货号的确认样确认，请尽快完成", 1L),
-    OTHER_SAMPLE_TEMPLATE("其他要求样品发送日期", "您收到此邮件是因为您未能在规定的期限内完成以下货号的其他要求样品的发送，请尽快完成", 2L),
+    OTHER_SAMPLE_TEMPLATE("EXTRA,SHOWROOM,ONLINE sample发送日期", "您收到此邮件是因为您未能在规定的期限内完成以下货号的EXTRA,SHOWROOM,ONLINE sample的发送，请尽快完成", 2L),
     BIG_SAMPLE_TEMPLATE("大货样确认状态", "您收到此邮件是因为您未能在规定的期限内完成以下货号的大货样确认，请尽快完成", 3L),
@@ -31,7 +31,9 @@ public enum EmailTemplateEnum {
     END_CHECK_REPORT_TEMPLATE("尾期验货报告", "您好，请查收尾期验货报告", 9L),
-    PRODUCE_INDICATE_REPORT("生产指示书报告","你好，请查收附件生产订单",10L),
+    PRODUCE_INDICATE_REPORT("生产指示书","你好，请查收附件生产订单",10L),
+
+    PRODUCE_IDEA("产品意见信息","你好，请查收产品意见信息",11L),
     ;
+package com.order.erp.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+//待拷贝START。
+
+/**
+ * @Author:ch
+ * @createTime:2024-08-05
+ */
+
+@Getter
+@AllArgsConstructor
+public enum OrderOpinionLogEnum {
+  ORDER_PRODUCTION_COMMENT("productionComment","产品意见"),
+  ORDER_PP_CONFIRRM_RESULT("ppConfirmResult","pp样品确认意见"),
+  ORDER_SHIPMENT_SAMPLE_CONFIRM_RESULT("shippmentSampleConfirmResult","shipment sample确认意见"),
+  ORDER_AITEX_TEST_FINISH_RESULT("aitexTestResult","Altex测试结果"),
+  ORDER_SGS_TEST_FINISH_RESULT("sgsTestFinishResult","SGS测试结果"),
+    ;
+    private String type;
+
+    private String desc;
+}
+//待拷贝END。
 \ No newline at end of file
@@ -115,4 +115,9 @@ public class OrderBaseInfoDO extends BaseDO implements Serializable {
      * 业务员
      */
     private String businessPerson;
+
+    /**
+     * 是否返单
+     */
+    private String returnOrder;
 }
+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;
+
+/**
+ * @Author:ch
+ * @createTime:2024-08-05
+ * @Description:订单跟单结果记录日志表。
+ */
+//待拷贝start。
+@TableName("order_opinion_log")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderOpinionLogDO extends BaseDO implements Serializable {
+    private Long id;
+
+    /**
+     * 订单id
+     */
+     private Long orderId;
+    /**
+     * 意见类型(SGS/Aitex/SHIPPMENT/PP/产品意见)
+     */
+    private String opinionType;
+
+    /**
+     * 更新字段
+     */
+    private String field;
+}
+//待拷贝end。
 \ No newline at end of file
+package com.order.erp.domain.pdf;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+//待拷贝start。
+
+/**
+ * 生产指示书pdf
+ *
+ * @author makejava
+ * @since 2023-09-08 15:26:43
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderProducePdfVO implements Serializable {
+
+    /**
+     * 项目号
+     */
+    private String projectNo;
+
+    /**
+     * 生产科
+     */
+    private String productionDepartment;
+
+    /**
+     * 内部编号
+     */
+    private String innerNo;
+
+    /**
+     * 客户po号(客户订单号)
+     */
+    private String customerPo;
+
+    /**
+     * 客户STYLE#(客户款号)
+     */
+    private String customerStyle;
+    /**
+     * Modelo(REFERENCE)
+     */
+    private String modeleLo;
+    /**
+     * PO COLOR (订单颜色)
+     */
+    private String poColor;
+
+    /**
+     * 颜色中文
+     */
+    private String cnColor;
+
+    /**
+     * pic图片地址(订单图片)
+     */
+    private String picUrl;
+
+    /**
+     * 产品意见
+     */
+    private String productionComment;
+
+    /**
+     * 订单数量
+     */
+    private Integer orderCount;
+
+    /**
+     * 生成科拖货时间(生产科交期)
+     */
+    private String productionDepartmentConsignTime;
+
+    /**
+     * 包装类型
+     */
+    private String packetType;
+
+    /**
+     * 生成科单价￥
+     */
+    private Double productionDepartmentPrice;
+
+    /**
+     * 生成科总价￥
+     */
+    private Double productionDepartmentTotalPrice;
+    /**
+     * 注意:创建订单的用户以及订单对应的业务员 这个不需要导出
+     */
+    private List<String> personList;
+
+}
+//待拷贝end。
 \ No newline at end of file
+package com.order.erp.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+public class ProducePdfVO {
+
+    private List<Long> ids;
+
+    private String companyName;
+    /**
+     * 生产科
+     */
+    private String productionDepartment;
+
+    private String productionUrl;
+
+    private Boolean isSend;
+    private List<String> personList;
+
+}
@@ -106,4 +106,9 @@ public class OrderBaseFieldVO implements Serializable {
      */
     private String businessPerson = OrderLockFieldEnum.LOCKED.getStatus();
+    /**
+     * 是否返单
+     */
+    private String returnOrder = OrderLockFieldEnum.LOCKED.getStatus();
+
 }
@@ -117,4 +117,9 @@ public class OrderBaseInfoVO implements Serializable {
      */
     private String businessPerson;
+    /**
+     * 是否返单
+     */
+    private String returnOrder;
+
 }
 \ No newline at end of file
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+//待拷贝start。
+
+/**
+ * @Author:ch
+ * @createTime:2024-08-07
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderOpinionLogVO {
+    private List<Long> ids;
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+    /**
+     * 意见类型(SGS/Aitex/SHIPPMENT/PP/产品意见)
+     */
+    private String opinionType;
+
+    /**
+     * 更新字段
+     */
+    private String field;
+}
+//待拷贝end。
 \ No newline at end of file
@@ -8,20 +8,28 @@ 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;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.w3c.dom.events.Event;
+
 import javax.annotation.Resource;
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -61,9 +69,11 @@ public class OrderOverTimeEventJob {
     @Resource
     private AdminUserService adminUserService;
+    @Resource
+    private AdminUserRoleService adminUserRoleService;
     /**
-     * 凌晨5点执行，一天一次
+     * 凌晨1点执行，一天一次
      */
      @Scheduled(cron = "0 0 5 * * ?")
@@ -119,8 +129,8 @@ public class OrderOverTimeEventJob {
                     return null;
                 }).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) {
                 if (!redisUtils.hasKey(EmailTemplateEnum.byTemplate(
                         eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER + orderEventJob.getBaseInfo().getId())) {
@@ -133,17 +143,60 @@ public class OrderOverTimeEventJob {
                     AdminUserDO productionDepartmentUser = adminUserService.getOne(new LambdaQueryWrapper<AdminUserDO>()
                             .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                             .eq(AdminUserDO::getUserName, productionDepartment));
-                    if(Objects.nonNull(productionDepartmentUser) && StringUtils.isNotBlank(productionDepartmentUser.getEmail())){
+                    //得到所有的质检员。由于删除了角色,但是用户角色表中的信息没有删除,所以不能直接通过用户角色表拿角色,然后发邮件,需校验。
+                    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<>();
+                    receiveEmailMappingDOLambdaQueryWrapper.eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN);
+                    if(!orderEventJob.getBaseInfo().getCustomerCode().contains("-") && !orderEventJob.getBaseInfo().getCustomerCode().contains("——")){
+                        receiveEmailMappingDOLambdaQueryWrapper.eq(ReceiveEmailMappingDO::getTypeValue, orderEventJob.getBaseInfo().getCustomerCode())
+                        .last("limit 1");
+                    }else{
+                        receiveEmailMappingDOLambdaQueryWrapper.like(ReceiveEmailMappingDO::getTypeValue, orderEventJob.getBaseInfo().getCustomerCode().split("-")[0])
+                         .last("limit 1");
+                    }
+                    ReceiveEmailMappingDO receiveEmailMappingDO = receiveEmailMappingService.getOne( receiveEmailMappingDOLambdaQueryWrapper);
+                    List<String> emailList = new ArrayList<>();
+                    if (Objects.nonNull(receiveEmailMappingDO)) {
+                        List<ReceiveEmailConfigItemVO> receiveEmailConfigItemVOList = JSON.parseObject(
+                                receiveEmailMappingDO.getConfigInfos(), new TypeReference<List<ReceiveEmailConfigItemVO>>() {
+                                });
+                        for (ReceiveEmailConfigItemVO item : receiveEmailConfigItemVOList) {
+                            if (eventEnum.getEvent().equals(item.getEvent())) {
+                                emailList = item.getEmails();
+                            }
+                        }
+                    }
+                    if (Objects.nonNull(productionDepartmentUser) && CollectionUtils.isNotEmpty(emailList)) {
+                        List<String> emails = emailList.stream().flatMap(email -> Arrays.stream(email.split("[,，]+"))).collect(Collectors.toList());
                         List<String> productionEmail = Arrays.asList(productionDepartmentUser.getEmail().split("[,，]+"))
                                 .stream().map(String::trim)
+                                .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()),
-                                productionEmail, orderEventJob);
+                                combineEmail, orderEventJob);
                         redisUtils.set(EmailTemplateEnum.byTemplate(
-                                        eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER +orderEventJob.getBaseInfo().getId(),
+                                        eventEnum.getTemplateId()) + Constant.CROSS_BAR_CHARACTER + orderEventJob.getBaseInfo().getId(),
                                 orderEventJob, 90, TimeUnit.DAYS);
                     }
-
+                    log.info("------------------------------------------------------------------------------------");
                 }
             }
         } else {
@@ -281,7 +334,13 @@ public class OrderOverTimeEventJob {
         String ppConfirmResult = eventJobVO.getTrackStageInfo().getPpConfirmResult();
         if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(ppConfirmResult) && StringUtils.isNotBlank(ppConfirmTime)) {
             int daysBetween = getDaysBetween(ppConfirmResult, ppConfirmTime, orderHodTime);
-            if (daysBetween == Constant.TWENTY_FIRST || daysBetween == Constant.NEGATIVE_ONE) {
+            if (Constant.TWENTY_FIRST  ==  daysBetween||  Constant.NEGATIVE_ONE ==daysBetween) {
+                return true;
+            }
+        } else {
+            LocalDate today = LocalDate.now();
+            LocalDate localDate = DateUtils.parseDate(orderHodTime);
+            if (Constant.TWENTY_FIRST == (int) ChronoUnit.DAYS.between(today, localDate) && StringUtils.isEmpty(ppConfirmResult)) {
                 return true;
             }
         }
@@ -290,15 +349,11 @@ public class OrderOverTimeEventJob {
     private Boolean filterOtherSampleEvent(OrderEventJobVO eventJobVO) {
         String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
-        String esoSampleSendTime = eventJobVO.getTrackStageInfo().getEsoSampleSendTime();
-        if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(esoSampleSendTime)) {
-            LocalDate orderHodTimelocalDate = DateUtils.parseDate(orderHodTime);
-            LocalDate esoSampleSendTimelocalDate = DateUtils.parseDate(esoSampleSendTime);
-            if (ChronoUnit.DAYS.between(esoSampleSendTimelocalDate, orderHodTimelocalDate) == Constant.FOURTEEN) {
+            LocalDate today = LocalDate.now();
+            LocalDate localDate = DateUtils.parseDate(orderHodTime);
+            if ( Constant.FOURTEEN==(int) ChronoUnit.DAYS.between(today, localDate) && StringUtils.isBlank(eventJobVO.getTrackStageInfo().getEsoSampleSendTime())) {
                 return true;
             }
-
-        }
         return false;
     }
@@ -308,7 +363,13 @@ public class OrderOverTimeEventJob {
         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) {
+            if ( Constant.SEVEN ==daysBetween ||  Constant.NEGATIVE_ONE==daysBetween ) {
+                return true;
+            }
+        } else {
+            LocalDate today = LocalDate.now();
+            LocalDate localDate = DateUtils.parseDate(orderHodTime);
+            if ( Constant.SEVEN ==(int) ChronoUnit.DAYS.between(today, localDate) && StringUtils.isBlank(shippmentSampleConfirmResult)) {
                 return true;
             }
         }
@@ -317,20 +378,27 @@ public class OrderOverTimeEventJob {
     private Boolean filterAITEXSGSTestEvent(OrderEventJobVO eventJobVO) {
-        int aitextestDaysBetween=0;
-        int sgstestDaysBetween=0;
+        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)){
+        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)){
+        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  ) {
+        if ((StringUtils.isEmpty(aitexTestFinishResult) && StringUtils.isEmpty(sgsTestFinishResult)) || (StringUtils.isEmpty(aitexTestFinishResult) && StringUtils.isEmpty(sgsTestFinishResult))){
+            LocalDate today = LocalDate.now();
+            LocalDate localDate = DateUtils.parseDate(orderHodTime);
+            if(Constant.THREE == (int) ChronoUnit.DAYS.between(today, localDate)){
+                return true;
+            }
+        }
+        if (Constant.THREE == aitextestDaysBetween || Constant.THREE == sgstestDaysBetween || Constant.NEGATIVE_ONE == aitextestDaysBetween || Constant.NEGATIVE_ONE == sgstestDaysBetween) {
             return true;
         }
         return false;
@@ -340,41 +408,50 @@ 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) && !(lastArrivalTime.contains("ok"))) {
-            LocalDate orderHodTimelocalDate = DateUtils.parseDate(orderHodTime);
-            LocalDate lastArrivalTimelocalDate = DateUtils.parseDate(lastArrivalTime);
-            if (ChronoUnit.DAYS.between(lastArrivalTimelocalDate, orderHodTimelocalDate) == Constant.SEVEN) {
+            LocalDate today = LocalDate.now();
+            LocalDate localDate = DateUtils.parseDate(orderHodTime);
+            if ( Constant.SEVEN ==(int) ChronoUnit.DAYS.between(today, localDate) && StringUtils.isBlank(eventJobVO.getTrackStageInfo().getLatestArrivalTime())) {
                 return true;
             }
-        }
         return false;
     }
     private Boolean filterLatestDCEvent(OrderEventJobVO eventJobVO) {
         String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
-        String latestBkTime = eventJobVO.getTrackStageInfo().getLatestBkTime();
-        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) {
+            LocalDate today = LocalDate.now();
+            LocalDate localDate = DateUtils.parseDate(orderHodTime);
+            //对于A01的订单,最晚订舱日期要为12天或者6天,海运为12天,空运为6天,其他的订单为10天。  对于A01来说,不管你填写没有,也要提醒,即使你填写了,也要提醒。
+        if(eventJobVO.getBaseInfo().getCustomerCode().contains("A01")){
+            //海运
+            if("SEA".equals(eventJobVO.getBaseInfo().getOutboundType())){
+               if(Constant.FOURTEEN ==(int) ChronoUnit.DAYS.between(today, localDate)){
+                   return true;
+               }
+            }
+            else if("AIR".equals(eventJobVO.getBaseInfo().getOutboundType())){
+                if(Constant.SEVEN ==(int) ChronoUnit.DAYS.between(today, localDate)){
+                    return true;
+                }
+            }else{
+                if(Constant.ENABLE_TEN ==(int) ChronoUnit.DAYS.between(today, localDate)){
+                    return true;
+                }
+            }
+        }else{
+            if ( Constant.ENABLE_TEN ==(int) ChronoUnit.DAYS.between(today, localDate) && StringUtils.isBlank(eventJobVO.getTrackStageInfo().getLatestBkTime())) {
                 return true;
             }
         }
         return false;
-
     }
     private Boolean filterEndCheckDateEvent(OrderEventJobVO eventJobVO) {
         String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
-        String endCheckApplyTime = eventJobVO.getInspectionStageInfo().getEndCheckApplyTime();
-        if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(endCheckApplyTime)) {
-            LocalDate endCheckApplyTimelocalDate = DateUtils.parseDate(endCheckApplyTime);
-            LocalDate orderHodTimelocalDate = DateUtils.parseDate(orderHodTime);
-            if (ChronoUnit.DAYS.between(endCheckApplyTimelocalDate, orderHodTimelocalDate) == Constant.TWO) {
+            LocalDate today = LocalDate.now();
+            LocalDate localDate = DateUtils.parseDate(orderHodTime);
+            if ( Constant.TWO ==(int) ChronoUnit.DAYS.between(today, localDate) && StringUtils.isBlank(eventJobVO.getInspectionStageInfo().getEndCheckApplyTime())) {
                 return true;
             }
-        }
         return false;
     }
@@ -390,14 +467,14 @@ public class OrderOverTimeEventJob {
         return Constant.ZERO;
     }
-    public OrderBaseInfoVO  getDateFormat(String productionDepartmentConsignTime,String orderHodTime){
+    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);
+        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.OrderOpinionLogDO;
+
+public interface OrderOpinionLogMapper extends BaseMapper<OrderOpinionLogDO> {
+}
@@ -3,10 +3,13 @@ package com.order.erp.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.domain.dto.LocalStorageDO;
+import com.order.erp.domain.vo.FileRespVO;
 import com.order.erp.domain.vo.LocalStorageQueryVO;
 import com.order.erp.domain.vo.LocalStorageVO;
 import org.springframework.web.multipart.MultipartFile;
+import java.io.File;
+
 /**
  * 本地存储(LocalStorage)表服务接口
  *
@@ -33,6 +36,7 @@ public interface LocalStorageService extends IService&lt;LocalStorageDO&gt; {
     ServerResult uploadFileByAliOss(String name, MultipartFile file);
     ServerResult create(String name, MultipartFile file);
+    FileRespVO getFilePath(File file, String companyName);
     /**
      * 通过ID查询单条数据
@@ -197,7 +197,13 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         if(StringUtils.isNotBlank(adminUserVO.getEmail())){
             adminUserDo.setEmail(adminUserVO.getEmail());
         }
+        List<AdminUserDO> byNickNameUserDOS = list(new LambdaQueryWrapper<AdminUserDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(AdminUserDO::getUserName, adminUserVO.getNickName()));
+        if (CollectionUtils.isNotEmpty(byNickNameUserDOS)) {
+            throw new BusinessException("用户名已存在");
+        }
         if (StringUtils.isNotBlank(adminUserVO.getNickName())) {
+            //后续如果根据名称找用户,使用userName比较,不要使用NickName比较。
             adminUserDo.setUserName(adminUserVO.getNickName());
         }
         adminUserDo.setGender("男");
@@ -219,7 +225,7 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
                     .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                     .eq(DictionaryDO::getDictName,RoleEnum.PRODUCE_USER.getName()));
       if(CollectionUtils.isNotEmpty(dictionaryDOList)){
-          Set<String> dictionaryNames = dictionaryDOList.stream().map(DictionaryDO::getDictName).collect(Collectors.toSet());
+          Set<String> dictionaryNames = dictionaryDOList.stream().map(DictionaryDO::getDictValue).collect(Collectors.toSet());
           if(!dictionaryNames.contains(adminUserVO.getNickName())){
               DictionaryVO dictionaryVO = new DictionaryVO();
               dictionaryVO.setRemark("生产科");
@@ -337,6 +343,9 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
             if (RoleEnum.INSPECT_USER.getId().equals(x.getRoleId())) {
                 result.set(RoleEnum.INSPECT_USER);
             }
+            if(RoleEnum.PRODUCE_USER.getId().equals(x.getRoleId())){
+                result.set(RoleEnum.PRODUCE_USER);
+            }
         });
         return ServerResult.success(result.get());
     }
@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
+import java.nio.file.Files;
 import java.util.List;
 import java.util.Objects;
@@ -80,27 +81,49 @@ public class LocalStorageServiceImpl extends ServiceImpl&lt;LocalStorageMapper, Loc
         try {
             File tempFile = new File(path + "images" + File.separator + tempFileName);
             if (AliOssUtil.upload(AliOssConfig.ALIYUN_BUCKET, fileName, file.getBytes())) {
-                log.info("--------uploadByAliOss success----------");
                 String originImageUrl = AliOssUtil.createUrl(AliOssConfig.ALIYUN_BUCKET, fileName, new DateTime().plusYears(Constant.ENABLE_TEN).toDate());
                 imageRespVO.setPicUrl(originImageUrl);
                 // 生成缩略图
                 Thumbnails.of(file.getInputStream()).size(100, 100).toFile(tempFile);
                 if (AliOssUtil.upload(AliOssConfig.ALIYUN_BUCKET, tempFileName, FileUtil.readBytes(tempFile))) {
-                    log.info("--------uploadByAliOss  缩略图 success----------");
                     String thumbnailImageUrl = AliOssUtil.createUrl(AliOssConfig.ALIYUN_BUCKET, tempFileName, new DateTime().plusYears(Constant.ENABLE_TEN).toDate());
                     imageRespVO.setSmallPicUrl(thumbnailImageUrl);
                 }
-                log.info("--------uploadByAliOss end ----------");
                 FileUtil.del(tempFile);
-                log.info("--------uploadByAliOss del success ----------");
             }
             return ServerResult.success(imageRespVO);
         } catch (Exception e) {
-            log.error("上传图片异常:{}", e.getMessage());
+            log.error("上传图片异常：{}", e.getMessage());
             throw new BusinessException(ServerResultCode.UPLOAD_IMAGES_ERROR);
         }
     }
+
+
+    public FileRespVO getFilePath(File file,String companyName) {
+        FileUtil.checkSize(maxSize, file.length());  // 使用文件长度检查大小
+        String fileName = AliOssUtil.getUniqueFileName(companyName+"生产指示书.pdf");
+        String tempFileName = "Thumbnails" + Constant.CROSS_BAR_CHARACTER + fileName;
+        FileRespVO fileRespVO = new FileRespVO();
+        try {
+            // 文件路径生成（如果需要保存临时文件）
+            File tempFile = new File(path + "files" + File.separator + tempFileName);
+
+            // 使用文件的字节数组上传到阿里云 OSS
+            byte[] fileBytes = Files.readAllBytes(file.toPath());  // 将 File 转换为字节数组
+            if (AliOssUtil.upload(AliOssConfig.ALIYUN_BUCKET, fileName, fileBytes)) {
+                String fileUrl = AliOssUtil.createUrl(AliOssConfig.ALIYUN_BUCKET, fileName, new DateTime().plusYears(Constant.ENABLE_TEN).toDate());
+                fileRespVO.setFileUrl(fileUrl);
+                FileUtil.del(tempFile);  // 删除临时文件
+            }
+            return fileRespVO;
+        } catch (Exception e) {
+            log.error("上传文件异常：{}", e.getMessage());
+            throw new BusinessException(ServerResultCode.UPLOAD_IMAGES_ERROR);
+        }
+    }
+
+
     @Override
     public ServerResult create(String name, MultipartFile multipartFile) {
         FileUtil.checkSize(maxSize, multipartFile.getSize());
@@ -127,6 +150,7 @@ public class LocalStorageServiceImpl extends ServiceImpl&lt;LocalStorageMapper, Loc
         }
     }
+
     /**
      * 通过ID查询单条数据
      * <p>
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 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.ProducePdfVO;
 import com.order.erp.domain.vo.order.*;
 import freemarker.template.TemplateException;
@@ -100,6 +101,9 @@ public interface OrderBaseInfoService extends IService&lt;OrderBaseInfoDO&gt; {
      * @return 是否成功
      */
     ServerResult deleteById(OrderBaseInfoQueryVO orderBaseInfoQueryVO);
+    ServerResult  passRate(OrderOpinionLogVO orderOpinionLogVO);
+
+    ServerResult  produceReport(ProducePdfVO producePdfVO);
     long countByOrderStatus(Integer orderFinish);
@@ -113,8 +117,10 @@ public interface OrderBaseInfoService extends IService&lt;OrderBaseInfoDO&gt; {
     long countRecentYear();
-    ServerResult checkChargeOrderCount(List<Long> orderIds);
+    ServerResult checkChargeOrderCount(OrderBaseInfoVO baseInfoVO);
     List<OrderBaseInfoDO>  getEventList();
+    ServerResult send(ProducePdfVO producePdfVO) throws Exception;
+
 }
+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(OrderOpinionLogVO orderOpinionLogVo);
+}
@@ -3,7 +3,9 @@ package com.order.erp.service.order.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,11 +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;
@@ -43,14 +48,18 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URL;
 import java.text.DecimalFormat;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.Month;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -118,6 +127,20 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Resource
     private EmailSendUtils emailSendUtils;
+    @Resource
+    private OrderOpinionLogService orderOpinionLogService;
+    @Resource
+    private RedisUtils redisUtils;
+    @Resource
+    private EasyPdfUtils pdfUtils;
+
+    @Resource
+    private AdminUserService adminUserService;
+
+    @Resource
+    private ReceiveEmailMappingService receiveEmailMappingService;
+    @Resource
+    private AdminUserRoleService adminUserRoleService;
     /**
@@ -232,6 +255,12 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if (CollectionUtils.isNotEmpty(orderBaseInfoDOList)) {
             List<OrderInfoResultVO> resultVOList = orderBaseInfoDOList.stream().map(x -> {
+                //在导出时只导出产品意见的最后一行。
+                if(x.getProductionComment().contains("\n")){
+                    String[] productionCommentS = x.getProductionComment().split("\n");
+                    String productionComment = productionCommentS[productionCommentS.length - 1];
+                    x.setProductionComment(productionComment);
+                }
                 OrderInfoResultVO resultVO = new OrderInfoResultVO();
                 BeanUtils.copyProperties(x, resultVO);
                 return resultVO;
@@ -342,7 +371,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 }
                 if (StringUtils.isNotBlank(baseFields.getProductionComment()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getProductionComment())) {
-                    map.put("生产要求", orderInfoResultVO.getProductionComment());
+                    map.put("产品意见", orderInfoResultVO.getProductionComment());
                 }
                 if (StringUtils.isNotBlank(baseFields.getOrderCount()) &&
                         OrderLockFieldEnum.SELECTED.getStatus().equals(baseFields.getOrderCount())) {
@@ -881,7 +910,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());
@@ -1234,7 +1263,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if (CollectionUtils.isEmpty(inspectionStageDOS)) {
             return;
         }
-        Map<Long, OrderInspectionStageDO> inspectionStageDOMap = inspectionStageDOS.stream().collect(Collectors.toMap(OrderInspectionStageDO::getOrderId, Function.identity()));
+        Map<Long, OrderInspectionStageDO> inspectionStageDOMap = inspectionStageDOS.stream().collect(Collectors.toMap(OrderInspectionStageDO::getOrderId, Function.identity(),(existing, replacement) -> existing));
         orderInfoResultVOList.forEach(result -> {
             if (inspectionStageDOMap.containsKey(result.getId())) {
                 OrderInspectionStageDO inspectionStageDO = inspectionStageDOMap.get(result.getId());
@@ -1261,7 +1290,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             queryVO.setBusinessPerson(Arrays.asList(dataScope.getUser().getNickName()));
         }
         // 生产科
-        if(Objects.nonNull(roleEnum) && roleEnum.getId().equals(RoleEnum.PRODUCE_USER.getId())){
+        if (Objects.nonNull(roleEnum) && roleEnum.getId().equals(RoleEnum.PRODUCE_USER.getId())) {
             queryVO.setProductionDepartment(Arrays.asList(dataScope.getUser().getNickName()));
         }
         if (StringUtils.isNotBlank(queryVO.getCommitUserPhone())) {
@@ -1430,11 +1459,29 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if (Objects.isNull(baseInfoVO)) {
             throw new BusinessException(ServerResultCode.ORDER_BASE_INFO_EMPTY);
         }
+        LocalDate currentDate = LocalDate.now();
+        Month month = currentDate.getMonth();
+        int currentMonth = month.getValue();
+        int dayOfMonth = currentDate.getDayOfMonth();
+        String originProductionComment = baseInfoVO.getProductionComment();
+        if (StringUtils.isNotBlank(baseInfoVO.getProductionComment())) {
+            String date = currentMonth + "/" + dayOfMonth + ": ";
+            String productionComment = baseInfoVO.getProductionComment();
+            productionComment = date + productionComment;
+            baseInfoVO.setProductionComment(productionComment);
+
+        }
         Long userId = dataScope.getLoginUserId();
         OrderBaseInfoDO baseInfoDO = new OrderBaseInfoDO();
         BeanUtils.copyProperties(baseInfoVO, baseInfoDO);
         baseInfoDO.setOrderStatus(OrderStatusEnum.CREATE_FINISH.getStatus());
         save(baseInfoDO);
+
+        OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(baseInfoDO.getId(),
+                OrderOpinionLogEnum.ORDER_PRODUCTION_COMMENT.getDesc(),
+                originProductionComment);
+        orderOpinionLogService.save(orderOpinionLogDO);
+
         OrderTrackStageDO orderTrackStageDO = new OrderTrackStageDO();
         orderTrackStageDO.setOrderId(baseInfoDO.getId());
         orderTrackStageDO.setOrderStatus(OrderStatusEnum.CREATE_FINISH.getStatus());
@@ -1507,8 +1554,9 @@ 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
      */
@@ -1597,14 +1645,48 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if (Objects.isNull(orderBaseInfoDo)) {
             throw new BusinessException(ServerResultCode.ORDER_BASE_INFO_EMPTY);
         }
+        LocalDate currentDate = LocalDate.now();
+        Month month = currentDate.getMonth();
+        int currentMonth = month.getValue();
+        int dayOfMonth = currentDate.getDayOfMonth();
         OrderOptLogDO optLogDO = new OrderOptLogDO();
+        List<OrderOpinionLogDO> orderOpinionLogDOList = new ArrayList<>();
         if (Objects.nonNull(updateVO.getBaseInfo())) {
-
+            //用户编辑时,产品意见与这个订单的上一次产品意见内容不一样。
+            if (StringUtils.isNotBlank(updateVO.getBaseInfo().getProductionComment()) && !(updateVO.getBaseInfo().getProductionComment().equals(orderBaseInfoDo.getProductionComment()))) {
+                //说明用户第一次填写产品意见,这一步其实没必要,因为在add中会添加。
+                if (org.apache.commons.lang3.StringUtils.isEmpty(orderBaseInfoDo.getProductionComment())) {
+                    OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(updateVO.getOrderId(), OrderOpinionLogEnum.ORDER_PRODUCTION_COMMENT.getDesc(), updateVO.getBaseInfo().getProductionComment());
+                    orderOpinionLogDOList.add(orderOpinionLogDO);
+                } else {
+                    //说明用户不是第一次填写产品意见,并且填写的内容与上一次的产品意见不一样。
+                    String[] parts = updateVO.getBaseInfo().getProductionComment().split("\n");
+                    //取最后一条的数据。
+                    String lastPart = parts[parts.length - 1].trim();
+                    OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(updateVO.getOrderId(), OrderOpinionLogEnum.ORDER_PRODUCTION_COMMENT.getDesc(), lastPart);
+                    orderOpinionLogDOList.add(orderOpinionLogDO);
+                }
+                String date = currentMonth + "/" + dayOfMonth;
+                String productionComment = orderBaseInfoDo.getProductionComment();
+                StringBuilder stringBuilder = new StringBuilder(productionComment);
+                String[] newProductionComment = updateVO.getBaseInfo().getProductionComment().split("\n");
+               //对于四个结果,并且当前输入产品意见文字小于上一次的产品意见后续填写不需要换行。
+                if((!newProductionComment[newProductionComment.length - 1].trim().contains("确认通过") &&
+                        !newProductionComment[newProductionComment.length - 1].trim().contains("确认未通过")) && updateVO.getBaseInfo().getProductionComment().length() > orderBaseInfoDo.getProductionComment().length()){
+                    stringBuilder.append("\n").append(date + ": " + newProductionComment[newProductionComment.length - 1].trim());
+                    updateVO.getBaseInfo().setProductionComment(stringBuilder.toString());
+                    sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+                }else{
+                    sendProductionCommentEmail(orderBaseInfoDo,updateVO.getBaseInfo().getProductionComment());
+                }
+            }
             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 (Objects.nonNull(updateVO.getProfitAnalysisInfo())) {
             checkApply(updateVO.getOrderId(), userId, ApplyTypeEnum.ORDER_PROFIT_APPLY);
             OrderFieldLockApplyDO orderFieldLockApplyDO = handlerProfitRate(updateVO.getProfitAnalysisInfo(), orderBaseInfoDo, userId);
@@ -1635,7 +1717,23 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     trackStageDO.setPpTime(trackStageInfo.getPpTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getPpConfirmResult())) {
+                    if (!(trackStageInfo.getPpConfirmResult().equals(trackStageDO.getPpConfirmResult()))) {
+                        String resultText = trackStageInfo.getPpConfirmResult().contains("ok")
+                                ? "PP样品确认通过"
+                                : "PP样品确认未通过";
+                        //用于在跟单记录中展示。
+                        OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(updateVO.getOrderId(), OrderOpinionLogEnum.ORDER_PP_CONFIRRM_RESULT.getDesc(), trackStageInfo.getPpConfirmResult());
+                        orderOpinionLogDOList.add(orderOpinionLogDO);
+                        //添加到产品意见中去。
+                        String date = currentMonth + "/" + dayOfMonth;
+                        String productionComment = orderBaseInfoDo.getProductionComment();
+                        StringBuilder stringBuilder = new StringBuilder(productionComment);
+                        stringBuilder.append("\n").append(date + ":" + resultText);
+                        orderBaseInfoDo.setProductionComment(stringBuilder.toString());
+//                        sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+                        setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
+                    }
                     trackStageDO.setPpConfirmResult(trackStageInfo.getPpConfirmResult());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getEsoSampleSendTime())) {
@@ -1645,7 +1743,22 @@ 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()))) {
+                        String resultText = trackStageInfo.getShippmentSampleConfirmResult().contains("ok")
+                                ? "大货样确认通过"
+                                : "大货样确认未通过";
+                        OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(updateVO.getOrderId(), OrderOpinionLogEnum.ORDER_SHIPMENT_SAMPLE_CONFIRM_RESULT.getDesc(), trackStageInfo.getShippmentSampleConfirmResult());
+                        orderOpinionLogDOList.add(orderOpinionLogDO);
+                        //添加到产品意见中去。
+                        String date = currentMonth + "/" + dayOfMonth;
+                        String productionComment = orderBaseInfoDo.getProductionComment();
+                        StringBuilder stringBuilder = new StringBuilder(productionComment);
+                        stringBuilder.append("\n").append(date + ": " + resultText);
+                        orderBaseInfoDo.setProductionComment(stringBuilder.toString());
+//                        sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+                        setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
+                    }
+                    trackStageDO.setShippmentSampleConfirmResult(trackStageInfo.getShippmentSampleConfirmResult());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSelfTestPassTime())) {
                     trackStageDO.setSelfTestPassTime(trackStageInfo.getSelfTestPassTime());
@@ -1654,13 +1767,42 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     trackStageDO.setAitexTestSendTime(trackStageInfo.getAitexTestSendTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getAitexTestFinishResult())) {
-
+                    if (!(trackStageInfo.getAitexTestFinishResult().equals(trackStageDO.getAitexTestFinishResult()))) {
+                        String resultText = trackStageInfo.getAitexTestFinishResult().contains("ok")
+                                ? "Aitex测试确认通过"
+                                : "Aitex测试确认未通过";
+                        OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(updateVO.getOrderId(), OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc(), trackStageInfo.getAitexTestFinishResult());
+                        orderOpinionLogDOList.add(orderOpinionLogDO);
+                        //添加到产品意见中去。
+                        String date = currentMonth + "/" + dayOfMonth;
+                        String productionComment = orderBaseInfoDo.getProductionComment();
+                        StringBuilder stringBuilder = new StringBuilder(productionComment);
+                        stringBuilder.append("\n").append(date + ": " + resultText);
+                        orderBaseInfoDo.setProductionComment(stringBuilder.toString());
+//                        sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+                        setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
+                    }
                     trackStageDO.setAitexTestFinishResult(trackStageInfo.getAitexTestFinishResult());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSgsTestSendTime())) {
                     trackStageDO.setSgsTestSendTime(trackStageInfo.getSgsTestSendTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSgsTestFinishResult())) {
+                    if (!(trackStageInfo.getSgsTestFinishResult().equals(trackStageDO.getSgsTestFinishResult()))) {
+                        String resultText = trackStageInfo.getSgsTestFinishResult().contains("ok")
+                                ? "SGS测试确认通过"
+                                : "SGS测试确认未通过";
+                        OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(updateVO.getOrderId(), OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc(), trackStageInfo.getSgsTestFinishResult());
+                        orderOpinionLogDOList.add(orderOpinionLogDO);
+                        //添加到产品意见中去。
+                        String date = currentMonth + "/" + dayOfMonth;
+                        String productionComment = orderBaseInfoDo.getProductionComment();
+                        StringBuilder stringBuilder = new StringBuilder(productionComment);
+                        stringBuilder.append("\n").append(date + ": " + resultText);
+                        orderBaseInfoDo.setProductionComment(stringBuilder.toString());
+//                        sendProductionCommentEmail(orderBaseInfoDo, stringBuilder.toString());
+                        setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
+                    }
                     trackStageDO.setSgsTestFinishResult(trackStageInfo.getSgsTestFinishResult());
                 }
@@ -1694,6 +1836,62 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 trackStageDO.setOrderId(updateVO.getOrderId());
                 trackStageDO.setOrderStatus(OrderStatusEnum.TRACK_ING.getStatus());
                 trackStageService.save(trackStageDO);
+                if(StringUtils.isNotBlank(updateVO.getTrackStageInfo().getPpConfirmResult())){
+                    String resultText = updateVO.getTrackStageInfo().getPpConfirmResult().contains("ok")
+                            ? "PP样品确认通过"
+                            : "PP样品确认未通过";
+                    OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_PP_CONFIRRM_RESULT.getDesc(),trackStageInfo.getPpConfirmResult());
+                    orderOpinionLogDOList.add(orderOpinionLogDO);
+                    String date=currentMonth+"/"+dayOfMonth;
+                    String productionComment = orderBaseInfoDo.getProductionComment();
+                    StringBuilder stringBuilder = new StringBuilder(productionComment);
+                    stringBuilder.append("\n").append(date+": "+resultText);
+                    orderBaseInfoDo.setProductionComment(stringBuilder.toString());
+//                    sendProductionCommentEmail(orderBaseInfoDo,stringBuilder.toString());
+                    setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
+                }
+                if(StringUtils.isNotBlank(updateVO.getTrackStageInfo().getShippmentSampleConfirmResult())) {
+                    String resultText = updateVO.getTrackStageInfo().getShippmentSampleConfirmResult().contains("ok")
+                            ? "大货样确认通过"
+                            : "大货样确认未通过";
+                    OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(updateVO.getOrderId(), OrderOpinionLogEnum.ORDER_SHIPMENT_SAMPLE_CONFIRM_RESULT.getDesc(), trackStageInfo.getShippmentSampleConfirmResult());
+                    orderOpinionLogDOList.add(orderOpinionLogDO);
+                    String date=currentMonth+"/"+dayOfMonth;
+                    String productionComment = orderBaseInfoDo.getProductionComment();
+                    StringBuilder stringBuilder = new StringBuilder(productionComment);
+                    stringBuilder.append("\n").append(date+": "+resultText);
+                    orderBaseInfoDo.setProductionComment(stringBuilder.toString());
+//                    sendProductionCommentEmail(orderBaseInfoDo,stringBuilder.toString());
+                    setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
+                }
+                if(StringUtils.isNotBlank(updateVO.getTrackStageInfo().getAitexTestFinishResult())){
+                    String resultText =updateVO.getTrackStageInfo().getAitexTestFinishResult().contains("ok")
+                            ? "Aitex测试确认通过"
+                            : "Aitex测试确认未通过";
+                    OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc(),trackStageInfo.getAitexTestFinishResult());
+                    orderOpinionLogDOList.add(orderOpinionLogDO);
+                    String date=currentMonth+"/"+dayOfMonth;
+                    String productionComment = orderBaseInfoDo.getProductionComment();
+                    StringBuilder stringBuilder = new StringBuilder(productionComment);
+                    stringBuilder.append("\n").append(date+": "+resultText);
+                    orderBaseInfoDo.setProductionComment(stringBuilder.toString());
+//                    sendProductionCommentEmail(orderBaseInfoDo,stringBuilder.toString());
+                    setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
+                }
+                if(StringUtils.isNotBlank(updateVO.getTrackStageInfo().getSgsTestFinishResult())){
+                    String resultText = updateVO.getTrackStageInfo().getSgsTestFinishResult().contains("ok")
+                            ? "SGS测试确认通过"
+                            : "SGS测试确认未通过";
+                    OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc(),trackStageInfo.getSgsTestFinishResult());
+                    orderOpinionLogDOList.add(orderOpinionLogDO);
+                    String date=currentMonth+"/"+dayOfMonth;
+                    String productionComment = orderBaseInfoDo.getProductionComment();
+                    StringBuilder stringBuilder = new StringBuilder(productionComment);
+                    stringBuilder.append("\n").append(date+": "+resultText);
+                    orderBaseInfoDo.setProductionComment(stringBuilder.toString());
+//                    sendProductionCommentEmail(orderBaseInfoDo,stringBuilder.toString());
+                    setEmailSendUtilsRedis(orderBaseInfoDo,resultText,stringBuilder.toString());
+                }
             }
             orderBaseInfoDo.setOrderStatus(OrderStatusEnum.TRACK_ING.getStatus());
             optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_TRACKER_EDIT_APPLY.getDesc(), JSONObject.toJSONString(updateVO));
@@ -1705,11 +1903,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
                     .eq(OrderInspectionStageDO::getOrderId, updateVO.getOrderId()));
             OrderInspectionStageVO inspectionStageInfo = updateVO.getInspectionStageInfo();
-            String midCheckResult=inspectionStageInfo.getMidCheckResult();
-            String endCheckResult=inspectionStageInfo.getEndCheckResult();
+            String midCheckResult = inspectionStageInfo.getMidCheckResult();
+            String endCheckResult = inspectionStageInfo.getEndCheckResult();
             if (Objects.nonNull(inspectionStageDO)) {
-               midCheckResult=inspectionStageDO.getMidCheckResult();
-               endCheckResult=inspectionStageDO.getEndCheckResult();
+                midCheckResult = inspectionStageDO.getMidCheckResult();
+                endCheckResult = inspectionStageDO.getEndCheckResult();
                 if (StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())) {
                     inspectionStageDO.setMidCheckApplyTime(inspectionStageInfo.getMidCheckApplyTime());
                 }
@@ -1753,8 +1951,8 @@ 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()));
-                if( Objects.nonNull(ProductionDepartmentUserDO) && StringUtils.isNotBlank(ProductionDepartmentUserDO.getEmail())){
-                sendOrderInspectionStage(updateVO,midCheckResult,endCheckResult);
+                if (Objects.nonNull(ProductionDepartmentUserDO) && StringUtils.isNotBlank(ProductionDepartmentUserDO.getEmail())) {
+                    sendOrderInspectionStage(updateVO, midCheckResult, endCheckResult);
                 }
             } else {
                 inspectionStageDO = new OrderInspectionStageDO();
@@ -1766,10 +1964,10 @@ 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()));
-                if( Objects.nonNull(ProductionDepartmentUserDO) && StringUtils.isNotBlank(ProductionDepartmentUserDO.getEmail())){
-                    midCheckResult="1";
-                    endCheckResult="1";
-                    sendOrderInspectionStage(updateVO,midCheckResult,endCheckResult);
+                if (Objects.nonNull(ProductionDepartmentUserDO) && StringUtils.isNotBlank(ProductionDepartmentUserDO.getEmail())) {
+                    midCheckResult = "1";
+                    endCheckResult = "1";
+                    sendOrderInspectionStage(updateVO, midCheckResult, endCheckResult);
                 }
             }
@@ -1779,9 +1977,16 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         updateById(orderBaseInfoDo);
         orderOptLogService.save(optLogDO);
+        orderOpinionLogService.saveBatch(orderOpinionLogDOList);
         return ServerResult.success();
     }
-
+//这个方法的作用就是:她们反应对于内部编号相同的订单,就不需要发送四个测试结果的产品意见信息,不然创建一个订单就发送四个测试结果,太麻烦了,所以这里根据项目号和测试结果进行区分。
+    public void setEmailSendUtilsRedis(OrderBaseInfoDO orderBaseInfoDo,String resultText,String productionComment){
+        if(!redisUtils.hasKey(orderBaseInfoDo.getInnerNo()+Constant.CROSS_BAR_CHARACTER+resultText)){
+            sendProductionCommentEmail(orderBaseInfoDo,productionComment);
+            redisUtils.set(orderBaseInfoDo.getInnerNo()+Constant.CROSS_BAR_CHARACTER+resultText, "1", 90, TimeUnit.DAYS);
+        }
+    }
     /**
      * @param orderId
      * @param userId
@@ -1864,7 +2069,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         if (Objects.nonNull(baseInfoVO.getOrderCount())) {
             baseInfoDO.setOrderCount(baseInfoVO.getOrderCount());
-            checkChargeOrderCount(Arrays.asList(baseInfoVO.getId()));
+            checkChargeOrderCount(baseInfoVO);
         }
         if (StringUtils.isNotBlank(baseInfoVO.getOrderComposition())) {
             baseInfoDO.setOrderComposition(baseInfoVO.getOrderComposition());
@@ -1887,6 +2092,9 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if (StringUtils.isNotBlank(baseInfoVO.getBusinessPerson())) {
             baseInfoDO.setBusinessPerson(baseInfoVO.getBusinessPerson());
         }
+        if (Objects.nonNull(baseInfoVO.getReturnOrder())){
+            baseInfoDO.setReturnOrder(baseInfoVO.getReturnOrder());
+        }
     }
     /**
@@ -1954,7 +2162,78 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
      * @return
      */
+    @Override
+    public ServerResult passRate(OrderOpinionLogVO orderOpinionLogVO) {
+        if (CollectionUtils.isEmpty(orderOpinionLogVO.getIds())) {
+            return ServerResult.fail("OrderId 参数不能为空");
+        }
+        //过滤掉返单的数据。
+        List<OrderBaseInfoDO> orderBaseInfoDOList = baseInfoService.list(new LambdaQueryWrapper<OrderBaseInfoDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderBaseInfoDO::getId, orderOpinionLogVO.getIds())
+                .and(wrapper -> wrapper.ne(OrderBaseInfoDO::getReturnOrder, Constant.STRING_ONE).or().isNull(OrderBaseInfoDO::getReturnOrder)));
+        List<Long> orderBaseInfoList = orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).filter(Objects::nonNull).collect(Collectors.toList());
+        //过滤完返单的数据。
+        if(CollectionUtils.isNotEmpty(orderBaseInfoList)){
+            LambdaQueryWrapper<OrderOpinionLogDO> orderOpinionWrapper = new LambdaQueryWrapper<OrderOpinionLogDO>()
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .in(OrderOpinionLogDO::getOrderId, orderBaseInfoList);
+            if (!OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc().equals(orderOpinionLogVO.getOpinionType()) &&
+                    !OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc().equals(orderOpinionLogVO.getOpinionType())) {
+                //不等于sgs和ailtex
+                orderOpinionWrapper.eq(OrderOpinionLogDO::getOpinionType, orderOpinionLogVO.getOpinionType());
+            } else {
+                orderOpinionWrapper.and(wrapper ->
+                        wrapper.eq(OrderOpinionLogDO::getOpinionType, OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc())
+                                .or()
+                                .eq(OrderOpinionLogDO::getOpinionType, OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc())
+                );
+            }
+            List<OrderOpinionLogDO> orderOpinionLogDOList = orderOpinionLogService.list(orderOpinionWrapper);
+            if (CollectionUtils.isEmpty(orderOpinionLogDOList)) {
+                return ServerResult.fail("订单跟单信息" + orderOpinionLogVO.getOpinionType() + "未填写");
+            }
+            List<Integer> okCountList = new ArrayList();
+            List<Integer> FailCountList = new ArrayList();
+            orderOpinionLogDOList.stream().forEach(x -> {
+                if (x.getField().contains("ok") || x.getField().contains("OK")) {
+                    okCountList.add(Constant.ONE);
+                } else if(x.getField().contains("Fail") || x.getField().contains("FAIL") ) {
+                    FailCountList.add(Constant.ZERO);
+                }
+            });
+            int sum = okCountList.size() + FailCountList.size();
+            double rate = ((double) okCountList.size() / sum) * Constant.HUNDRED;
+            DecimalFormat decimalFormat = new DecimalFormat("0.00");
+            String resultrate = decimalFormat.format(rate);
+            return ServerResult.success(resultrate + "%");
+        }
+       return ServerResult.fail("返单订单不进行统计！");
+    }
+    @Override
+    public ServerResult produceReport(ProducePdfVO producePdfVO) {
+        if (CollectionUtils.isEmpty(producePdfVO.getIds()) && org.apache.commons.lang3.StringUtils.isBlank(producePdfVO.getCompanyName())) {
+            return ServerResult.fail("订单id或者公司名称为空");
+        }
+        List<OrderProfitAnalysisDO> orderProfitAnalysisList = profitAnalysisService.list(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(OrderProfitAnalysisDO::getOrderId, producePdfVO.getIds()));
+        //必须要求每一个订单的利润分析信息都存在,才能生成生产指标书。
+        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);
+    }
     /**
@@ -1991,10 +2270,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Override
-    public ServerResult checkChargeOrderCount(List<Long> ids) {
+    public ServerResult checkChargeOrderCount(OrderBaseInfoVO baseInfoVO) {
         LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = new LambdaQueryWrapper<OrderBaseInfoDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .in(CollectionUtils.isNotEmpty(ids), OrderBaseInfoDO::getId, ids)
+                .in(CollectionUtils.isNotEmpty(Arrays.asList(baseInfoVO.getId())), OrderBaseInfoDO::getId, Arrays.asList(baseInfoVO.getId()))
                 .ne(OrderBaseInfoDO::getOrderStatus, OrderStatusEnum.ORDER_FINISH.getStatus());
         List<OrderBaseInfoDO> ordersDOS = list(queryWrapper);
@@ -2014,7 +2293,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 for (OrderInfoResultVO resultVO : orderInfoResultVOS) {
                     if (profitAnalysisDOMap.containsKey(resultVO.getId())) {
                         OrderProfitAnalysisDO profitAnalysisDO = profitAnalysisDOMap.get(resultVO.getId());
-                        Integer orderCount = resultVO.getOrderCount();
+                        Integer orderCount = baseInfoVO.getOrderCount();
                         BigDecimal customerTotalPrice = new BigDecimal(profitAnalysisDO.getCustomerTotalPrice()).setScale(Constant.TWO, RoundingMode.HALF_UP);
                         BigDecimal customerPrice = new BigDecimal(profitAnalysisDO.getCustomerPrice()).setScale(Constant.TWO, RoundingMode.HALF_UP);
@@ -2053,36 +2332,212 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         return orderBaseInfoDOList;
     }
-    private void sendOrderInspectionStage(OrderUpdateVO updateVO,String midCheckResult,String endCheckResult){
+    @Override
+    public ServerResult send(ProducePdfVO producePdfVO) throws Exception {
+        if (producePdfVO.getIsSend()) {
+            if (StringUtils.isNotBlank(producePdfVO.getProductionUrl()) && StringUtils.isNotBlank(producePdfVO.getProductionDepartment())) {
+                AdminUserDO produceUser = adminUserService.getOne(new LambdaQueryWrapper<AdminUserDO>()
+                        .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                        .eq(AdminUserDO::getNickName, producePdfVO.getProductionDepartment()));
+                if (Objects.nonNull(produceUser) && org.apache.commons.lang3.StringUtils.isNotBlank(produceUser.getEmail())) {
+                    List<String> emails = Arrays.asList(produceUser.getEmail().split("[,，]+"))
+                            .stream().map(String::trim)
+                            .filter(Objects::nonNull)
+                            .collect(Collectors.toList());
+                    if(CollectionUtils.isNotEmpty(producePdfVO.getPersonList())){
+                        List<AdminUserDO> personUser = adminUserService.list(new LambdaQueryWrapper<AdminUserDO>()
+                                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                                .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())
+                                    .map(String::trim)
+                                    .filter(s -> !s.isEmpty())
+                                    .collect(Collectors.toList());
+                            if(CollectionUtils.isNotEmpty(personList)){
+                                emails.addAll(personList);
+                            }
+                        }
+                    }
+                    URL url1 = new URL(producePdfVO.getProductionUrl());
+                    InputStream inputStream = url1.openStream();
+                    File file = FileUtil.inputStreamToFile(inputStream, "生产指示书_" + System.currentTimeMillis() + ".pdf");
+                    try {
+                        emailSendUtils.sendEmail(EmailTemplateEnum.PRODUCE_INDICATE_REPORT, emails, file);
+                    } finally {
+                        if (file.exists()) {
+                            file.delete();
+                            System.out.println(file.delete());
+                        }
+                    }
+                    return ServerResult.success("已发送给" + producePdfVO.getProductionDepartment() + "生产科");
+                } else {
+                    return ServerResult.fail("生产科邮箱不存在！");
+                }
+            } else {
+                return ServerResult.fail("发送失败!");
+            }
+        }
+        return ServerResult.fail("取消发送!");
+    }
+
+    private void sendOrderInspectionStage(OrderUpdateVO updateVO, String midCheckResult, String endCheckResult) {
         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)){
+        if (Objects.nonNull(ProductionDepartmentUserDO)) {
             OrderEventJobVO orderEventJobVO = new OrderEventJobVO();
             orderEventJobVO.setInspectionStageInfo(updateVO.getInspectionStageInfo());
             OrderBaseInfoVO orderBaseInfoVo = BeanUtil.copyProperties(orderBaseInfoDO, OrderBaseInfoVO.class);
             orderEventJobVO.setBaseInfo(orderBaseInfoVo);
-            List<String> emails = Arrays.asList(ProductionDepartmentUserDO.getEmail().split( "[,，]+"))
+            List<String> emails = Arrays.asList(ProductionDepartmentUserDO.getEmail().split("[,，]+"))
                     .stream().map(String::trim)
+                    .filter(Objects::nonNull)
                     .collect(Collectors.toList());
             //一旦修改完质检信息就自动发送邮件对应的生产科。多次编辑保存多次发送。
-            if (StringUtils.isNotBlank(updateVO.getInspectionStageInfo().getEndCheckResult()) &&  !(updateVO.getInspectionStageInfo().getEndCheckResult().equals(endCheckResult))) {
-                String EndCheckApplyTime= updateVO.getInspectionStageInfo().getEndCheckApplyTime().substring(0, 10);
-                String ProductionDepartmentConsignTime =orderBaseInfoDO.getProductionDepartmentConsignTime().substring(0, 10);
+            if (StringUtils.isNotBlank(updateVO.getInspectionStageInfo().getEndCheckResult()) && !(updateVO.getInspectionStageInfo().getEndCheckResult().equals(endCheckResult))) {
+                String EndCheckApplyTime = "";
+                if (StringUtils.isNotBlank(updateVO.getInspectionStageInfo().getEndCheckApplyTime())) {
+                    EndCheckApplyTime = updateVO.getInspectionStageInfo().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(updateVO.getInspectionStageInfo().getMidCheckResult())  &&  !(updateVO.getInspectionStageInfo().getMidCheckResult().equals(midCheckResult))){
-                String MidCheckApplyTime= updateVO.getInspectionStageInfo().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);
+                LambdaQueryWrapper<ReceiveEmailMappingDO> receiveEmailMappingDOLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                receiveEmailMappingDOLambdaQueryWrapper.eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN);
+                if(!orderBaseInfoDO.getCustomerCode().contains("-") && !orderBaseInfoDO.getCustomerCode().contains("——")){
+                    receiveEmailMappingDOLambdaQueryWrapper.eq(ReceiveEmailMappingDO::getTypeValue, orderBaseInfoDO.getCustomerCode())
+                            .last("limit 1");
+                }else{
+                    receiveEmailMappingDOLambdaQueryWrapper.like(ReceiveEmailMappingDO::getTypeValue,orderBaseInfoDO.getCustomerCode().split("-")[0])
+                            .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(
+                            receiveEmailMappingDO.getConfigInfos(), new TypeReference<List<ReceiveEmailConfigItemVO>>() {
+                            });
+                    for (ReceiveEmailConfigItemVO item : receiveEmailConfigItemVOList) {
+                        if (OrderEventEnum.END_CHECK_REPORT_EVENT.getEvent().equals(item.getEvent())) {
+                            emailList = item.getEmails();
+                        }
+                    }
+                }
+                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.END_CHECK_REPORT_TEMPLATE, combineEmail, orderEventJobVO);
+                }
+            } else if (StringUtils.isNotBlank(updateVO.getInspectionStageInfo().getMidCheckResult()) && !(updateVO.getInspectionStageInfo().getMidCheckResult().equals(midCheckResult))) {
+                String MidCheckApplyTime = "";
+                if (StringUtils.isNotBlank(updateVO.getInspectionStageInfo().getMidCheckApplyTime())) {
+                    MidCheckApplyTime = updateVO.getInspectionStageInfo().getMidCheckApplyTime().substring(0, 10);
+                }
+                String ProductionDepartmentConsignTime = orderBaseInfoDO.getProductionDepartmentConsignTime().substring(0, 10);
+                orderEventJobVO.getInspectionStageInfo().setMidCheckApplyTime(MidCheckApplyTime);
+                orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(ProductionDepartmentConsignTime);
+                LambdaQueryWrapper<ReceiveEmailMappingDO> receiveEmailMappingDOLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                receiveEmailMappingDOLambdaQueryWrapper.eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN);
+                if(!orderBaseInfoDO.getCustomerCode().contains("-") && !orderBaseInfoDO.getCustomerCode().contains("——")){
+                    receiveEmailMappingDOLambdaQueryWrapper.eq(ReceiveEmailMappingDO::getTypeValue, orderBaseInfoDO.getCustomerCode())
+                            .last("limit 1");
+                }else{
+                    receiveEmailMappingDOLambdaQueryWrapper.like(ReceiveEmailMappingDO::getTypeValue,orderBaseInfoDO.getCustomerCode().split("-")[0])
+                            .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(
+                            receiveEmailMappingDO.getConfigInfos(), new TypeReference<List<ReceiveEmailConfigItemVO>>() {
+                            });
+                    for (ReceiveEmailConfigItemVO item : receiveEmailConfigItemVOList) {
+                        if (OrderEventEnum.END_CHECK_REPORT_EVENT.getEvent().equals(item.getEvent())) {
+                            emailList = item.getEmails();
+                        }
+                    }
+                }
+                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);
+
+                }
+            }
+        }
+    }
+
+    private void sendProductionCommentEmail(OrderBaseInfoDO orderBaseInfoDo, String productionComment) {
+        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())));
+        if (CollectionUtils.isNotEmpty(adminList)) {
+            List<String> emailsList = adminList.stream().map(AdminUserDO::getEmail).filter(Objects::nonNull).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(emailsList)) {
+                List<String> emailList = emailsList.stream()
+                        .flatMap(email -> Arrays.stream(email.split("[，,]+")))
+                        .collect(Collectors.toList());
+                if (CollectionUtils.isNotEmpty(emailList)) {
+                    OrderEventJobVO orderEventJobVO = new OrderEventJobVO();
+                    orderEventJobVO.setBaseInfo(new OrderBaseInfoVO());
+
+                    orderEventJobVO.getBaseInfo().setProjectNo(orderBaseInfoDo.getProjectNo());
+                    orderEventJobVO.getBaseInfo().setProductionDepartment(orderBaseInfoDo.getProductionDepartment());
+                    orderEventJobVO.getBaseInfo().setInnerNo(orderBaseInfoDo.getInnerNo());
+                    orderEventJobVO.getBaseInfo().setCustomerPo(orderBaseInfoDo.getCustomerPo());
+                    orderEventJobVO.getBaseInfo().setCustomerStyle(orderBaseInfoDo.getCustomerStyle());
+                    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(productionComment);
+                    orderEventJobVO.getBaseInfo().setProductionDepartmentConsignTime(orderBaseInfoDo.getProductionDepartmentConsignTime().substring(0, 10));
+                    //目前是选择的是跟单员邮箱和业务员邮箱。
+                    emailSendUtils.sendEmail(EmailTemplateEnum.PRODUCE_IDEA, emailList, orderEventJobVO);
+                }
             }
         }
     }
+package com.order.erp.service.order.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.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;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+
+/**
+ * @Author:ch
+ * @createTime:2024-08-05
+ */
+@Slf4j
+@Service
+public class OrderOpinionLogServiceImpl extends ServiceImpl<OrderOpinionLogMapper, OrderOpinionLogDO> implements OrderOpinionLogService {
+    @Override
+    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, orderOpinionLogVo.getOrderId())
+                .orderByDesc(OrderOpinionLogDO::getId));
+        return ServerResult.success(orderOpinionLogDOList);
+    }
+}
@@ -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>
@@ -70,7 +70,7 @@
             <td> 不良2 </td>
             <td> 不良3 </td>
             <td> 包装:卡片、条码、箱贴、箱单 </td>
-            <td> 中期验货结果PASS/FALL </td>
+            <td> 尾期验货结果PASS/FALL </td>
         <#elseif title=="尾期验货日期">
             <td> 客户编码</td>
             <td> 项目号</td>
@@ -80,23 +80,34 @@
             <td> 客户SYSTEM</td>
             <td> PO COLOR</td>
             <td> 订单图片</td>
-            <td> 生产要求</td>
+            <td> 产品意见</td>
             <td> 数量</td>
             <td> 生产科拖货时间</td>
+        <#elseif title=="产品意见信息" >
+                <td> 项目号</td>
+                <td> 生产科</td>
+                <td> 内部编号</td>
+                <td> 客户PO号</td>
+                <td> 客户SYSTEM</td>
+                <td> PO COLOR</td>
+                <td> 订单图片</td>
+                <td> 产品意见</td>
+                <td> 数量</td>
+                <td> 生产科拖货时间</td>
         <#else>
-            <td> 客户编码</td>
-            <td> 项目号</td>
-            <td> 生产科</td>
-            <td> 内部编号</td>
-            <td> 客户PO号</td>
-            <td> 客户SYSTEM</td>
-            <td> PO COLOR</td>
-            <td> 订单图片</td>
-            <td> 生产要求</td>
-            <td> 数量</td>
-            <td> 生产科拖货时间</td>
-            <td> 订单上的HOD时间</td>
-            <td> 出库类型</td>
+                <td> 客户编码</td>
+                <td> 项目号</td>
+                <td> 生产科</td>
+                <td> 内部编号</td>
+                <td> 客户PO号</td>
+                <td> 客户SYSTEM</td>
+                <td> PO COLOR</td>
+                <td> 订单图片</td>
+                <td> 产品意见</td>
+                <td> 数量</td>
+                <td> 生产科拖货时间</td>
+                <td> 订单上的HOD时间</td>
+                <td> 出库类型</td>
         </#if>
     </tr>
     <tr id="title2">
@@ -148,6 +159,17 @@
             <td>${data.baseInfo.productionComment!" "}</td>
             <td>${data.baseInfo.orderCount! " "}</td>
             <td>${data.baseInfo.productionDepartmentConsignTime! " "}</td>
+        <#elseif title=="产品意见信息">
+                <td>${data.baseInfo.projectNo! " "}</td>
+                <td>${data.baseInfo.productionDepartment! " "}</td>
+                <td>${data.baseInfo.innerNo!" "}</td>
+                <td>${data.baseInfo.customerPo!" "}</td>
+                <td>${data.baseInfo.customerStyle!" "}</td>
+                <td>${data.baseInfo.poColor!" "}</td>
+                <td><img src="${data.baseInfo.smallPicUrl! " "}" alt="Image"></td>
+                <td>${data.baseInfo.productionComment!" "}</td>
+                <td>${data.baseInfo.orderCount! " "}</td>
+                <td>${data.baseInfo.productionDepartmentConsignTime! " "}</td>
         <#else>
             <td>${data.baseInfo.customerCode! " "}</td>
             <td>${data.baseInfo.projectNo! " "}</td>