[feat] 销售管理

删除之前的4个客户报价的导出模板，按照万材提供的4个模板进行导出，新增型号字段

ruoyi-admin/src/main/java/com/ruoyi/system/domain/Vo/ExportCustomerQuoteChildVo.java

@@ -18,6 +18,12 @@ public class ExportCustomerQuoteChildVo {
     /** 物料的数量 */
     private Integer materialNum;
 
+    /** 物料的型号 */
+    private String materialModel;
+
+
+    /** 物料图片*/
+    private String photoUrl;
 
     /** 物料的含税单价 */
     private BigDecimal materialTaxMoney;

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerQuoteServiceImpl.java

@@ -486,7 +486,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
     @Override
     public void exportCustomerQuoteOne(String supplierCode, HttpServletResponse response) {
 
-        String fileName = "Vantritek-RMB.xlsx";
+        String fileName = "中文Vantritek-RMB.xlsx";
 
         try {
 
@@ -533,6 +533,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
                 ExportCustomerQuoteChildVo exportCustomerQuoteChildVo = new ExportCustomerQuoteChildVo();
                 exportCustomerQuoteChildVo.setDescribe(sysCustomerQuoteChild.getDescribe());
                 exportCustomerQuoteChildVo.setMaterialNum(sysCustomerQuoteChild.getMaterialNum());
+                exportCustomerQuoteChildVo.setMaterialModel(sysCustomerQuoteChild.getMaterialModel());
                 //区分币种
                 setMaterialPrice(exportCustomerQuoteChildVo, sysCustomerVo, sysCustomerQuoteChild);
                 exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo);
@@ -557,7 +558,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
      * */
     @Override
     public void exportCustomerQuoteTwo(String supplierCode, HttpServletResponse response) {
-        String fileName = "Vantritek-美元.xlsx";
+        String fileName = "英文Vantritek-美元.xlsx";
 
         try {
 
@@ -597,6 +598,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
                 ExportCustomerQuoteChildVo exportCustomerQuoteChildVo = new ExportCustomerQuoteChildVo();
                 exportCustomerQuoteChildVo.setDescribe(sysCustomerQuoteChild.getDescribe());
                 exportCustomerQuoteChildVo.setMaterialNum(sysCustomerQuoteChild.getMaterialNum());
+                exportCustomerQuoteChildVo.setMaterialModel(sysCustomerQuoteChild.getMaterialModel());
                 //区分币种
                 setMaterialPrice(exportCustomerQuoteChildVo, sysCustomerVo, sysCustomerQuoteChild);
                 exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo);
@@ -620,7 +622,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
     * */
     @Override
     public void exportCustomerQuoteThree(String supplierCode, HttpServletResponse response) {
-        String fileName = "Infinity-RMB.xlsx";
+        String fileName = "英文Infinity-美元.xlsx";
 
         try {
 
@@ -645,19 +647,11 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
             String customerCode = sysCustomerQuote.getCustomerCode();
             SysCustomerVo sysCustomerVo = sysCustomerMapper.selectSysCustomerByEnterpriseCode(customerCode);
 
-
-            List<SysCompanyInformation> companyInformations = companyInformationMapper.selectSysCompanyInformationAllList();
-            //from
-            SysCompanyInformation sysCompanyInformation = companyInformations.get(0);
-
             HashMap<String, Object> map = new HashMap<>();
             String pricingDate = sysCustomerQuote.getPricingDate();
 
             map.put("supplierCode", sysCustomerQuote.getSupplierCode());
             map.put("pricingDate", pricingDate);
-            map.put("contacts", sysCompanyInformation.getContacts());
-            map.put("contactNumberFrom", sysCompanyInformation.getContactNumber());
-            map.put("companyEmail", sysCompanyInformation.getCompanyEmail());
             map.put("customerContact", sysCustomerVo.getCustomerContact());
             map.put("contactNumberTo", sysCustomerVo.getContactNumber());
             map.put("customerEmail", sysCustomerVo.getCustomerEmail());
@@ -667,6 +661,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
                 ExportCustomerQuoteChildVo exportCustomerQuoteChildVo = new ExportCustomerQuoteChildVo();
                 exportCustomerQuoteChildVo.setDescribe(sysCustomerQuoteChild.getDescribe());
                 exportCustomerQuoteChildVo.setMaterialNum(sysCustomerQuoteChild.getMaterialNum());
+                exportCustomerQuoteChildVo.setMaterialModel(sysCustomerQuoteChild.getMaterialModel());
                 //区分币种
                 setMaterialPrice(exportCustomerQuoteChildVo, sysCustomerVo, sysCustomerQuoteChild);
                 exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo);
@@ -690,7 +685,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
     * */
     @Override
     public void exportCustomerQuoteFour(String supplierCode, HttpServletResponse response) {
-        String fileName = "Infinity-美元.xlsx";
+        String fileName = "中文Infinity-美元.xlsx";
 
 
         try {
@@ -715,13 +710,18 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
 
             String customerCode = sysCustomerQuote.getCustomerCode();
             SysCustomerVo sysCustomerVo = sysCustomerMapper.selectSysCustomerByEnterpriseCode(customerCode);
-
+            List<SysCompanyInformation> companyInformations = companyInformationMapper.selectSysCompanyInformationAllList();
+            //from
+            SysCompanyInformation sysCompanyInformation = companyInformations.get(0);
 
             HashMap<String, Object> map = new HashMap<>();
             String pricingDate = sysCustomerQuote.getPricingDate();
 
             map.put("supplierCode", sysCustomerQuote.getSupplierCode());
             map.put("pricingDate", pricingDate);
+            map.put("contacts", sysCompanyInformation.getContacts());
+            map.put("contactNumberFrom", sysCompanyInformation.getContactNumber());
+            map.put("companyEmail", sysCompanyInformation.getCompanyEmail());
             map.put("customerContact", sysCustomerVo.getCustomerContact());
             map.put("contactNumberTo", sysCustomerVo.getContactNumber());
             map.put("customerEmail", sysCustomerVo.getCustomerEmail());
@@ -731,6 +731,7 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
                 ExportCustomerQuoteChildVo exportCustomerQuoteChildVo = new ExportCustomerQuoteChildVo();
                 exportCustomerQuoteChildVo.setDescribe(sysCustomerQuoteChild.getDescribe());
                 exportCustomerQuoteChildVo.setMaterialNum(sysCustomerQuoteChild.getMaterialNum());
+                exportCustomerQuoteChildVo.setMaterialModel(sysCustomerQuoteChild.getMaterialModel());
                 //区分币种
                 setMaterialPrice(exportCustomerQuoteChildVo, sysCustomerVo, sysCustomerQuoteChild);
                 exportCustomerQuoteChildVos.add(exportCustomerQuoteChildVo);
@@ -742,7 +743,6 @@ public class SysCustomerQuoteServiceImpl implements ISysCustomerQuoteService {
             workBook.fill(map, sheet);
             workBook.fill(exportCustomerQuoteChildVos, fillConfig, sheet);
             workBook.finish();
-
         } catch (IOException e) {
             throw new RuntimeException("文件处理失败",e);
         }

ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html

@@ -71,16 +71,16 @@
                     <i class="fa fa-download"></i> 导出
                 </a>
                 <a class="btn btn-success btn-xs" onclick="exportCustomerQuoteOne()" shiro:hasPermission="system:customerQuote:exportCustomerQuoteOne">
-                    <i class="fa fa-download"></i> 导出Vantritek-RMB
+                    <i class="fa fa-download"></i> 导出中文Vantritek-RMB
                 </a>
                 <a class="btn btn-success btn-xs" onclick="exportCustomerQuoteTwo()" shiro:hasPermission="system:customerQuote:exportCustomerQuoteTwo">
-                    <i class="fa fa-download"></i> 导出Vantritek-美元
+                    <i class="fa fa-download"></i> 导出英文Vantritek-美元
                 </a>
                 <a class="btn btn-success btn-xs" onclick="exportCustomerQuoteThree()" shiro:hasPermission="system:customerQuote:exportCustomerQuoteThree">
-                    <i class="fa fa-download"></i> 导出Infinity-RMB
+                    <i class="fa fa-download"></i> 导出英文Infinity-美元
                 </a>
                 <a class="btn btn-success btn-xs" onclick="exportCustomerQuoteFour()" shiro:hasPermission="system:customerQuote:exportCustomerQuoteFour">
-                    <i class="fa fa-download"></i> 导出Infinity-美元
+                    <i class="fa fa-download"></i> 导出中文Infinity-美元
                 </a>
             </div>
             <div class="col-sm-12 select-table table-striped">
@@ -433,7 +433,7 @@
                     // 检查是否已审核
                     if (row.auditStatus === AUDIT_STATUS_APPROVED) {
 
-                        if (row.commonCurrency === '1'){
+                        if (row.commonCurrency === '2'){
                             // 使用 $.modal.confirm 显示确认对话框
                             $.modal.confirm("确定导出这条数据的客户报价吗？", function() {
                                 // 如果用户点击确定，继续导出
@@ -442,7 +442,7 @@
                                 $('#bootstrap-table').bootstrapTable('refresh'); // 刷新表格
                             });
                         }else {
-                            showWarning("请选择报价币种为RMB的数据进行导出");
+                            showWarning("请选择报价币种为美元的数据进行导出");
                         }
                     } else {
                         showWarning("请先审核");