楚江ERP：外贸合同导出

@@ -498,9 +498,18 @@ public class ContractDistributorStandardController extends DefaultBaseController
             });
         }
 
+
+        String templatePath = "templates/standardContractTemplate.xls";
+        if ("INTL_STD_CONTRACT".equals(data.getType())
+                || "INTL_INVENTORY_AGMT".equals(data.getType())
+                || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) { // 读取外贸合同模版
+            templatePath = "templates/foreignStandardContractTemplate.xls";
+        }
+
         try {
+
             // 加载模板文件
-            ClassPathResource templateResource = new ClassPathResource("templates/standardContractTemplate.xls");
+            ClassPathResource templateResource = new ClassPathResource(templatePath);
             try (InputStream inputStream = templateResource.getStream();
                  Workbook workbook = new HSSFWorkbook(inputStream)) {
                 try {
@@ -551,8 +560,16 @@ public class ContractDistributorStandardController extends DefaultBaseController
 
                             setCellValue(sheet, startRow, 6, contractDistributorLineBo.getStatus()); // F列
                             setCellValue(sheet, startRow, 7, contractDistributorLineBo.getQuantity()); // G列
-                            setCellValue(sheet, startRow, 9, contractDistributorLineBo.getUnitPrice()); // I列
-                            setCellValue(sheet, startRow, 10, contractDistributorLineBo.getAmountExcludingTax()); // K列
+                            if ("INTL_STD_CONTRACT".equals(data.getType())
+                                    || "INTL_INVENTORY_AGMT".equals(data.getType())
+                                    || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) {
+                                setCellValue(sheet, startRow, 9, contractDistributorLineBo.getProcessingFee()); // I列
+                                setCellValue(sheet, startRow, 10, contractDistributorLineBo.getProcessingFee().add(contractDistributorLineBo.getUnitPrice())); // K列
+                            } else {
+                                setCellValue(sheet, startRow, 9, contractDistributorLineBo.getUnitPrice()); // I列
+                                setCellValue(sheet, startRow, 10, contractDistributorLineBo.getAmountExcludingTax()); // K列
+                            }
+
                             setCellValue(sheet, startRow, 11, contractDistributorLineBo.getTotalAmount()); // L列
                             setCellValue(sheet, startRow, 12, contractDistributorLineBo.getDeliveryDate() != null ?
                                     contractDistributorLineBo.getDeliveryDate().format(dateFormatter) : ""); // L列
@@ -566,8 +583,8 @@ public class ContractDistributorStandardController extends DefaultBaseController
                     dataMap.put("orderDate", data.getOrderDate().format(dateFormatter));
                     dataMap.put("supplierName", data.getSupplierName());
                     dataMap.put("buyerName", data.getBuyerName());
-//                    dataMap.put("unitName", data.getUnitName());
-                    dataMap.put("unitName", "元、公斤、元/公斤");
+                    dataMap.put("unitName", data.getUnit());
+//                    dataMap.put("unitName", "元、公斤、元/公斤");
 
                     dataMap.put("totalQuantity", data.getTotalQuantity().setScale(0, RoundingMode.HALF_UP).toString());
                     dataMap.put("totalAmountExcludingTax", data.getTotalAmountExcludingTax().setScale(2, RoundingMode.HALF_UP).toString());
@@ -600,9 +617,9 @@ public class ContractDistributorStandardController extends DefaultBaseController
                 }
 
             } catch (FileNotFoundException e) {
-                throw new RuntimeException("模板文件不存在: templates/standardContractTemplate.xls", e);
+                throw new RuntimeException("模板文件不存在:" + templatePath, e);
             } catch (IOException e) {
-                throw new RuntimeException("无法读取模板文件: templates/standardContractTemplate.xls", e);
+                throw new RuntimeException("无法读取模板文件:" + templatePath, e);
             }
         } catch (Exception e) {
             log.error("标准合同模版打印: {}", e.getMessage(), e);