1.新建销售Mapper文件和exceL解析类 2.新建销售exceL解析方法

src/main/java/com/example/backend/excel/ExcelUtils.java

@@ -124,6 +124,7 @@ public class ExcelUtils {
         return listener.getDataList();
     }
 
+
     /**
      * 读取其他条款sheet
      */
@@ -135,6 +136,63 @@ public class ExcelUtils {
         return listener.getDataList();
     }
 
+
+    /**
+     *读取合同产品明细sheet
+     */
+    public static List<SalesDtlExcelDTO> readSalesDtlSheet(MultipartFile file) throws IOException {
+        SimpleDataListener<SalesDtlExcelDTO> listener = new SimpleDataListener<SalesDtlExcelDTO>();
+        EasyExcel.read(file.getInputStream(), SalesDtlExcelDTO.class, listener)
+                .sheet(5) // 第六个sheet
+                .doRead();
+        return listener.getDataList();
+    }
+
+    /**
+     *读取收款计划sheet
+     */
+    public static List<SalesCollectExcelDTO> readSalesCollectSheet(MultipartFile file) throws IOException {
+        SimpleDataListener<SalesCollectExcelDTO> listener = new SimpleDataListener<SalesCollectExcelDTO>();
+        EasyExcel.read(file.getInputStream(), SalesCollectExcelDTO.class, listener)
+                .sheet(5) // 第六个sheet
+                .doRead();
+        return listener.getDataList();
+    }
+
+
+    /**
+     *读取责任中心sheet
+     */
+    public static List<RCenterDtlExcelDTO> readRCenterDtlSheet(MultipartFile file) throws IOException {
+        SimpleDataListener<RCenterDtlExcelDTO> listener = new SimpleDataListener<RCenterDtlExcelDTO>();
+        EasyExcel.read(file.getInputStream(), RCenterDtlExcelDTO.class, listener)
+                .sheet(5) // 第六个sheet
+                .doRead();
+        return listener.getDataList();
+    }
+
+    /**
+     *读取费用明细sheet
+     */
+    public static List<FeeDtlExcelDTO> readFeelDtlSheet(MultipartFile file) throws IOException {
+        SimpleDataListener<FeeDtlExcelDTO> listener = new SimpleDataListener<FeeDtlExcelDTO>();
+        EasyExcel.read(file.getInputStream(), FeeDtlExcelDTO.class, listener)
+                .sheet(5) // 第六个sheet
+                .doRead();
+        return listener.getDataList();
+    }
+
+    /**
+     *读取服务费率sheet
+     */
+    public static List<ExpSvcRateExcelDTO> readExpSvcRateSheet(MultipartFile file) throws IOException {
+        SimpleDataListener<ExpSvcRateExcelDTO> listener = new SimpleDataListener<ExpSvcRateExcelDTO>();
+        EasyExcel.read(file.getInputStream(), ExpSvcRateExcelDTO.class, listener)
+                .sheet(5) // 第六个sheet
+                .doRead();
+        return listener.getDataList();
+    }
+
     /**
      * 简单的数据监听器
      */

src/main/java/com/example/backend/excel/ExpSvcRateExcelDTO.java

@@ -0,0 +1,95 @@
+package com.example.backend.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 费用费率表
+ */
+@Data
+public class ExpSvcRateExcelDTO {
+
+    @ExcelProperty("主键ID")
+    private Long id;
+
+    @ExcelProperty("款项类型")
+    private String paymentType;
+
+    @ExcelProperty("开始天数")
+    private BigDecimal startDays;
+
+    @ExcelProperty("结束天数")
+    private BigDecimal endDays;
+
+    @ExcelProperty("年化费率")
+    private BigDecimal annualRate;
+
+    @ExcelProperty("起步天数")
+    private BigDecimal minDays;
+
+    @ExcelProperty("流程实例id")
+    private String processInstanceId;
+
+    @ExcelProperty("业务id")
+    private Long fmodalid;
+
+    @ExcelProperty("数据来源id")
+    private Long sourceid;
+
+    @ExcelProperty("数据来源表")
+    private String sourcetable;
+
+    @ExcelProperty("创建账号")
+    private String createBy;
+
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建人")
+    private String createByName;
+
+    @ExcelProperty("更新账号")
+    private String updateBy;
+
+    @ExcelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ExcelProperty("更新人")
+    private String updateByName;
+
+    @ExcelProperty("单据状态")
+    private String placed;
+
+    @ExcelProperty("图片")
+    private String imgIds;
+
+    @ExcelProperty("调取次数")
+    private Integer inc;
+
+    @ExcelProperty("关联id")
+    private Long rid;
+
+    @ExcelProperty("归档状态")
+    private String fsaved;
+
+    @ExcelProperty("模版名称")
+    private String sysTemplateName;
+
+    @ExcelProperty("是否删除")
+    private Integer delFlag;
+
+    @ExcelProperty("行号")
+    private Integer line;
+
+    @ExcelProperty("部门名称")
+    private String deptName;
+
+    @ExcelProperty("部门代码")
+    private String deptId;
+
+    @ExcelProperty("当前版本号")
+    private Integer curChangeVer;
+}

src/main/java/com/example/backend/excel/FeeDtlExcelDTO.java

@@ -0,0 +1,134 @@
+package com.example.backend.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 费用明细表
+ */
+@Data
+public class FeeDtlExcelDTO {
+
+    @ExcelProperty("主键ID")
+    private Long id;
+
+    @ExcelProperty("预估费用代码")
+    private String feeCd;
+
+    @ExcelProperty("预估费用名称")
+    private String feeNm;
+
+    @ExcelProperty("币种")
+    private String curcy;
+
+    @ExcelProperty("汇率")
+    private BigDecimal rate;
+
+    @ExcelProperty("费用金额（含税）")
+    private BigDecimal feeAmt;
+
+    @ExcelProperty("费用描述")
+    private String feeDesc;
+
+    @ExcelProperty("备注")
+    private String remark;
+
+    @ExcelProperty("费用单价")
+    private BigDecimal feePrice;
+
+    @ExcelProperty("计费方式")
+    private String chargeMode;
+
+    @ExcelProperty("行号")
+    private BigDecimal line;
+
+    @ExcelProperty("流程实例id")
+    private String processInstanceId;
+
+    @ExcelProperty("业务id")
+    private Long fmodalid;
+
+    @ExcelProperty("数据来源id")
+    private Long sourceid;
+
+    @ExcelProperty("数据来源表")
+    private String sourcetable;
+
+    @ExcelProperty("创建账号")
+    private String createBy;
+
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建人")
+    private String createByName;
+
+    @ExcelProperty("更新账号")
+    private String updateBy;
+
+    @ExcelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ExcelProperty("更新人")
+    private String updateByName;
+
+    @ExcelProperty("单据状态")
+    private String placed;
+
+    @ExcelProperty("图片")
+    private String imgIds;
+
+    @ExcelProperty("调取次数")
+    private Integer inc;
+
+    @ExcelProperty("关联id")
+    private Long rid;
+
+    @ExcelProperty("归档状态")
+    private String fsaved;
+
+    @ExcelProperty("模版名称")
+    private String sysTemplateName;
+
+    @ExcelProperty("是否删除")
+    private Integer delFlag;
+
+    @ExcelProperty("费用金额（不含税）")
+    private BigDecimal ntFeeAmt;
+
+    @ExcelProperty("费用承担方")
+    private String feePayer;
+
+    @ExcelProperty("费用单据号码")
+    private String fno;
+
+    @ExcelProperty("部门名称")
+    private String deptName;
+
+    @ExcelProperty("部门代码")
+    private String deptId;
+
+    @ExcelProperty("费用分摊类型")
+    private String allocationCategory;
+
+    @ExcelProperty("费用金额CNY")
+    private BigDecimal feeAmtCny;
+
+    @ExcelProperty("当前版本号")
+    private Integer curChangeVer;
+
+    @ExcelProperty("美元汇率")
+    private BigDecimal rateUsd;
+
+    @ExcelProperty("费用税率")
+    private BigDecimal taxRate;
+
+    @ExcelProperty("大类代码")
+    private String cateCode;
+
+    @ExcelProperty("大类名称")
+    private String cateName;
+}

src/main/java/com/example/backend/excel/RCenterDtlExcelDTO.java

@@ -0,0 +1,131 @@
+package com.example.backend.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 责任中心明细表
+ */
+@Data
+public class RCenterDtlExcelDTO {
+
+    @ExcelProperty("主键ID")
+    private Long id;
+
+    @ExcelProperty("行号")
+    private BigDecimal line;
+
+    @ExcelProperty("责任中心代码")
+    private String respCtrCode;
+
+    @ExcelProperty("责任中心名称")
+    private String respCtrName;
+
+    @ExcelProperty("考核占比")
+    private BigDecimal assessRatio;
+
+    @ExcelProperty("占比金额")
+    private BigDecimal assessAmt;
+
+    @ExcelProperty("流程实例id")
+    private String processInstanceId;
+
+    @ExcelProperty("单据号")
+    private String fno;
+
+    @ExcelProperty("单据日期")
+    private LocalDateTime fdate;
+
+    @ExcelProperty("单据状态")
+    private String placed;
+
+    @ExcelProperty("业务id")
+    private Long fmodalid;
+
+    @ExcelProperty("数据来源id")
+    private Long sourceid;
+
+    @ExcelProperty("数据来源表")
+    private String sourcetable;
+
+    @ExcelProperty("图片")
+    private String imgIds;
+
+    @ExcelProperty("调取次数")
+    private Integer inc;
+
+    @ExcelProperty("关联id")
+    private Long rid;
+
+    @ExcelProperty("归档状态")
+    private String fsaved;
+
+    @ExcelProperty("备注")
+    private String remark;
+
+    @ExcelProperty("模版名称")
+    private String sysTemplateName;
+
+    @ExcelProperty("是否删除")
+    private Integer delFlag;
+
+    @ExcelProperty("创建账号")
+    private String createBy;
+
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建人")
+    private String createByName;
+
+    @ExcelProperty("更新账号")
+    private String updateBy;
+
+    @ExcelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ExcelProperty("更新人")
+    private String updateByName;
+
+    @ExcelProperty("部门名称")
+    private String deptName;
+
+    @ExcelProperty("部门代码")
+    private String deptId;
+
+    @ExcelProperty("当前版本号")
+    private Integer curChangeVer;
+
+    @ExcelProperty("利润占比")
+    private BigDecimal assessQtyRate;
+
+    @ExcelProperty("人员代码")
+    private String personid;
+
+    @ExcelProperty("人员名称")
+    private String personname;
+
+    @ExcelProperty("人员部门代码")
+    private String personDeptId;
+
+    @ExcelProperty("人员部门名称")
+    private String personDeptNm;
+
+    @ExcelProperty("人员公司代码")
+    private String institutionId;
+
+    @ExcelProperty("人员公司名称")
+    private String institutionNm;
+
+    @ExcelProperty("保供合同一键三联id")
+    private Long oneClickSourceid;
+
+    @ExcelProperty("保供合同一键三联类型")
+    private String oneClickSourcetype;
+
+    @ExcelProperty("来源类型")
+    private String sourcetype;
+}

src/main/java/com/example/backend/excel/SalesCollectExcelDTO.java

@@ -0,0 +1,122 @@
+package com.example.backend.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 销售合同收款方式
+ */
+@Data
+public class SalesCollectExcelDTO {
+
+    @ExcelProperty("主键ID")
+    private Long id;
+
+    @ExcelProperty("计划发生日期")
+    private LocalDateTime planDt;
+
+    @ExcelProperty("款项类别")
+    private String paymentType;
+
+    @ExcelProperty("款项比例")
+    private BigDecimal paymentRatio;
+
+    @ExcelProperty("付款方式")
+    private String payMode;
+
+    @ExcelProperty("条款备注")
+    private String clauseRemark;
+
+    @ExcelProperty("流程实例id")
+    private String processInstanceId;
+
+    @ExcelProperty("单据号")
+    private String fno;
+
+    @ExcelProperty("单据日期")
+    private LocalDateTime fdate;
+
+    @ExcelProperty("单据状态")
+    private String placed;
+
+    @ExcelProperty("业务id")
+    private Long fmodalid;
+
+    @ExcelProperty("数据来源id")
+    private Long sourceid;
+
+    @ExcelProperty("数据来源表")
+    private String sourcetable;
+
+    @ExcelProperty("图片")
+    private String imgIds;
+
+    @ExcelProperty("调取次数")
+    private Integer inc;
+
+    @ExcelProperty("关联id")
+    private Long rid;
+
+    @ExcelProperty("归档状态")
+    private String fsaved;
+
+    @ExcelProperty("备注")
+    private String remark;
+
+    @ExcelProperty("模版名称")
+    private String sysTemplateName;
+
+    @ExcelProperty("是否删除")
+    private Integer delFlag;
+
+    @ExcelProperty("制单人部门代码")
+    private String deptId;
+
+    @ExcelProperty("制单人部门名称")
+    private String deptName;
+
+    @ExcelProperty("创建账号")
+    private String createBy;
+
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建人")
+    private String createByName;
+
+    @ExcelProperty("更新账号")
+    private String updateBy;
+
+    @ExcelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ExcelProperty("更新人")
+    private String updateByName;
+
+    @ExcelProperty("当前版本号")
+    private Integer curChangeVer;
+
+    @ExcelProperty("金额")
+    private BigDecimal paymentAmt;
+
+    @ExcelProperty("账期")
+    private Integer payDays;
+
+    @ExcelProperty("银行名称")
+    private String ourBankNm;
+
+    @ExcelProperty("银行账户")
+    private String ourBankAcct;
+
+    @ExcelProperty("来源类型")
+    private String sourcetype;
+
+    @ExcelProperty("保供合同一键三联id")
+    private Long oneClickSourceid;
+
+    @ExcelProperty("保供合同一键三联类型")
+    private String oneClickSourcetype;
+}

src/main/java/com/example/backend/excel/SalesContractExcelDTO.java

@@ -1,38 +1,644 @@
 package com.example.backend.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.format.DateTimeFormat;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 /**
- * 销售合同Excel导入DTO
+ * 销售合同主表
  */
 @Data
 public class SalesContractExcelDTO {
 
-    @ExcelProperty("合同编号")
-    private String contractCode;
+    @ExcelProperty("主键ID")
+    private Long id;
 
-    @ExcelProperty("客户名称")
-    private String customerName;
+    @ExcelProperty("单据号码")
+    private String fno;
+
+    @ExcelProperty("单据日期")
+    private LocalDateTime fdate;
+
+    @ExcelProperty("销售合同号")
+    private String sono;
+
+    @ExcelProperty("客户订单号")
+    private String ctOrderNo;
+
+    @ExcelProperty("业务类型")
+    private String bizType;
+
+    @ExcelProperty("业务账套")
+    private String acctSet;
+
+    @ExcelProperty("条款类型")
+    private String clauseType;
+
+    @ExcelProperty("签约日期")
+    private LocalDateTime signDate;
+
+    @ExcelProperty("代理协议号")
+    private String agentNo;
+
+    @ExcelProperty("佣金合同号")
+    private String commContrNo;
+
+    @ExcelProperty("合同起始有效期")
+    private LocalDateTime contrStart;
+
+    @ExcelProperty("合同截止有效期")
+    private LocalDateTime contrEnd;
+
+    @ExcelProperty("销售交货日期")
+    private LocalDateTime sDelivDt;
+
+    @ExcelProperty("合同描述")
+    private String contrDesc;
+
+    @ExcelProperty("我方代码")
+    private String fours;
+
+    @ExcelProperty("我方名称")
+    private String foursname;
+
+    @ExcelProperty("我方开户银行")
+    private String ourBankNm;
+
+    @ExcelProperty("我方银行账号")
+    private String ourBankAcct;
 
     @ExcelProperty("客户代码")
-    private String customerCode;
+    private String ctNo;
+
+    @ExcelProperty("客户名称")
+    private String ctName;
+
+    @ExcelProperty("客户开户银行")
+    private String ctBankName;
+
+    @ExcelProperty("客户银行账户")
+    private String ctBankAcct;
+
+    @ExcelProperty("客户联系人名称")
+    private String ctContNm;
+
+    @ExcelProperty("币别")
+    private String curcy;
+
+    @ExcelProperty("汇率")
+    private BigDecimal rate;
+
+    @ExcelProperty("原币总金额")
+    private BigDecimal totalAmt;
+
+    @ExcelProperty("人民币总金额")
+    private BigDecimal totalCnyAmt;
+
+    @ExcelProperty("美元总金额")
+    private BigDecimal totalUsdAmt;
+
+    @ExcelProperty("总数量")
+    private BigDecimal totalQty;
+
+    @ExcelProperty("放货仓库代码")
+    private String stockno;
+
+    @ExcelProperty("放货仓库名称")
+    private String stockname;
+
+    @ExcelProperty("预估毛利率")
+    private BigDecimal estGrossMR;
+
+    @ExcelProperty("预估毛利金额")
+    private BigDecimal estGrossMA;
+
+    @ExcelProperty("预估成本总金额")
+    private BigDecimal estTotCost;
+
+    @ExcelProperty("预估费用总金额")
+    private BigDecimal estTotFee;
+
+    @ExcelProperty("预估回款周期")
+    private BigDecimal estPayCycle;
+
+    @ExcelProperty("预估资金成本")
+    private BigDecimal estFundCost;
+
+    @ExcelProperty("价格条款")
+    private String terms;
+
+    @ExcelProperty("签约地点")
+    private String signLoc;
+
+    @ExcelProperty("交货地点")
+    private String delivLoc;
+
+    @ExcelProperty("装运港")
+    private String lPort;
+
+    @ExcelProperty("目的港")
+    private String dPort;
+
+    @ExcelProperty("贸易国别")
+    private String trdCtry;
+
+    @ExcelProperty("收款方式")
+    private String rcptMtd;
+
+    @ExcelProperty("运输方式")
+    private String tranWay;
+
+    @ExcelProperty("价格说明")
+    private String priceDesc;
+
+    @ExcelProperty("计价公式")
+    private String priceForm;
+
+    @ExcelProperty("数量溢装")
+    private BigDecimal qtyOver;
+
+    @ExcelProperty("数量短装")
+    private BigDecimal qtyShort;
+
+    @ExcelProperty("金额溢装")
+    private BigDecimal amtOver;
+
+    @ExcelProperty("金额短装")
+    private BigDecimal amtShort;
+
+    @ExcelProperty("预收款比例")
+    private BigDecimal prepayRatio;
+
+    @ExcelProperty("预收款金额")
+    private BigDecimal prepayAmt;
+
+    @ExcelProperty("产地")
+    private String origin;
+
+    @ExcelProperty("结算指标")
+    private String settIndex;
+
+    @ExcelProperty("客户履约保证金支付日期")
+    private LocalDateTime ctPerfPayDt;
+
+    @ExcelProperty("客户履约保证金比例")
+    private BigDecimal ctPerfRatio;
+
+    @ExcelProperty("合同完结付款日期")
+    private LocalDateTime contrFinalPayDt;
+
+    @ExcelProperty("合同违约金比例")
+    private BigDecimal contrPenaltyRatio;
+
+    @ExcelProperty("提货期限")
+    private BigDecimal pickDueDays;
+
+    @ExcelProperty("开票天数")
+    private BigDecimal invDays;
+
+    @ExcelProperty("责任中心")
+    private String respCtrName;
+
+    @ExcelProperty("考核占比")
+    private BigDecimal assessRatio;
+
+    @ExcelProperty("占比金额")
+    private BigDecimal assessAmt;
+
+    @ExcelProperty("代理费计费方式")
+    private String billingMode;
+
+    @ExcelProperty("代理费计费比例/单价")
+    private BigDecimal billingRate;
+
+    @ExcelProperty("代理费计费金额")
+    private BigDecimal billingAmount;
+
+    @ExcelProperty("是否租船")
+    private String whetherChartering;
+
+    @ExcelProperty("合同执行人代码")
+    private String contrExecCd;
+
+    @ExcelProperty("合同执行人名称")
+    private String contrExecNm;
+
+    @ExcelProperty("合同名称")
+    private String contractName;
+
+    @ExcelProperty("合同标的")
+    private String contractSubjectMatter;
+
+    @ExcelProperty("合同大类")
+    private String bpoTypeS;
+
+    @ExcelProperty("合同细类")
+    private String bpoTypeT;
+
+    @ExcelProperty("是否法务格式合同")
+    private String ifLegalCheckFormat;
+
+    @ExcelProperty("是否经过法审")
+    private String ifLegalCheck;
+
+    @ExcelProperty("是否多次结算")
+    private String ifPayMultiple;
+
+    @ExcelProperty("是否阳光采购")
+    private String ifSunPurchase;
+
+    @ExcelProperty("未阳光采购理由")
+    private String sunPurInfo;
+
+    @ExcelProperty("未阳光采购理由（自定义）")
+    private String sunPurInfoCus;
+
+    @ExcelProperty("是否招投标")
+    private String ifBidding;
+
+    @ExcelProperty("是否集团外贸")
+    private String ifForeignTrade;
+
+    @ExcelProperty("变更说明")
+    private String changeDesc;
+
+    @ExcelProperty("合同变更人")
+    private String changePeople;
+
+    @ExcelProperty("合同变更日期")
+    private LocalDateTime changeDate;
+
+    @ExcelProperty("变更协议号")
+    private String changeAgreementNo;
+
+    @ExcelProperty("变更前合同版本号")
+    private String beforeChangeVer;
+
+    @ExcelProperty("保证金比例")
+    private BigDecimal ctmarginRatio;
+
+    @ExcelProperty("保证金金额")
+    private BigDecimal ctmarginAmount;
+
+    @ExcelProperty("中文船名")
+    private String chnShipName;
+
+    @ExcelProperty("英文船名")
+    private String engShipName;
+
+    @ExcelProperty("流程实例id")
+    private String processInstanceId;
+
+    @ExcelProperty("单据状态")
+    private String placed;
+
+    @ExcelProperty("业务id")
+    private Long fmodalid;
+
+    @ExcelProperty("数据来源id")
+    private Long sourceid;
+
+    @ExcelProperty("数据来源表")
+    private String sourcetable;
+
+    @ExcelProperty("图片")
+    private String imgIds;
+
+    @ExcelProperty("调取次数")
+    private Integer inc;
+
+    @ExcelProperty("关联id")
+    private Long rid;
+
+    @ExcelProperty("归档状态")
+    private String fsaved;
+
+    @ExcelProperty("备注")
+    private String remark;
+
+    @ExcelProperty("模版名称")
+    private String sysTemplateName;
 
-    @ExcelProperty("合同金额")
-    private BigDecimal contractAmount;
+    @ExcelProperty("是否删除")
+    private Integer delFlag;
+
+    @ExcelProperty("制单人部门代码")
+    private String deptId;
+
+    @ExcelProperty("制单人部门名称")
+    private String deptName;
+
+    @ExcelProperty("创建账号")
+    private String createBy;
+
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建人")
+    private String createByName;
+
+    @ExcelProperty("更新账号")
+    private String updateBy;
+
+    @ExcelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ExcelProperty("更新人")
+    private String updateByName;
+
+    @ExcelProperty("贸易方式")
+    private String tradeway;
+
+    @ExcelProperty("美元汇率")
+    private BigDecimal rateUsd;
+
+    @ExcelProperty("付款方式")
+    private String payment;
+
+    @ExcelProperty("预估资金利息")
+    private BigDecimal estFundInt;
+
+    @ExcelProperty("计费单价")
+    private BigDecimal billPrice;
+
+    @ExcelProperty("计费方式")
+    private String billMode;
+
+    @ExcelProperty("计费比例")
+    private BigDecimal billRate;
+
+    @ExcelProperty("计费金额")
+    private BigDecimal billAmt;
+
+    @ExcelProperty("变更次数")
+    private Integer fchno;
+
+    @ExcelProperty("IMP同步PLMS接口状态")
+    private String impToPLMSStatus;
+
+    @ExcelProperty("IMP同步PLMS接口数据状态")
+    private String impToPLMSFlag;
+
+    @ExcelProperty("首款质量依据")
+    private String firstQmGt;
+
+    @ExcelProperty("尾款质量依据")
+    private String endQmGist;
+
+    @ExcelProperty("结算方式")
+    private String settlementMethod;
+
+    @ExcelProperty("品种大类")
+    private String materialClass;
 
     @ExcelProperty("签约日期")
-    @DateTimeFormat("yyyy-MM-dd")
-    private Date signingDate;
+    private LocalDateTime signDt;
+
+    @ExcelProperty("合同生效日期")
+    private LocalDateTime validDate;
+
+    @ExcelProperty("合同执行人机构代码")
+    private String contrExecCdInstitutionId;
+
+    @ExcelProperty("合同执行人机构名称")
+    private String contrExecCdInstitutionNm;
+
+    @ExcelProperty("合同执行人部门代码")
+    private String contrExecCdDeptId;
+
+    @ExcelProperty("合同执行人部门名称")
+    private String contrExecCdDeptNm;
+
+    @ExcelProperty("IMP同步PLMS接口来源系统代码")
+    private String sysid;
+
+    @ExcelProperty("IMP同步PLMS接口账套代码")
+    private String bookId;
+
+    @ExcelProperty("IMP同步PLMS接口PLMS组织ID")
+    private String orgId;
+
+    @ExcelProperty("赊销预付标识")
+    private String ifpayAdvanceSellCredit;
+
+    @ExcelProperty("业务类型")
+    private String serviceType;
+
+    @ExcelProperty("审批摘要")
+    private String reviewAbstract;
+
+    @ExcelProperty("是否清底")
+    private String ifClearBottom;
+
+    @ExcelProperty("关闭状态")
+    private String fclosed;
+
+    @ExcelProperty("当前版本号")
+    private Integer curChangeVer;
+
+    @ExcelProperty("变更标识")
+    private Integer curChangeFlag;
+
+    @ExcelProperty("变更原因")
+    private String curChangeReason;
+
+    @ExcelProperty("变更时间")
+    private LocalDateTime curChangeTime;
+
+    @ExcelProperty("变更人")
+    private String curChangeUser;
+
+    @ExcelProperty("合同产品类型")
+    private String bizProductType;
+
+    @ExcelProperty("PLMS合同大类")
+    private String contractType;
+
+    @ExcelProperty("是否赊销")
+    private String ifSellCredit;
+
+    @ExcelProperty("预付白名单")
+    private String ifpayAdvanceWhitelist;
+
+    @ExcelProperty("装卸条款")
+    private String loadUnloadTerms;
+
+    @ExcelProperty("赊销白名单")
+    private String ifSellCreditWhitelist;
+
+    @ExcelProperty("装运港编号")
+    private String lpno;
+
+    @ExcelProperty("目的港编号")
+    private String dpno;
+
+    @ExcelProperty("长协合同号")
+    private String longTermContract;
+
+    @ExcelProperty("是否长协")
+    private String ifLongTerm;
+
+    @ExcelProperty("是否确认")
+    private Integer isConfirm;
+
+    @ExcelProperty("交货方式")
+    private String delivMtd;
+
+    @ExcelProperty("保险种类")
+    private String insuranceType;
+
+    @ExcelProperty("保险金额")
+    private BigDecimal insuranceAmt;
+
+    @ExcelProperty("是否借壳")
+    private String ifShell;
+
+    @ExcelProperty("借壳单位")
+    private String shellCompany;
+
+    @ExcelProperty("是否分批")
+    private String ifBatch;
+
+    @ExcelProperty("是否转运")
+    private String ifTransfer;
+
+    @ExcelProperty("钢材产品判断字段")
+    private String ifgc;
+
+    @ExcelProperty("执行美元汇率")
+    private BigDecimal rateUs;
+
+    @ExcelProperty("最迟装运日期")
+    private LocalDateTime estLoadDt;
+
+    @ExcelProperty("最迟集港日期")
+    private LocalDateTime estArrDt;
+
+    @ExcelProperty("合同借壳评审人")
+    private String reviewer;
+
+    @ExcelProperty("来源类型")
+    private String sourceType;
+
+    @ExcelProperty("来源类型")
+    private String sourceno;
+
+    @ExcelProperty("平均单价")
+    private BigDecimal avePrice;
+
+    @ExcelProperty("提交审批日期")
+    private LocalDateTime submissionDate;
+
+    @ExcelProperty("审批生效日期")
+    private LocalDateTime appEffectiveDate;
+
+    @ExcelProperty("保供合同一键三联类型")
+    private String oneClickSourcetype;
+
+    @ExcelProperty("保供合同一键三联id")
+    private Long oneClickSourceid;
+
+    @ExcelProperty("海外公司名称")
+    private String overSeasName;
+
+    @ExcelProperty("海外公司代码")
+    private String overSeasNo;
+
+    @ExcelProperty("装运国")
+    private String lPortCtry;
+
+    @ExcelProperty("目的国")
+    private String dPortCtry;
+
+    @ExcelProperty("托管")
+    private String rptg;
+
+    @ExcelProperty("合同不含税总金额")
+    private BigDecimal totalNtAmt;
+
+    @ExcelProperty("项目计划书单号")
+    private String ppRefNo;
+
+    @ExcelProperty("是否过磅数量结算")
+    private String ifWeighedSalesQty;
+
+    @ExcelProperty("限价类别")
+    private String limitType;
+
+    @ExcelProperty("电子合同标识")
+    private String electronicsFlag;
+
+    @ExcelProperty("合同文本类别")
+    private String contractTextType;
 
     @ExcelProperty("合同状态")
     private String contractStatus;
 
-    @ExcelProperty("备注")
-    private String remark;
+    @ExcelProperty("合同大类")
+    private String contractType2;
+
+    @ExcelProperty("单价类别")
+    private String unitPriceType;
+
+    @ExcelProperty("增值税率")
+    private BigDecimal inTaxRate;
+
+    @ExcelProperty("是否含税标记")
+    private String iftax;
+
+    @ExcelProperty("PLMS合同id")
+    private String plmscontractId;
+
+    @ExcelProperty("PLMS合同编号")
+    private String plmscontractCode;
+
+    @ExcelProperty("是否指数合同")
+    private String contractIndexFlag;
+
+    @ExcelProperty("备用字段1")
+    private String extCol1;
+
+    @ExcelProperty("计量单位代码")
+    private String measureUnitCode;
+
+    @ExcelProperty("采购合同号")
+    private String pono;
+
+    @ExcelProperty("销售合同信用销售比例")
+    private BigDecimal prepayTrustRatio;
+
+    @ExcelProperty("销售合同信用销售金额")
+    private BigDecimal prepayTrustAmt;
+
+    @ExcelProperty("代理销售协议号")
+    private String agentNoSo;
+
+    @ExcelProperty("印花税金额")
+    private BigDecimal stampTaxAmt;
+
+    @ExcelProperty("合同取消状态")
+    private String fclosedType;
+
+    @ExcelProperty("产品名称")
+    private String mpsdesc;
+
+    @ExcelProperty("未结天数")
+    private Integer outstandingDay;
+
+    @ExcelProperty("未结金额")
+    private BigDecimal outstandingamt;
+
+    @ExcelProperty("我方英文名称")
+    private String foursnamee;
+
+    @ExcelProperty("客户英文名称")
+    private String ctnamee;
+
+    @ExcelProperty("未税平均单价")
+    private BigDecimal avgNtprice;
 
-}
+    @ExcelProperty("英文品名")
+    private String edesc;
+}

src/main/java/com/example/backend/excel/SalesDtlExcelDTO.java

@@ -0,0 +1,371 @@
+package com.example.backend.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 销售合同产品明细 销售批次表从表
+ */
+@Data
+public class SalesDtlExcelDTO {
+
+    @ExcelProperty("主键ID")
+    private Long id;
+
+    @ExcelProperty("行号")
+    private BigDecimal line;
+
+    @ExcelProperty("销售合同主键")
+    private Long rrid;
+
+    @ExcelProperty("商品编号")
+    private String itemno;
+
+    @ExcelProperty("中文品名")
+    private String sdesc;
+
+    @ExcelProperty("英文品名")
+    private String edesc;
+
+    @ExcelProperty("规格描述")
+    private String spec;
+
+    @ExcelProperty("水分")
+    private BigDecimal moisture;
+
+    @ExcelProperty("含铁量")
+    private BigDecimal ironCont;
+
+    @ExcelProperty("湿吨数量")
+    private BigDecimal wetTonQty;
+
+    @ExcelProperty("干吨数量")
+    private BigDecimal dryTonQty;
+
+    @ExcelProperty("计价方式")
+    private String priceMtd;
+
+    @ExcelProperty("数量")
+    private BigDecimal qty;
+
+    @ExcelProperty("含税单价")
+    private BigDecimal soPrice;
+
+    @ExcelProperty("不含税单价")
+    private BigDecimal ntSoPrice;
+
+    @ExcelProperty("单位")
+    private String ut;
+
+    @ExcelProperty("原币金额")
+    private BigDecimal soAmt;
+
+    @ExcelProperty("未税金额")
+    private BigDecimal ntSoAmt;
+
+    @ExcelProperty("税额")
+    private BigDecimal taxAmt;
+
+    @ExcelProperty("本币金额")
+    private BigDecimal localAmt;
+
+    @ExcelProperty("美元金额")
+    private BigDecimal usdAmt;
+
+    @ExcelProperty("海关编码")
+    private String hsCode;
+
+    @ExcelProperty("海关中文名称")
+    private String hsNameCn;
+
+    @ExcelProperty("海关英文名称")
+    private String hsNameEn;
+
+    @ExcelProperty("关税税率%")
+    private BigDecimal dutyRate;
+
+    @ExcelProperty("进项税率%")
+    private BigDecimal inTaxRate;
+
+    @ExcelProperty("退税率%")
+    private BigDecimal reTaxRate;
+
+    @ExcelProperty("销项税率%")
+    private BigDecimal outTaxRate;
+
+    @ExcelProperty("备注")
+    private String remark;
+
+    @ExcelProperty("流程实例id")
+    private String processInstanceId;
+
+    @ExcelProperty("单据号")
+    private String fno;
+
+    @ExcelProperty("单据日期")
+    private LocalDateTime fdate;
+
+    @ExcelProperty("单据状态")
+    private String placed;
+
+    @ExcelProperty("业务id")
+    private Long fmodalid;
+
+    @ExcelProperty("数据来源id")
+    private Long sourceid;
+
+    @ExcelProperty("数据来源表")
+    private String sourcetable;
+
+    @ExcelProperty("图片")
+    private String imgIds;
+
+    @ExcelProperty("调取次数")
+    private Integer inc;
+
+    @ExcelProperty("关联id")
+    private Long rid;
+
+    @ExcelProperty("归档状态")
+    private String fsaved;
+
+    @ExcelProperty("模版名称")
+    private String sysTemplateName;
+
+    @ExcelProperty("是否删除")
+    private Integer delFlag;
+
+    @ExcelProperty("制单人部门代码")
+    private String deptId;
+
+    @ExcelProperty("制单人部门名称")
+    private String deptName;
+
+    @ExcelProperty("创建账号")
+    private String createBy;
+
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建人")
+    private String createByName;
+
+    @ExcelProperty("更新账号")
+    private String updateBy;
+
+    @ExcelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ExcelProperty("更新人")
+    private String updateByName;
+
+    @ExcelProperty("合同批次号")
+    private String batchNo;
+
+    @ExcelProperty("销售合同号")
+    private String sono;
+
+    @ExcelProperty("供应商代码")
+    private String supCode;
+
+    @ExcelProperty("供应商名称")
+    private String supName;
+
+    @ExcelProperty("未税金额")
+    private BigDecimal ntPoAmt;
+
+    @ExcelProperty("未税单价")
+    private BigDecimal ntPoPrice;
+
+    @ExcelProperty("采购单价")
+    private BigDecimal poprice;
+
+    @ExcelProperty("采购金额")
+    private BigDecimal poamt;
+
+    @ExcelProperty("资源号")
+    private String resourceNo;
+
+    @ExcelProperty("采购合同号")
+    private String pono;
+
+    @ExcelProperty("客户订单号")
+    private String ctOrderNo;
+
+    @ExcelProperty("客户代码")
+    private String ctNo;
+
+    @ExcelProperty("客户名称")
+    private String ctName;
+
+    @ExcelProperty("币种采购")
+    private String curcyPo;
+
+    @ExcelProperty("汇率采购")
+    private BigDecimal ratePo;
+
+    @ExcelProperty("业务账套")
+    private String acctSet;
+
+    @ExcelProperty("人民币含税金额")
+    private BigDecimal cnypoam;
+
+    @ExcelProperty("美元含税金额")
+    private BigDecimal usdpoamt;
+
+    @ExcelProperty("销售币种")
+    private String curcySo;
+
+    @ExcelProperty("销售汇率")
+    private BigDecimal rateSo;
+
+    @ExcelProperty("销售美元汇率")
+    private String rateUsdSo;
+
+    @ExcelProperty("人民币含税金额")
+    private BigDecimal cnysoamt;
+
+    @ExcelProperty("美元含税金额")
+    private BigDecimal usdsoamt;
+
+    @ExcelProperty("采购产品ID")
+    private Long poid;
+
+    @ExcelProperty("销售产品ID")
+    private Long soid;
+
+    @ExcelProperty("商品大类")
+    private String typeName;
+
+    @ExcelProperty("销售产品分摊费用合计CNY")
+    private BigDecimal soShareFeeCny;
+
+    @ExcelProperty("销售产品单位分摊费用CNY")
+    private BigDecimal soUnitFeeCny;
+
+    @ExcelProperty("采购产品分摊费用合计CNY")
+    private BigDecimal poShareFeeCny;
+
+    @ExcelProperty("采购产品单位分摊费用CNY")
+    private BigDecimal poUnitFeeCny;
+
+    @ExcelProperty("当前版本号")
+    private Integer curChangeVer;
+
+    @ExcelProperty("来源单号")
+    private String sourceno;
+
+    @ExcelProperty("装运港")
+    private String lPort;
+
+    @ExcelProperty("目的港")
+    private String dPort;
+
+    @ExcelProperty("中文规格描述")
+    private String specCn;
+
+    @ExcelProperty("牌号")
+    private String brand;
+
+    @ExcelProperty("厚")
+    private BigDecimal fnum1;
+
+    @ExcelProperty("宽")
+    private BigDecimal fnum2;
+
+    @ExcelProperty("长")
+    private BigDecimal fnum3;
+
+    @ExcelProperty("件数")
+    private BigDecimal qua;
+
+    @ExcelProperty("单重")
+    private BigDecimal snw;
+
+    @ExcelProperty("卷重范围")
+    private String ftype1;
+
+    @ExcelProperty("米重")
+    private BigDecimal fnum4;
+
+    @ExcelProperty("直径")
+    private BigDecimal fnum5;
+
+    @ExcelProperty("捆单重")
+    private BigDecimal fnum6;
+
+    @ExcelProperty("捆支数")
+    private BigDecimal fnum7;
+
+    @ExcelProperty("H型钢规格")
+    private String ftype2;
+
+    @ExcelProperty("规格")
+    private String ftype3;
+
+    @ExcelProperty("计重方式")
+    private String ftype4;
+
+    @ExcelProperty("色标")
+    private String ftype5;
+
+    @ExcelProperty("数值预留字段1")
+    private BigDecimal fnum8;
+
+    @ExcelProperty("数值预留字段2")
+    private BigDecimal fnum9;
+
+    @ExcelProperty("文本预留字段1")
+    private String ftype6;
+
+    @ExcelProperty("文本预留字段2")
+    private String ftype7;
+
+    @ExcelProperty("煤焦标准水分")
+    private BigDecimal coalMoisture;
+
+    @ExcelProperty("钢厂资源号")
+    private String smrNo;
+
+    @ExcelProperty("毛重")
+    private BigDecimal fgw;
+
+    @ExcelProperty("净重")
+    private BigDecimal fnw;
+
+    @ExcelProperty("钢材产品判断字段")
+    private String ifgc;
+
+    @ExcelProperty("装运港")
+    private String sourcetype;
+
+    @ExcelProperty("装运港代码")
+    private String lpno;
+
+    @ExcelProperty("目的港代码")
+    private String dpno;
+
+    @ExcelProperty("保供合同一键三联ID")
+    private Long oneClickSourceid;
+
+    @ExcelProperty("保供合同一键三联类型")
+    private String oneClickSourcetype;
+
+    @ExcelProperty("采购计价方式")
+    private String priceMtdPo;
+
+    @ExcelProperty("出口关税税率%")
+    private BigDecimal eDutyRate;
+
+    @ExcelProperty("计价数量")
+    private BigDecimal priceQty;
+
+    @ExcelProperty("数量占比")
+    private BigDecimal qtyRate;
+
+    @ExcelProperty("金额占比")
+    private BigDecimal amtRate;
+}

src/main/java/com/example/backend/mapper/contract/ContractErrorLogMapper.java

@@ -0,0 +1,14 @@
+package com.example.backend.mapper.contract;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.backend.entity.contract.ContractErrorLogEntity;
+import com.example.backend.entity.contract.ExpSvcRateEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 销售合同主表Mapper
+ */
+@Mapper
+public interface ContractErrorLogMapper extends BaseMapper<ContractErrorLogEntity> {
+
+}

src/main/java/com/example/backend/mapper/contract/ExpSvcRateMapper.java

@@ -0,0 +1,14 @@
+package com.example.backend.mapper.contract;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.backend.entity.contract.ExpSvcRateEntity;
+import com.example.backend.entity.contract.FeeDtlEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 销售合同主表Mapper
+ */
+@Mapper
+public interface ExpSvcRateMapper extends BaseMapper<ExpSvcRateEntity> {
+
+}

src/main/java/com/example/backend/mapper/contract/FeeDtlMapper.java

@@ -0,0 +1,14 @@
+package com.example.backend.mapper.contract;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.backend.entity.contract.FeeDtlEntity;
+import com.example.backend.entity.contract.SalesDtlEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 销售合同主表Mapper
+ */
+@Mapper
+public interface FeeDtlMapper extends BaseMapper<FeeDtlEntity> {
+
+}

src/main/java/com/example/backend/mapper/contract/RCenterDtlMapper.java

@@ -0,0 +1,14 @@
+package com.example.backend.mapper.contract;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.backend.entity.contract.RCenterDtlEntity;
+import com.example.backend.entity.contract.SalesDtlEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 销售合同主表Mapper
+ */
+@Mapper
+public interface RCenterDtlMapper extends BaseMapper<RCenterDtlEntity> {
+
+}

src/main/java/com/example/backend/mapper/contract/SalesCollectMethodMapper.java

@@ -0,0 +1,14 @@
+package com.example.backend.mapper.contract;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.backend.entity.contract.SalesCollectMethodEntity;
+import com.example.backend.entity.contract.SalesDtlEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 销售合同主表Mapper
+ */
+@Mapper
+public interface SalesCollectMethodMapper extends BaseMapper<SalesCollectMethodEntity> {
+
+}

src/main/java/com/example/backend/mapper/contract/SalesDtlMapper.java

@@ -0,0 +1,14 @@
+package com.example.backend.mapper.contract;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.backend.entity.contract.SalesContractEntity;
+import com.example.backend.entity.contract.SalesDtlEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 销售合同主表Mapper
+ */
+@Mapper
+public interface SalesDtlMapper extends BaseMapper<SalesDtlEntity> {
+
+}

src/main/java/com/example/backend/service/contract/SalesContractService.java

@@ -27,11 +27,11 @@ public interface SalesContractService {
      * @param terms 其他条款
      * @return 保存结果
      */
-    boolean saveContractWithDetails(SalesContractEntity contract,
-                                    List<?> products,
-                                    List<?> deliveries,
-                                    List<?> payments,
-                                    List<?> qualities,
-                                    List<?> terms);
+//    boolean saveContractWithDetails(SalesContractEntity contract,
+//                                    List<?> products,
+//                                    List<?> deliveries,
+//                                    List<?> payments,
+//                                    List<?> qualities,
+//                                    List<?> terms);
 
 }

src/main/java/com/example/backend/service/contract/impl/SalesContractServiceImpl.java

@@ -12,183 +12,152 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
-/**
- * 销售合同服务实现类
- */
 @Service
 public class SalesContractServiceImpl implements SalesContractService {
 
     @Autowired
     private SalesContractMapper salesContractMapper;
-
     @Autowired
-    private ContractProductMapper contractProductMapper;
-
+    private SalesDtlMapper salesDtlMapper;
     @Autowired
-    private ContractDeliveryMapper contractDeliveryMapper;
-
+    private SalesCollectMethodMapper salesCollectMethodMapper;
     @Autowired
-    private ContractPaymentMapper contractPaymentMapper;
-
+    private RCenterDtlMapper rCenterDtlMapper;
     @Autowired
-    private ContractQualityMapper contractQualityMapper;
-
+    private FeeDtlMapper feeDtlMapper;
+    @Autowired
+    private ExpSvcRateMapper expSvcRateMapper;
     @Autowired
-    private ContractTermMapper contractTermMapper;
+    private ContractErrorLogMapper contractErrorLogMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean importExcel(MultipartFile file) {
-        try {
-            // 读取每个sheet页的第三行数据
-            Map<String, Object> thirdRowData = ExcelUtils.readExcelThirdRow(file);
-            
-            // 读取主表数据（第一个sheet）
-            List<SalesContractExcelDTO> mainDataList = ExcelUtils.readMainSheet(file);
-            if (mainDataList.isEmpty()) {
-                return false;
-            }
-            
-            // 获取第三行数据（索引为2）
-            SalesContractExcelDTO mainData = mainDataList.size() >= 3 ? mainDataList.get(2) : mainDataList.get(0);
-            
-            // 转换为主表实体
-            SalesContractEntity contract = new SalesContractEntity();
-            BeanUtils.copyProperties(mainData, contract);
-            
-            // 读取产品明细（第二个sheet）
-            List<ContractProductExcelDTO> productDTOList = ExcelUtils.readProductSheet(file);
-            List<ContractProduct> products = new ArrayList<>();
-            if (!productDTOList.isEmpty()) {
-                ContractProductExcelDTO productDTO = productDTOList.size() >= 3 ? productDTOList.get(2) : productDTOList.get(0);
-                ContractProduct product = new ContractProduct();
-                BeanUtils.copyProperties(productDTO, product);
-                products.add(product);
-            }
-            
-            // 读取交货明细（第三个sheet）
-            List<ContractDeliveryExcelDTO> deliveryDTOList = ExcelUtils.readDeliverySheet(file);
-            List<ContractDelivery> deliveries = new ArrayList<>();
-            if (!deliveryDTOList.isEmpty()) {
-                ContractDeliveryExcelDTO deliveryDTO = deliveryDTOList.size() >= 3 ? deliveryDTOList.get(2) : deliveryDTOList.get(0);
-                ContractDelivery delivery = new ContractDelivery();
-                BeanUtils.copyProperties(deliveryDTO, delivery);
-                deliveries.add(delivery);
-            }
-            
-            // 读取付款明细（第四个sheet）
-            List<ContractPaymentExcelDTO> paymentDTOList = ExcelUtils.readPaymentSheet(file);
-            List<ContractPayment> payments = new ArrayList<>();
-            if (!paymentDTOList.isEmpty()) {
-                ContractPaymentExcelDTO paymentDTO = paymentDTOList.size() >= 3 ? paymentDTOList.get(2) : paymentDTOList.get(0);
-                ContractPayment payment = new ContractPayment();
-                BeanUtils.copyProperties(paymentDTO, payment);
-                payments.add(payment);
-            }
-            
-            // 读取质量保证明细（第五个sheet）
-            List<ContractQualityExcelDTO> qualityDTOList = ExcelUtils.readQualitySheet(file);
-            List<ContractQuality> qualities = new ArrayList<>();
-            if (!qualityDTOList.isEmpty()) {
-                ContractQualityExcelDTO qualityDTO = qualityDTOList.size() >= 3 ? qualityDTOList.get(2) : qualityDTOList.get(0);
-                ContractQuality quality = new ContractQuality();
-                BeanUtils.copyProperties(qualityDTO, quality);
-                qualities.add(quality);
-            }
-            
-            // 读取其他条款（第六个sheet）
-            List<ContractTermExcelDTO> termDTOList = ExcelUtils.readTermSheet(file);
-            List<ContractTerm> terms = new ArrayList<>();
-            if (!termDTOList.isEmpty()) {
-                ContractTermExcelDTO termDTO = termDTOList.size() >= 3 ? termDTOList.get(2) : termDTOList.get(0);
-                ContractTerm term = new ContractTerm();
-                BeanUtils.copyProperties(termDTO, term);
-                terms.add(term);
-            }
-            
-            // 调用保存方法
-            return saveContractWithDetails(contract, products, deliveries, payments, qualities, terms);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean saveContractWithDetails(SalesContractEntity contract,
-                                           List<?> products,
-                                           List<?> deliveries,
-                                           List<?> payments,
-                                           List<?> qualities,
-                                           List<?> terms) {
+        List<String> errors = new ArrayList<>();  // 用来记录所有错误
+
+        Long contractId = null;
+
         try {
-            // 保存主表
-            salesContractMapper.insert(contract);
-            Long contractId = contract.getContractId();
-
-            // 保存产品明细
-            if (products != null) {
-                for (Object obj : products) {
-                    if (obj instanceof ContractProduct) {
-                        ContractProduct product = (ContractProduct) obj;
-                        product.setContractId(contractId);
-                        contractProductMapper.insert(product);
+            // ================= 1️⃣ 主表 =================
+            try {
+                List<SalesContractExcelDTO> mainDataList = ExcelUtils.readMainSheet(file);
+                if (mainDataList.isEmpty()) {
+                    errors.add("主表(Sheet1) 数据为空");
+                } else {
+                    SalesContractExcelDTO dto = mainDataList.size() >= 3 ? mainDataList.get(2) : mainDataList.get(0);
+                    SalesContractEntity entity = new SalesContractEntity();
+                    BeanUtils.copyProperties(dto, entity);
+
+                    salesContractMapper.insert(entity);
+                    contractId = entity.getId();
+                    if (contractId == null) {
+                        errors.add("主表ID生成失败（contractId 为 null）");
                     }
                 }
+            } catch (Exception e) {
+                errors.add("主表(Sheet1) 导入失败：" + e.getMessage());
             }
 
-            // 保存交货明细
-            if (deliveries != null) {
-                for (Object obj : deliveries) {
-                    if (obj instanceof ContractDelivery) {
-                        ContractDelivery delivery = (ContractDelivery) obj;
-                        delivery.setContractId(contractId);
-                        contractDeliveryMapper.insert(delivery);
-                    }
+
+            // 如果主表ID 都没生成，后面也插不了，但不能中断，要继续执行
+            final Long cid = contractId;
+
+
+            // ================= 2️⃣ 产品明细 =================
+            try {
+                List<SalesDtlExcelDTO> list = ExcelUtils.readSalesDtlSheet(file);
+                if (!list.isEmpty() && cid != null) {
+                    SalesDtlExcelDTO dto = list.size() >= 3 ? list.get(2) : list.get(0);
+                    SalesDtlEntity entity = new SalesDtlEntity();
+                    BeanUtils.copyProperties(dto, entity);
+
+                    salesDtlMapper.insert(entity);
                 }
+            } catch (Exception e) {
+                errors.add("产品明细(Sheet2) 导入失败：" + e.getMessage());
             }
 
-            // 保存付款明细
-            if (payments != null) {
-                for (Object obj : payments) {
-                    if (obj instanceof ContractPayment) {
-                        ContractPayment payment = (ContractPayment) obj;
-                        payment.setContractId(contractId);
-                        contractPaymentMapper.insert(payment);
-                    }
+
+            // ================= 3️⃣ 收款计划 =================
+            try {
+                List<SalesCollectExcelDTO> list = ExcelUtils.readSalesCollectSheet(file);
+                if (!list.isEmpty() && cid != null) {
+                    SalesCollectExcelDTO dto = list.size() >= 3 ? list.get(2) : list.get(0);
+                    SalesCollectMethodEntity entity = new SalesCollectMethodEntity();
+                    BeanUtils.copyProperties(dto, entity);
+//                    entity.setContractId(cid);
+                    salesCollectMethodMapper.insert(entity);
                 }
+            } catch (Exception e) {
+                errors.add("收款计划(Sheet3) 导入失败：" + e.getMessage());
             }
 
-            // 保存质量保证明细
-            if (qualities != null) {
-                for (Object obj : qualities) {
-                    if (obj instanceof ContractQuality) {
-                        ContractQuality quality = (ContractQuality) obj;
-                        quality.setContractId(contractId);
-                        contractQualityMapper.insert(quality);
-                    }
+
+            // ================= 4️⃣ 责任中心 =================
+            try {
+                List<RCenterDtlExcelDTO> list = ExcelUtils.readRCenterDtlSheet(file);
+                if (!list.isEmpty() && cid != null) {
+                    RCenterDtlExcelDTO dto = list.size() >= 3 ? list.get(2) : list.get(0);
+                    RCenterDtlEntity entity = new RCenterDtlEntity();
+                    BeanUtils.copyProperties(dto, entity);
+//                    entity.setContractId(cid);
+                    rCenterDtlMapper.insert(entity);
                 }
+            } catch (Exception e) {
+                errors.add("责任中心(Sheet4) 导入失败：" + e.getMessage());
             }
 
-            // 保存其他条款
-            if (terms != null) {
-                for (Object obj : terms) {
-                    if (obj instanceof ContractTerm) {
-                        ContractTerm term = (ContractTerm) obj;
-                        term.setContractId(contractId);
-                        contractTermMapper.insert(term);
-                    }
+
+            // ================= 5️⃣ 费用明细 =================
+            try {
+                List<FeeDtlExcelDTO> list = ExcelUtils.readFeelDtlSheet(file);
+                if (!list.isEmpty() && cid != null) {
+                    FeeDtlExcelDTO dto = list.size() >= 3 ? list.get(2) : list.get(0);
+                    FeeDtlEntity entity = new FeeDtlEntity();
+                    BeanUtils.copyProperties(dto, entity);
+//                    entity.setContractId(cid);
+                    feeDtlMapper.insert(entity);
                 }
+            } catch (Exception e) {
+                errors.add("费用明细(Sheet5) 导入失败：" + e.getMessage());
             }
 
-            return true;
+
+            // ================= 6️⃣ 服务费率 =================
+            try {
+                List<ExpSvcRateExcelDTO> list = ExcelUtils.readExpSvcRateSheet(file);
+                if (!list.isEmpty() && cid != null) {
+                    ExpSvcRateExcelDTO dto = list.size() >= 3 ? list.get(2) : list.get(0);
+                    ExpSvcRateEntity entity = new ExpSvcRateEntity();
+                    BeanUtils.copyProperties(dto, entity);
+//                    entity.setContractId(cid);
+                    expSvcRateMapper.insert(entity);
+                }
+            } catch (Exception e) {
+                errors.add("服务费率(Sheet6) 导入失败：" + e.getMessage());
+            }
+
+
         } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException("保存合同失败", e);
+            // 兜底异常
+            errors.add("系统异常：" + e.getMessage());
         }
-    }
 
+
+        // ========== ❗ 最终检查所有错误，如果有 → 回滚事务并返回统一信息 ==========
+        if (!errors.isEmpty()) {
+
+            // 保存到错误日志表
+            ContractErrorLogEntity log = new ContractErrorLogEntity();
+            log.setErrorLog(String.join("\n", errors));
+            contractErrorLogMapper.insert(log);
+
+            // ❗抛异常，触发事务回滚
+            throw new RuntimeException("Excel 导入出现以下错误：\n" + String.join("\n", errors));
+        }
+
+        return true;
+    }
 }