单据导出修改

jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -665,6 +665,24 @@ public class DateUtils extends PropertyEditorSupport {
         return 0;
     }
 
+    /**
+     * 计算两个时间之间的差值，根据标志的不同而不同
+     *
+     * @param flag   计算标志，表示按照年/月/日/时/分/秒等计算
+     * @param dateSrc 减数
+     * @param dateDes 被减数
+     * @return 两个日期之间的差值
+     */
+    public static int dateDiff(char flag, Date dateSrc, Date dateDes) {
+
+        Calendar calSrc = Calendar.getInstance();
+        calSrc.setTime(dateSrc);
+        Calendar calDes = Calendar.getInstance();
+        calDes.setTime(dateDes);
+
+        return  dateDiff(flag, calSrc, calDes);
+    }
+
     public static Long getCurrentTimestamp() {
         return Long.valueOf(DateUtils.yyyymmddhhmmss.get().format(new Date()));
     }

srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurInquiryFormController.java

@@ -24,11 +24,10 @@ import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.aspect.annotation.PermissionData;
+import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.baseCode.entity.BaseExchangeRate;
-import org.jeecg.modules.baseCode.entity.BaseProductArchive;
-import org.jeecg.modules.baseCode.entity.BaseProductClass;
-import org.jeecg.modules.baseCode.entity.BaseTemplates;
+import org.jeecg.common.util.UUIDGenerator;
+import org.jeecg.modules.baseCode.entity.*;
 import org.jeecg.modules.baseCode.service.*;
 import org.jeecg.modules.cuspCode.entity.CuspSupplierProfile;
 import org.jeecg.modules.cuspCode.service.ICuspSupplierProfileService;
@@ -37,7 +36,9 @@ import org.jeecg.modules.purCode.vo.SupplierQuotationDetails;
 import org.jeecg.modules.saleCode.entity.SaleQuotationProduct;
 import org.jeecg.modules.saleCode.vo.SaleInquiryFormAlert;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.utils.ExcelExportUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -107,6 +108,10 @@ public class PurInquiryFormController {
     private ICuspSupplierProfileService cuspSupplierProfileService;
     @Autowired
     private IBaseProductArchiveService baseProductArchiveService;
+    @Autowired
+    private IBaseProjectArchiveService baseProjectArchiveService;
+    @Autowired
+    private ISysDictService sysDictService;
 
     @Value(value = "${jeecg.path.upload}")
     private String uploadpath;
@@ -730,17 +735,7 @@ public class PurInquiryFormController {
         queryWrapper.eq(PurInquiryFormProduct::getHeadId, id);
         List<PurInquiryFormProduct> productList = purInquiryFormProductService.list(queryWrapper);
         if (templates != null) {
-            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setCharacterEncoding("utf-8");
             try {
-                String fileName = URLEncoder.encode(purInquiryForm.getBillCode(), "UTF-8").replaceAll("\\+", "%20");
-                response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
-
-                String filePath = uploadpath + templates.getTemplateFile();
-
-                //填写合同单号和模板， getOutputStream浏览器下载方法写在下方
-                ExcelWriter excelWriter = EasyExcel.write(this.getOutputStream(fileName, response)).withTemplate(filePath).build();
-                WriteSheet writeSheet = EasyExcel.writerSheet(0, "sheet1").build();
                 String productionClass = purInquiryForm.getProductionClass();
                 if (StringUtils.isNotBlank(productionClass)) {
 
@@ -773,6 +768,9 @@ public class PurInquiryFormController {
                     productWrapper.in(BaseProductArchive::getId, productList.stream().map(PurInquiryFormProduct::getProductId).collect(Collectors.toList()));
                     productArchiveList = baseProductArchiveService.list(productWrapper);
                 }
+                // 查询数据字典
+                List<DictModel> unitDictList = sysDictService.queryDictItemsByCode("measurement_unit");
+
                 // 产品设置
                 int rowNum = 1;
                 for (PurInquiryFormProduct product : productList){
@@ -780,13 +778,37 @@ public class PurInquiryFormController {
                     BaseProductArchive findProduct = productArchiveList.stream().filter(e->e.getId().equals(product.getProductId())).findFirst().orElse(null);
                     if (findProduct != null){
                         product.setUnit(findProduct.getMeasurementUnit());
+                        if (findProduct.getMeasurementUnit() != null){
+                            DictModel findDict = unitDictList.stream().filter(d->d.getValue().equals(findProduct.getMeasurementUnit())).findFirst().orElse(null);
+                            if (findDict != null){
+                                product.setUnit(findDict.getText());
+                            }
+                        }
                     }
                 }
-                // 组合填充时，因为多组填充的数据量不确定，需要在多组填充完之后另起一行
-                FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).forceNewRow(Boolean.TRUE).build();
-                excelWriter.fill(new FillWrapper(productList), fillConfig, writeSheet);
-                excelWriter.fill(purInquiryForm, writeSheet);
-                excelWriter.finish();
+                // 项目名称
+                if (purInquiryForm.getInquiryProject() != null){
+                    BaseProjectArchive projectArchive = baseProjectArchiveService.getById(purInquiryForm.getInquiryProject());
+                    if (projectArchive != null){
+                        purInquiryForm.setContactsNo(projectArchive.getName());
+                    }
+
+                }
+                String templateFilePath = uploadpath + templates.getTemplateFile();
+                String tempFilePath = uploadpath + "/"+ UUIDGenerator.generate()+".xlsx";
+
+                try (ExcelWriter excelWriter = EasyExcel.write(tempFilePath).withTemplate(templateFilePath).build()) {
+                    WriteSheet writeSheet = EasyExcel.writerSheet().build();
+                    FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).forceNewRow(Boolean.TRUE).build();
+                    excelWriter.fill(new FillWrapper(productList), fillConfig, writeSheet);
+                    excelWriter.fill(purInquiryForm, writeSheet);
+                }
+                List<String> noteList = new ArrayList<>();
+                productList.forEach(p->noteList.add(p.getNotes()));
+
+                ExcelExportUtils.excelInsertRowNotes(getOutputStream(purInquiryForm.getBillCode()+".xlsx", response),
+                        tempFilePath, 14, noteList, 1, 3);
+
 
             } catch (Exception ex) {
                 ex.printStackTrace();

srm-module-code/src/main/java/org/jeecg/modules/purCode/controller/PurOrderController.java

@@ -23,7 +23,9 @@ import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.aspect.annotation.PermissionData;
+import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.util.DateUtils;
+import org.jeecg.common.util.UUIDGenerator;
 import org.jeecg.modules.baseCode.entity.BaseProductArchive;
 import org.jeecg.modules.baseCode.entity.BaseProductClass;
 import org.jeecg.modules.baseCode.entity.BaseTemplates;
@@ -37,8 +39,11 @@ import org.jeecg.modules.purCode.entity.*;
 import org.jeecg.modules.purCode.service.*;
 import org.jeecg.modules.purCode.vo.PurOrderAlert;
 import org.jeecg.modules.saleCode.entity.*;
+import org.jeecg.modules.system.entity.SysDictItem;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.utils.ExcelExportUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -104,6 +109,8 @@ public class PurOrderController {
     private ICuspSupplierProfileService cuspSupplierProfileService;
     @Autowired
     private IBaseProductArchiveService baseProductArchiveService;
+    @Autowired
+    private ISysDictService sysDictService;
 
     @Value(value = "${jeecg.path.upload}")
     private String uploadpath;
@@ -821,17 +828,9 @@ public class PurOrderController {
         queryWrapper.eq(PurOrderProduct::getHeadId, id);
         List<PurOrderProduct> productList = purOrderProductService.list(queryWrapper);
         if (templates != null) {
-            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setCharacterEncoding("utf-8");
-            try {
-                String fileName = URLEncoder.encode(purOrder.getBillCode(), "UTF-8").replaceAll("\\+", "%20");
-                response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
 
-                String filePath = uploadpath + templates.getTemplateFile();
+            try {
 
-                //填写合同单号和模板， getOutputStream浏览器下载方法写在下方
-                ExcelWriter excelWriter = EasyExcel.write(this.getOutputStream(fileName, response)).withTemplate(filePath).build();
-                WriteSheet writeSheet = EasyExcel.writerSheet(0, "sheet1").build();
                 String productionClass = purOrder.getProductionClass();
                 if (StringUtils.isNotBlank(productionClass)) {
 
@@ -863,6 +862,12 @@ public class PurOrderController {
                     productWrapper.in(BaseProductArchive::getId, productList.stream().map(PurOrderProduct::getProductId).collect(Collectors.toList()));
                     productArchiveList = baseProductArchiveService.list(productWrapper);
                 }
+                // 查询数据字典
+                String paymentTermsText = sysDictService.queryDictTextByKey("supplier_payment_terms", purOrder.getPaymentTerms());
+                String currencyText = sysDictService.queryDictTextByKey("currency", purOrder.getCurrency());
+                purOrder.setPaymentTermsText(paymentTermsText);
+                purOrder.setCurrencyText(currencyText);
+                List<DictModel> unitDictList = sysDictService.queryDictItemsByCode("measurement_unit");
                 // 产品设置
                 int rowNum = 1;
                 BigDecimal orderMoney = BigDecimal.ZERO;
@@ -876,6 +881,12 @@ public class PurOrderController {
                     BaseProductArchive findProduct = productArchiveList.stream().filter(e->e.getId().equals(product.getProductId())).findFirst().orElse(null);
                     if (findProduct != null){
                         product.setUnit(findProduct.getMeasurementUnit());
+                        if (findProduct.getMeasurementUnit() != null){
+                            DictModel findDict = unitDictList.stream().filter(d->d.getValue().equals(findProduct.getMeasurementUnit())).findFirst().orElse(null);
+                            if (findDict != null){
+                                product.setUnit(findDict.getText());
+                            }
+                        }
                     }
                 }
                 if(productList.size() > 0){
@@ -884,11 +895,23 @@ public class PurOrderController {
                 }
                 orderMoney  = orderMoney.setScale(2);
                 purOrder.setOrderMoney(orderMoney);
-                // 组合填充时，因为多组填充的数据量不确定，需要在多组填充完之后另起一行
-                FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).forceNewRow(Boolean.TRUE).build();
-                excelWriter.fill(new FillWrapper(productList), fillConfig, writeSheet);
-                excelWriter.fill(purOrder, writeSheet);
-                excelWriter.finish();
+
+
+
+                String templateFilePath = uploadpath + templates.getTemplateFile();
+                String tempFilePath = uploadpath + "/"+ UUIDGenerator.generate()+".xlsx";
+
+                try (ExcelWriter excelWriter = EasyExcel.write(tempFilePath).withTemplate(templateFilePath).build()) {
+                    WriteSheet writeSheet = EasyExcel.writerSheet().build();
+                    FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).forceNewRow(Boolean.TRUE).build();
+                    excelWriter.fill(new FillWrapper(productList), fillConfig, writeSheet);
+                    excelWriter.fill(purOrder, writeSheet);
+                }
+                List<String> noteList = new ArrayList<>();
+                productList.forEach(p->noteList.add(p.getNotes()));
+
+                ExcelExportUtils.excelInsertRowNotes(getOutputStream(purOrder.getBillCode()+".xlsx", response),
+                        tempFilePath, 15, noteList, 1, 3);
 
             } catch (Exception ex) {
                 ex.printStackTrace();

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurInquiryForm.java

@@ -189,4 +189,6 @@ public class PurInquiryForm implements Serializable {
     private String billDateText;
     @TableField(exist = false)
     private String unit;
+    @TableField(exist = false)
+    private String contactsNo;
 }

srm-module-code/src/main/java/org/jeecg/modules/purCode/entity/PurOrder.java

@@ -230,4 +230,8 @@ public class PurOrder implements Serializable {
 
     @TableField(exist = false)
     private BigDecimal orderMoney;
+    @TableField(exist = false)
+    private String paymentTermsText;
+    @TableField(exist = false)
+    private String currencyText;
 }

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleDeliveryController.java

@@ -27,6 +27,7 @@ import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.aspect.annotation.PermissionData;
+import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.baseCode.entity.*;
 import org.jeecg.modules.baseCode.service.*;
@@ -38,6 +39,7 @@ import org.jeecg.modules.saleCode.vo.SaleDeliveryAlert;
 import org.jeecg.modules.storeCode.entity.StoreSaleOut;
 import org.jeecg.modules.storeCode.service.IStoreSaleOutService;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -110,6 +112,8 @@ public class SaleDeliveryController {
     private ISaleOrderProductService saleOrderProductService;
     @Autowired
     private ISaleOrderService saleOrderService;
+    @Autowired
+    private ISysDictService sysDictService;
 
     @Value(value = "${jeecg.path.upload}")
     private String uploadpath;
@@ -619,16 +623,12 @@ public class SaleDeliveryController {
 
 
         if (templates != null) {
-            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setCharacterEncoding("utf-8");
             try {
-                String fileName = URLEncoder.encode(saleDelivery.getBillCode(), "UTF-8").replaceAll("\\+", "%20");
-                response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
 
                 String filePath = uploadpath + templates.getTemplateFile();
 
                 //填写合同单号和模板， getOutputStream浏览器下载方法写在下方
-                ExcelWriter excelWriter = EasyExcel.write(this.getOutputStream(fileName, response)).withTemplate(filePath).build();
+                ExcelWriter excelWriter = EasyExcel.write(this.getOutputStream(saleDelivery.getBillCode(), response)).withTemplate(filePath).build();
                 WriteSheet writeSheet = EasyExcel.writerSheet(0, "sheet1").build();
                 String productionClass = saleDelivery.getProductionClass();
                 if (StringUtils.isNotBlank(productionClass)) {
@@ -672,6 +672,12 @@ public class SaleDeliveryController {
                         saleDelivery.setPaymentTerms(saleOrder.getPaymentTerms());
                     }
                 }
+                // 查询数据字典
+                String currencyText = sysDictService.queryDictTextByKey("currency", saleDelivery.getCurrency());
+                saleDelivery.setCurrencyText(currencyText);
+                String paymentTermsText = sysDictService.queryDictTextByKey("customer_payment_terms", saleDelivery.getPaymentTerms());
+                saleDelivery.setPaymentTermsText(paymentTermsText);
+                List<DictModel> unitDictList = sysDictService.queryDictItemsByCode("measurement_unit");
 
                 // 产品设置
                 int rowNum = 1;
@@ -687,10 +693,16 @@ public class SaleDeliveryController {
                     BaseProductArchive findProduct = productArchiveList.stream().filter(e->e.getId().equals(o.getProductId())).findFirst().orElse(null);
                     if (findProduct != null){
                         o.setUnit(findProduct.getMeasurementUnit());
+                        if (findProduct.getMeasurementUnit() != null){
+                            DictModel findDict = unitDictList.stream().filter(d->d.getValue().equals(findProduct.getMeasurementUnit())).findFirst().orElse(null);
+                            if (findDict != null){
+                                o.setUnit(findDict.getText());
+                            }
+                        }
                     }
                     SaleOrderProduct saleOrderProduct = saleOrderProductList.stream().filter(e->e.getId().equals(o.getSourceId())).findFirst().orElse(null);
                     if (saleOrderProduct != null){
-                        if (oConvertUtils.isNotEmpty(saleOrderProduct.getDiscount())){
+                        if (oConvertUtils.isNotEmpty(saleOrderProduct.getDiscount()) && saleOrderProduct.getDiscount().intValue() != 0){
                             o.setDiscountText(saleOrderProduct.getDiscount().intValue()+"%");
                         }
                     }

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleOrderController.java

@@ -23,7 +23,9 @@ import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.aspect.annotation.PermissionData;
+import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.util.DateUtils;
+import org.jeecg.common.util.UUIDGenerator;
 import org.jeecg.modules.baseCode.entity.*;
 import org.jeecg.modules.baseCode.service.*;
 import org.jeecg.modules.cuspCode.entity.CuspCustomerProfile;
@@ -36,7 +38,9 @@ import org.jeecg.modules.saleCode.entity.*;
 import org.jeecg.modules.saleCode.service.*;
 import org.jeecg.modules.saleCode.vo.SaleOrderAlert;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.utils.ExcelExportUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -113,6 +117,8 @@ public class SaleOrderController {
     private IBaseProductArchiveService baseProductArchiveService;
     @Autowired
     private IBaseProjectArchiveService baseProjectArchiveService;
+    @Autowired
+    private ISysDictService sysDictService;
 
     @Value(value = "${jeecg.path.upload}")
     private String uploadpath;
@@ -876,17 +882,7 @@ public class SaleOrderController {
             templates = templatesZ;
         }
         if (templates != null) {
-            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setCharacterEncoding("utf-8");
             try {
-                String fileName = URLEncoder.encode(saleOrder.getBillCode(), "UTF-8").replaceAll("\\+", "%20");
-                response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
-
-                String filePath = uploadpath + templates.getTemplateFile();
-
-                //填写合同单号和模板， getOutputStream浏览器下载方法写在下方
-                ExcelWriter excelWriter = EasyExcel.write(this.getOutputStream(fileName, response)).withTemplate(filePath).build();
-                WriteSheet writeSheet = EasyExcel.writerSheet(0, "sheet1").build();
                 String productionClass = saleOrder.getProductionClass();
                 if (StringUtils.isNotBlank(productionClass)) {
 
@@ -913,6 +909,13 @@ public class SaleOrderController {
                     productWrapper.in(BaseProductArchive::getId, productList.stream().map(SaleOrderProduct::getProductId).collect(Collectors.toList()));
                     productArchiveList = baseProductArchiveService.list(productWrapper);
                 }
+                // 查询数据字典
+                String paymentTermsText = sysDictService.queryDictTextByKey("customer_payment_terms", saleOrder.getPaymentTerms());
+                String currencyText = sysDictService.queryDictTextByKey("currency", saleOrder.getCurrency());
+                saleOrder.setPaymentTermsText(paymentTermsText);
+                saleOrder.setCurrencyText(currencyText);
+                List<DictModel> unitDictList = sysDictService.queryDictItemsByCode("measurement_unit");
+
                 // 产品设置
                 int rowNum = 1;
                 BigDecimal orderMoney = BigDecimal.ZERO;
@@ -923,12 +926,18 @@ public class SaleOrderController {
                     if (o.getDeliveryTime() != null){
                         o.setDeliverDateText(DateUtils.date2Str(o.getDeliveryTime(), DateUtils.date_sdf.get()));
                     }
-                    if (oConvertUtils.isNotEmpty(o.getDiscount())){
+                    if (oConvertUtils.isNotEmpty(o.getDiscount()) && o.getDiscount().intValue() != 0){
                         o.setDiscountText(o.getDiscount().intValue()+"%");
                     }
                     BaseProductArchive findProduct = productArchiveList.stream().filter(e->e.getId().equals(o.getProductId())).findFirst().orElse(null);
                     if (findProduct != null){
                         o.setUnit(findProduct.getMeasurementUnit());
+                        if (findProduct.getMeasurementUnit() != null){
+                            DictModel findDict = unitDictList.stream().filter(d->d.getValue().equals(findProduct.getMeasurementUnit())).findFirst().orElse(null);
+                            if (findDict != null){
+                                o.setUnit(findDict.getText());
+                            }
+                        }
                     }
                 }
                 orderMoney = orderMoney.setScale(2);
@@ -975,11 +984,23 @@ public class SaleOrderController {
                 SysUser sysUser = sysUserService.getUserByName(saleOrder.getCreateBy());
                 saleOrder.setSalesPhone(sysUser.getPhone());
                 saleOrder.setSalesEmail(sysUser.getEmail());
-                // 组合填充时，因为多组填充的数据量不确定，需要在多组填充完之后另起一行
-                FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).forceNewRow(Boolean.TRUE).build();
-                excelWriter.fill(new FillWrapper(productList), fillConfig, writeSheet);
-                excelWriter.fill(saleOrder, writeSheet);
-                excelWriter.finish();
+
+
+                String templateFilePath = uploadpath + templates.getTemplateFile();
+                String tempFilePath = uploadpath + "/"+ UUIDGenerator.generate()+".xlsx";
+
+                try (ExcelWriter excelWriter = EasyExcel.write(tempFilePath).withTemplate(templateFilePath).build()) {
+                    WriteSheet writeSheet = EasyExcel.writerSheet().build();
+                    FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).forceNewRow(Boolean.TRUE).build();
+                    excelWriter.fill(new FillWrapper(productList), fillConfig, writeSheet);
+                    excelWriter.fill(saleOrder, writeSheet);
+                }
+                List<String> noteList = new ArrayList<>();
+                productList.forEach(p->noteList.add(p.getNotes()));
+
+                ExcelExportUtils.excelInsertRowNotes(getOutputStream(saleOrder.getBillCode()+".xlsx", response),
+                        tempFilePath, 17, noteList, 1, 3);
+
 
             } catch (Exception ex) {
                 ex.printStackTrace();

srm-module-code/src/main/java/org/jeecg/modules/saleCode/controller/SaleQuotationController.java

@@ -4,6 +4,9 @@ import java.io.*;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -11,21 +14,25 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.io.FileUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.enums.WriteDirectionEnum;
 import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.excel.write.merge.LoopMergeStrategy;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.alibaba.excel.write.metadata.fill.FillWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jeecg.common.aspect.annotation.PermissionData;
 import org.jeecg.common.util.DateUtils;
-import org.jeecg.modules.baseCode.entity.BaseProductArchive;
-import org.jeecg.modules.baseCode.entity.BaseProductClass;
-import org.jeecg.modules.baseCode.entity.BaseShipArchive;
-import org.jeecg.modules.baseCode.entity.BaseTemplates;
+import org.jeecg.common.util.UUIDGenerator;
+import org.jeecg.modules.baseCode.entity.*;
 import org.jeecg.modules.baseCode.service.*;
 import org.jeecg.modules.cuspCode.entity.CuspCustomerProfile;
 import org.jeecg.modules.cuspCode.entity.CuspSupplierProfile;
@@ -38,7 +45,9 @@ import org.jeecg.modules.saleCode.service.*;
 import org.jeecg.modules.saleCode.util.EasyExcelUtil;
 import org.jeecg.modules.saleCode.vo.SaleQuotationAlert;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysDictService;
 import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.utils.ExcelExportUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -106,6 +115,10 @@ public class SaleQuotationController {
     private IBaseShipArchiveService baseShipArchiveService;
     @Autowired
     private IBaseProductArchiveService baseProductArchiveService;
+    @Autowired
+    private IBaseProjectArchiveService baseProjectArchiveService;
+    @Autowired
+    private ISysDictService sysDictService;
 
     @Value(value = "${jeecg.path.upload}")
     private String uploadpath;
@@ -528,17 +541,8 @@ public class SaleQuotationController {
         List<SaleQuotationProduct> productList = saleQuotationProductService.selectByMainId(saleQuotation.getId());
         List<SaleQuotationShip> saleQuotationShipList = saleQuotationShipService.selectByMainId(saleQuotation.getId());
         if (templates != null) {
-            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setCharacterEncoding("utf-8");
             try {
-                String fileName = URLEncoder.encode("销售报价单" + saleQuotation.getBillCode(), "UTF-8").replaceAll("\\+", "%20");
-                response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
-
-                String filePath = uploadpath + templates.getTemplateFile();
 
-                //填写合同单号和模板， getOutputStream浏览器下载方法写在下方
-                ExcelWriter excelWriter = EasyExcel.write(this.getOutputStream(fileName, response)).withTemplate(filePath).build();
-                WriteSheet writeSheet = EasyExcel.writerSheet(0, "sheet1").build();
                 String productionClass = saleQuotation.getProductionClass();
                 if (StringUtils.isNotBlank(productionClass)) {
 
@@ -576,8 +580,11 @@ public class SaleQuotationController {
                     if (findProduct != null){
                         o.setUnit(findProduct.getMeasurementUnit());
                     }
+                    if (o.getDiscount() != null && o.getDiscount().intValue() != 0){
+                        o.setDiscountText(String.valueOf(o.getDiscount()));
+                    }
                 }
-                saleQuotation.setOrderMoney(orderMoney);
+                saleQuotation.setOrderMoney(orderMoney.setScale(2));
 
                 String shipname = "";
                 String imo = "";
@@ -596,7 +603,14 @@ public class SaleQuotationController {
                 }
                 saleQuotation.setShipName(shipname);
                 saleQuotation.setImo(imo);
-                saleQuotation.setContactsNo(saleQuotation.getQuotationProjectName());
+                // 项目名称
+                if (saleQuotation.getQuotationProject() != null){
+                    BaseProjectArchive projectArchive = baseProjectArchiveService.getById(saleQuotation.getQuotationProject());
+                    if (projectArchive != null){
+                        saleQuotation.setContactsNo(projectArchive.getName());
+                    }
+
+                }
                 if(productList.size() > 0){
 
                     saleQuotation.setQualityGrade(productList.get(0).getQualityGrade());
@@ -609,11 +623,32 @@ public class SaleQuotationController {
                 SysUser sysUser = sysUserService.getUserByName(saleQuotation.getCreateBy());
                 saleQuotation.setSalesPhone(sysUser.getPhone());
                 saleQuotation.setSalesEmail(sysUser.getEmail());
-                // 组合填充时，因为多组填充的数据量不确定，需要在多组填充完之后另起一行
-                FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).forceNewRow(Boolean.TRUE).build();
-                excelWriter.fill(new FillWrapper(productList), fillConfig, writeSheet);
-                excelWriter.fill(saleQuotation, writeSheet);
-                excelWriter.finish();
+                // 查询数据字典
+                String paymentTermsText = sysDictService.queryDictTextByKey("customer_payment_terms", saleQuotation.getPaymentTerms());
+                String currencyText = sysDictService.queryDictTextByKey("currency", saleQuotation.getCurrency());
+                //String qualityGrade = sysDictService.queryDictTextByKey("quality_grade", saleQuotation.getQualityGrade());
+                saleQuotation.setPaymentTermsText(paymentTermsText);
+                saleQuotation.setCurrencyText(currencyText);
+                //saleQuotation.setQualityGrade(qualityGrade);
+                // 报价有效期
+                if (oConvertUtils.isNotEmpty(saleQuotation.getQuotationPeriodBegin()) && oConvertUtils.isNotEmpty(saleQuotation.getQuotationPeriodEnd())){
+                    saleQuotation.setQuotationPeriodText(String.valueOf(DateUtils.dateDiff('d', saleQuotation.getQuotationPeriodEnd(), saleQuotation.getQuotationPeriodBegin())));
+                }
+
+                String templateFilePath = uploadpath + templates.getTemplateFile();
+                String tempFilePath = uploadpath + "/"+ UUIDGenerator.generate()+".xlsx";
+
+                try (ExcelWriter excelWriter = EasyExcel.write(tempFilePath).withTemplate(templateFilePath).build()) {
+                    WriteSheet writeSheet = EasyExcel.writerSheet().build();
+                    FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).forceNewRow(Boolean.TRUE).build();
+                    excelWriter.fill(new FillWrapper(productList), fillConfig, writeSheet);
+                    excelWriter.fill(saleQuotation, writeSheet);
+                }
+                List<String> noteList = new ArrayList<>();
+                productList.forEach(p->noteList.add(p.getNotes()));
+
+                ExcelExportUtils.excelInsertRowNotes(getOutputStream(saleQuotation.getBillCode()+".xlsx", response),
+                        tempFilePath, 21, noteList, 1, 3);
 
             } catch (Exception ex) {
                 ex.printStackTrace();

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleDelivery.java

@@ -230,4 +230,8 @@ public class SaleDelivery implements Serializable {
     private BigDecimal deliveryMoney;
     @TableField(exist = false)
     private String paymentTerms;
+    @TableField(exist = false)
+    private String currencyText;
+    @TableField(exist = false)
+    private String paymentTermsText;
 }

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrder.java

@@ -280,4 +280,8 @@ public class SaleOrder implements Serializable {
     private BigDecimal discountMoney;
     @TableField(exist = false)
     private String discountText;
+    @TableField(exist = false)
+    private String paymentTermsText;
+    @TableField(exist = false)
+    private String currencyText;
 }

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleOrderProduct.java

@@ -174,4 +174,5 @@ public class SaleOrderProduct implements Serializable {
     private String discountText;
     @TableField(exist = false)
     private String unit;
+
 }

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotation.java

@@ -222,4 +222,10 @@ public class SaleQuotation implements Serializable {
     private BigDecimal orderMoney;
     @TableField(exist = false)
     private String billDateText;
+    @TableField(exist = false)
+    private String paymentTermsText;
+    @TableField(exist = false)
+    private String currencyText;
+    @TableField(exist = false)
+    private String quotationPeriodText;
 }

srm-module-code/src/main/java/org/jeecg/modules/saleCode/entity/SaleQuotationProduct.java

@@ -184,5 +184,7 @@ public class SaleQuotationProduct implements Serializable {
     private BigDecimal taxPriceGys;//供应商采购单价
     @TableField(exist = false)
     private Integer rowNumber;
+    @TableField(exist = false)
+    private String discountText;
 
 }

srm-module-code/src/main/java/org/jeecg/modules/utils/ExcelExportUtils.java

@@ -0,0 +1,77 @@
+package org.jeecg.modules.utils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.jeecg.common.util.oConvertUtils;
+import org.springframework.stereotype.Component;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+/**
+ * excel导出
+ */
+@Component
+@Slf4j
+public class ExcelExportUtils {
+    /**
+     * 导出excel插入注释行
+     * @param tempFilePath 临时
+     * @param startIndex 子表数据第一行号，从1开始
+     * @param noteList
+     * @param mergeStartColumn 开始合并列下标，从0开始
+     * @param mergeEndColumn
+     */
+    public static void excelInsertRowNotes(OutputStream outputStream, String tempFilePath,
+                                    int startIndex, List<String> noteList,
+                                    int mergeStartColumn, int mergeEndColumn){
+        try {
+            FileInputStream fis = new FileInputStream(tempFilePath);
+            Workbook workbook = new XSSFWorkbook(fis);  // 创建 HSSFWorkbook 用于 .xls 文件
+            Sheet sheet = workbook.getSheetAt(0); // 获取第一个工作表（Sheet）
+            int firstRowIndex = startIndex;
+            int insertedRow = 0;
+            for (int i = 0; i < noteList.size(); i++) {
+                String notes = noteList.get(i);
+                if (oConvertUtils.isNotEmpty(notes)) {
+                    int rowIndex = firstRowIndex + i + insertedRow;
+                    insertedRow++;
+                    sheet.shiftRows(rowIndex, sheet.getLastRowNum(), 1, true, true);
+                    Row newRow = sheet.createRow(rowIndex); // 备注行
+                    Cell remarkCell = newRow.createCell(1); // 备注从第一列开始
+                    remarkCell.setCellValue(notes);
+                    CellRangeAddress mergedRegion = new CellRangeAddress(rowIndex, rowIndex, mergeStartColumn, mergeEndColumn); // 合并从第一行第一列到第一行第三列的单元格
+
+                    CellStyle style = workbook.createCellStyle();
+                    style.setWrapText(true);
+                    Font font = workbook.createFont();
+                    font.setFontHeightInPoints((short) 10); // 设置字体大小为10
+                    style.setFont(font);
+
+                    remarkCell.setCellStyle(style);
+                    sheet.addMergedRegion(mergedRegion);
+                }
+            }
+            // 6. 保存为新文件
+            workbook.write(outputStream);
+
+            // 7. 关闭资源
+            fis.close();
+
+            Path path = Paths.get(tempFilePath);
+            try {
+                Files.delete(path);
+            } catch (IOException e) {
+            }
+        }catch (Exception ex){
+
+        }
+    }
+}