资金协调手续：导出区分贸易类型内、外贸

@@ -561,7 +561,9 @@ public class FundCoordinationController extends DefaultBaseController {
 
 
     @ApiOperation("资金协调手续打印")
     @ApiOperation("资金协调手续打印")
     @GetMapping("/printFundCoordination")
     @GetMapping("/printFundCoordination")
-    public void printFundCoordination(@NotBlank(message = "id不能为空") String id, HttpServletResponse response) throws IOException {
+    public void printFundCoordination(@NotBlank(message = "id不能为空") String id,
+                                      @NotBlank(message = "type不能为空") String type,
+                                      HttpServletResponse response) throws IOException {
         FundCoordination fundCoordination = fundCoordinationService.findById(id);
         FundCoordination fundCoordination = fundCoordinationService.findById(id);
 
 
         GetFundCoordinationBo data = packFundCoordinationData(fundCoordination);
         GetFundCoordinationBo data = packFundCoordinationData(fundCoordination);
@@ -576,7 +578,7 @@ public class FundCoordinationController extends DefaultBaseController {
                  Workbook workbook = new XSSFWorkbook(inputStream)) {
                  Workbook workbook = new XSSFWorkbook(inputStream)) {
                 try {
                 try {
                     Sheet sheet = workbook.getSheetAt(0);
                     Sheet sheet = workbook.getSheetAt(0);
-                    processOrderingUnits(workbook,sheet, data.getFundOrderingUnitList());
+                    processOrderingUnits(workbook,sheet, data.getFundOrderingUnitList(),type);
 
 
                     DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
                     DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
 
@@ -715,7 +717,7 @@ public class FundCoordinationController extends DefaultBaseController {
     /**
     /**
      * 处理订货单位及其应收款明细的动态插入
      * 处理订货单位及其应收款明细的动态插入
      */
      */
-    private void processOrderingUnits(Workbook workbook, Sheet sheet, List<FundOrderingUnit> unitList) {
+    private void processOrderingUnits(Workbook workbook, Sheet sheet, List<FundOrderingUnit> unitList, String type) {
         if (CollectionUtils.isEmpty(unitList)) {
         if (CollectionUtils.isEmpty(unitList)) {
             return;
             return;
         }
         }
@@ -742,6 +744,21 @@ public class FundCoordinationController extends DefaultBaseController {
                 continue;
                 continue;
             }
             }
             if (j == 0) {
             if (j == 0) {
+                // 清空第九行单元格的值（列范围可根据需要调整，B列的值）
+                Row targetRow3 = sheet.getRow(8);
+                if (targetRow3 != null) {
+                    // 假设你只关心 B 列（1）
+                    Cell cell = targetRow3.getCell(1);
+                    if (cell != null) {
+                        cell.setCellValue((String) null); // 清空内容，保留样式
+                    }
+                }
+                //填充值
+                if ("INSIDE".equals(type)) {
+                    setCellValue(sheet, 8, 1, "应收款（元）");
+                } else if ("OUTSIDE".equals(type)) {
+                    setCellValue(sheet, 8, 1, "应收款（美元）");
+                }
                 // === 3. 明细数据行 ===
                 // === 3. 明细数据行 ===
                 for (int i = startRow + 1; i < startRow + unit.getFundOrderingUnitDetailList().size(); i++) {
                 for (int i = startRow + 1; i < startRow + unit.getFundOrderingUnitDetailList().size(); i++) {
                     copyRow(workbook, sheet, startRow, i);
                     copyRow(workbook, sheet, startRow, i);
@@ -763,6 +780,8 @@ public class FundCoordinationController extends DefaultBaseController {
                     copyRow(workbook, sheet, 9, startRow);
                     copyRow(workbook, sheet, 9, startRow);
                     // 合并 A-H 列
                     // 合并 A-H 列
                     CellRangeAddress mergeRegion = new CellRangeAddress(startRow, startRow, 1, 7);
                     CellRangeAddress mergeRegion = new CellRangeAddress(startRow, startRow, 1, 7);
+                    removeMergedRegionIfExists(sheet, mergeRegion);
+                    sheet.addMergedRegion(mergeRegion);
                     // 清空该行所有单元格的值（列范围可根据需要调整，比如 A～H 或整行）
                     // 清空该行所有单元格的值（列范围可根据需要调整，比如 A～H 或整行）
                     Row targetRow1 = sheet.getRow(startRow);
                     Row targetRow1 = sheet.getRow(startRow);
                     if (targetRow1 != null) {
                     if (targetRow1 != null) {
@@ -774,8 +793,6 @@ public class FundCoordinationController extends DefaultBaseController {
                             }
                             }
                         }
                         }
                     }
                     }
-                    removeMergedRegionIfExists(sheet, mergeRegion);
-                    sheet.addMergedRegion(mergeRegion);
                     //填充值
                     //填充值
                     setCellValue(sheet, startRow, 0, "备注说明");
                     setCellValue(sheet, startRow, 0, "备注说明");
                     setCellValue(sheet, startRow, 1, unit.getRemark());
                     setCellValue(sheet, startRow, 1, unit.getRemark());