Merge branch 'v6.4_transportation_20231110' into test

performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/owner/OwnerBreakContractSettlementOwnerController.java

@@ -62,8 +62,6 @@ public class OwnerBreakContractSettlementOwnerController {
         param.setOwnerUserNo(loginUserInfo.getUserNo());
         SXSSFWorkbook workbook = breakContractSettlementOwnerService.exportCarrierBreakContractSettlementOwnerList(param);
         response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
-        String fileName = URLEncoder.encode("货主违约结算单", "UTF-8");
-        response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + fileName + "\"");
         workbook.write(response.getOutputStream());
         return null;
     }

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java

@@ -283,17 +283,17 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         fieldList.add(new ExcelField(1, "结算单号", "settlementNo", 5000));
         fieldList.add(new ExcelField(2, "开票标识", "invoiceType", 5000));
         fieldList.add(new ExcelField(3, "货主编码", "ownerUserNo", 5000));
-        fieldList.add(new ExcelField(3, "结算方式", "settlementWay", 5000));
-        fieldList.add(new ExcelField(4, "订单编号", "orderNo", 15000));
-        fieldList.add(new ExcelField(5, "实际净重", "weight", 5000));
-        fieldList.add(new ExcelField(6, "实际运费金额", "freight", 5000));
-        fieldList.add(new ExcelField(7, "预付运费金额", "prepayFreight", 5000));
-        fieldList.add(new ExcelField(8, "货损吨数", "lossWeight", 5000));
-        fieldList.add(new ExcelField(9, "货损金额", "lossFreight", 5000));
-        fieldList.add(new ExcelField(10, "结算金额", "settlementFreight", 5000));
-        fieldList.add(new ExcelField(11, "开票金额", "invoiceFreight", 5000));
-        fieldList.add(new ExcelField(12, "创建时间", "createTime", 5000));
-        fieldList.add(new ExcelField(13, "状态", "status", 5000));
+        fieldList.add(new ExcelField(4, "结算方式", "settlementWay", 5000));
+        fieldList.add(new ExcelField(5, "订单编号", "orderNo", 15000));
+        fieldList.add(new ExcelField(6, "实际净重", "weight", 5000));
+        fieldList.add(new ExcelField(7, "实际运费金额", "freight", 5000));
+        fieldList.add(new ExcelField(8, "预付运费金额", "prepayFreight", 5000));
+        fieldList.add(new ExcelField(9, "货损吨数", "lossWeight", 5000));
+        fieldList.add(new ExcelField(10, "货损金额", "lossFreight", 5000));
+        fieldList.add(new ExcelField(11, "结算金额", "settlementFreight", 5000));
+        fieldList.add(new ExcelField(12, "开票金额", "invoiceFreight", 5000));
+        fieldList.add(new ExcelField(13, "创建时间", "createTime", 5000));
+        fieldList.add(new ExcelField(14, "状态", "status", 5000));
 
         // 组装数据
         List<List<ExcelData>> dataList = new ArrayList<>();