完成销售合同导入模版2为模版的销售合同导入代码和销售合同导入测试

src/main/java/com/example/backend/entity/common/SysUser.java

@@ -266,9 +266,9 @@ public class SysUser {
     @TableField(exist = false)
     private BigDecimal rate;
 
-    //折美元汇率
+    //执行美元汇率
     @TableField(exist = false)
-    private BigDecimal rateUsd;
+    private BigDecimal rateUs;
 
     //制单人部门编码
     @TableField(exist = false)

src/main/java/com/example/backend/entity/contract/ExpSvcRateEntity.java

@@ -35,7 +35,7 @@ public class ExpSvcRateEntity {
 
     // 起步天数
     @TableField("minDays")
-    private BigDecimal minDays;
+    private Integer minDays;
 
     // 流程实例id
     @TableField("process_instance_id")

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

@@ -27,5 +27,5 @@ public class ExpSvcRateExcelDTO {
     private BigDecimal annualRate;
 
     @ExcelProperty("起步天数")
-    private BigDecimal minDays;
+    private Integer minDays;
 }

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

@@ -11,24 +11,28 @@ import java.math.BigDecimal;
 @Data
 public class RCenterDtlExcelDTO {
 
-    @ExcelProperty("销售合同号")
+    @ExcelProperty("合同号")
     private String fno;
 
-    @ExcelProperty("公司代码")
-    private String institutionId;
-
-    @ExcelProperty("公司名称")
-    private String institutionNm;
-
     @ExcelProperty("利润考核占比%")
     private BigDecimal assessQtyRate;
 
     @ExcelProperty("金额考核占比%")
     private BigDecimal assessRatio;
 
-    @ExcelProperty("制单人代码")
+    @ExcelProperty("责任人员代码")
     private String createBy;
 
+//    @ExcelProperty("公司代码")
+//    private String institutionId;
+//
+//    @ExcelProperty("公司名称")
+//    private String institutionNm;
+
+
+
+
+
     @ExcelProperty(index =7)
     private String personDeptNm;
     @ExcelProperty(index =8)

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

@@ -13,10 +13,14 @@ import java.time.LocalDateTime;
 public class SalesCollectExcelDTO {
 
 
-    @ExcelProperty("销售合同号")
+    @ExcelProperty("合同号")
     private String fno;
 
-    @ExcelProperty("账期")
+
+    @ExcelProperty("金额")
+    private String paymentAmt;
+
+    @ExcelProperty("账期(天)")
     private Integer payDays;
 
     @ExcelProperty("收款方式")
@@ -29,15 +33,15 @@ public class SalesCollectExcelDTO {
     @ExcelProperty("款项类别")
     private String paymentType;
 
-    @ExcelProperty("收款收证银行名称")
-    private String ourBankNm;
-
-    @ExcelProperty("收款收证银行账户")
-    private String ourBankAcct;
-
-
-    @ExcelProperty("备注")
-    private String remark;
+//    @ExcelProperty("收款收证银行名称")
+//    private String ourBankNm;
+//
+//    @ExcelProperty("收款收证银行账户")
+//    private String ourBankAcct;
+//
+//
+//    @ExcelProperty("备注")
+//    private String remark;
 
 
 

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

@@ -17,8 +17,8 @@ public class SalesContractExcelDTO {
     @ExcelProperty("制单人代码")
     private String createBy;
 
-    @ExcelProperty("制单人名称")
-    private String createByName;
+    @ExcelProperty("合同执行人代码")
+    private String contrExecCd;
 
     @ExcelProperty("业务类型")
     private String serviceType;
@@ -29,138 +29,153 @@ public class SalesContractExcelDTO {
     @ExcelProperty("合同产品类型")
     private String bizProductType;
 
-    @ExcelProperty("合同执行人代码")
-    private String contrExecCd;
-
-    @ExcelProperty("合同执行人名称")
-    private String contrExecNm;
-
-    @ExcelProperty("客户名称")
-    private String ctName;
-
-    @ExcelProperty("客户联系人名称")
-    private String ctContNm;
-
-    @ExcelProperty("客户开户银行")
-    private String ctBankName;
-
-    @ExcelProperty("客户银行账户")
-    private String ctBankAcct;
-
-    @ExcelProperty("客户合同号")
-    private String ctOrderNo;
-
-    @ExcelProperty("币别")
-    private String curcy;
-
-    @ExcelProperty("最迟集港日期")
-    private Date estArrDt;
-
-    @ExcelProperty("最迟装运日期")
-    private Date estLoadDt;
-
-    @ExcelProperty("预计客商占款天数")
-    private Integer outstandingDay;
 
     @ExcelProperty("我方名称")
     private String foursname;
 
-    @ExcelProperty("我方银行账号")
-    private String ourBankAcct;
-
-    @ExcelProperty("我方开户银行")
-    private String ourBankNm;
-
-    @ExcelProperty("是否清底")
-    private String ifClearBottom;
-
-    @ExcelProperty("是否长协")
-    private String ifLongTerm;
-
-    @ExcelProperty("长协合同号")
-    private String longTermContract;
+    @ExcelProperty("客户名称")
+    private String ctName;
 
-    @ExcelProperty("装运港")
-    private String lPort;
+    @ExcelProperty("金额溢装")
+    private BigDecimal amtOver;
 
-    @ExcelProperty("目的港")
-    private String dPort;
+    @ExcelProperty("金额短装")
+    private BigDecimal amtShort;
 
     @ExcelProperty("数量溢装%")
     private BigDecimal qtyOver;
 
     @ExcelProperty("数量短装%")
     private BigDecimal qtyShort;
+    @ExcelProperty("币别")
+    private String curcy;
 
-    @ExcelProperty("金额溢装%")
-    private BigDecimal amtOver;
-
-    @ExcelProperty("金额短装%")
-    private BigDecimal amtShort;
-
-    @ExcelProperty("保险种类")
-    private String insuranceType;
-
-    @ExcelProperty("保险费率%")
-    private BigDecimal insuranceAmt;
-
-    @ExcelProperty("签约地点")
-    private String signLoc;
+    @ExcelProperty("最迟装运日期")
+    private Date estLoadDt;
 
     @ExcelProperty("价格条款")
     private String terms;
 
-    @ExcelProperty("装卸条款")
-    private String loadUnloadTerms;
-
-    @ExcelProperty("交货地点")
-    private String delivLoc;
-
-    @ExcelProperty("交货方式")
-    private String delivMtd;
-
     @ExcelProperty("运输方式")
     private String tranWay;
 
-    @ExcelProperty("是否租船")
-    private String whetherChartering;
-
-    @ExcelProperty("中文船名")
-    private String chnShipName;
-
-    @ExcelProperty("英文船名")
-    private String engShipName;
-
-    @ExcelProperty("代理采购协议号")
-    private String agentNo;
-
-    @ExcelProperty("代理销售协议号")
-    private String agentNoSo;
-
-    @ExcelProperty("佣金合同号")
-    private String commContrNo;
-
-    @ExcelProperty("销售交货日期")
-    private Date sDelivDt;
-
-    @ExcelProperty("是否过磅数量结算")
-    private String ifWeighedSalesQty;
-
-    @ExcelProperty("结算指标")
-    private String settIndex;
-
-    @ExcelProperty("是否允许分批")
-    private String ifBatch;
-
-    @ExcelProperty("是否允许转运")
-    private String ifTransfer;
-
-    @ExcelProperty("合同描述")
-    private String contrDesc;
+    @ExcelProperty("预计客商占款天数")
+    private Integer outstandingDay;
 
-    @ExcelProperty("备注信息")
-    private String remark;
 
-    @ExcelProperty("采购合同号")
-    private String pono;
+//    @ExcelProperty("制单人名称")
+//    private String createByName;
+//
+//
+//    @ExcelProperty("合同执行人名称")
+//    private String contrExecNm;
+//
+//
+//
+//    @ExcelProperty("客户联系人名称")
+//    private String ctContNm;
+//
+//    @ExcelProperty("客户开户银行")
+//    private String ctBankName;
+//
+//    @ExcelProperty("客户银行账户")
+//    private String ctBankAcct;
+//
+//    @ExcelProperty("客户合同号")
+//    private String ctOrderNo;
+//
+//
+//    @ExcelProperty("最迟集港日期")
+//    private Date estArrDt;
+//
+//
+//
+//
+//
+//    @ExcelProperty("我方银行账号")
+//    private String ourBankAcct;
+//
+//    @ExcelProperty("我方开户银行")
+//    private String ourBankNm;
+//
+//    @ExcelProperty("是否清底")
+//    private String ifClearBottom;
+//
+//    @ExcelProperty("是否长协")
+//    private String ifLongTerm;
+//
+//    @ExcelProperty("长协合同号")
+//    private String longTermContract;
+//
+//    @ExcelProperty("装运港")
+//    private String lPort;
+//
+//    @ExcelProperty("目的港")
+//    private String dPort;
+//
+//
+//
+//    @ExcelProperty("保险种类")
+//    private String insuranceType;
+//
+//    @ExcelProperty("保险费率%")
+//    private BigDecimal insuranceAmt;
+//
+//    @ExcelProperty("签约地点")
+//    private String signLoc;
+//
+//
+//
+//    @ExcelProperty("装卸条款")
+//    private String loadUnloadTerms;
+//
+//    @ExcelProperty("交货地点")
+//    private String delivLoc;
+//
+//    @ExcelProperty("交货方式")
+//    private String delivMtd;
+//
+//
+//
+//    @ExcelProperty("是否租船")
+//    private String whetherChartering;
+//
+//    @ExcelProperty("中文船名")
+//    private String chnShipName;
+//
+//    @ExcelProperty("英文船名")
+//    private String engShipName;
+//
+//    @ExcelProperty("代理采购协议号")
+//    private String agentNo;
+//
+//    @ExcelProperty("代理销售协议号")
+//    private String agentNoSo;
+//
+//    @ExcelProperty("佣金合同号")
+//    private String commContrNo;
+//
+//    @ExcelProperty("销售交货日期")
+//    private Date sDelivDt;
+//
+//    @ExcelProperty("是否过磅数量结算")
+//    private String ifWeighedSalesQty;
+//
+//    @ExcelProperty("结算指标")
+//    private String settIndex;
+//
+//    @ExcelProperty("是否允许分批")
+//    private String ifBatch;
+//
+//    @ExcelProperty("是否允许转运")
+//    private String ifTransfer;
+//
+//    @ExcelProperty("合同描述")
+//    private String contrDesc;
+//
+//    @ExcelProperty("备注信息")
+//    private String remark;
+//
+//    @ExcelProperty("采购合同号")
+//    private String pono;
 }

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

@@ -1,6 +1,7 @@
 package com.example.backend.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -11,98 +12,68 @@ import java.math.BigDecimal;
 @Data
 public class SalesDtlExcelDTO {
 
-    @ExcelProperty("销售合同号")
+    @ExcelProperty("合同号")
     private String fno;
 
-    @ExcelProperty("商品编号")
+    @ExcelProperty("批次号")
+    private String batchNo;
+
+    @ExcelProperty("商品编码")
     private String itemno;
 
-    @ExcelProperty("采购币种")
-    private String curcyPo;
+    @ExcelProperty("规格描述")
+    private String spec;
 
-    @ExcelProperty("增值税率%")
-    private BigDecimal inTaxRate;
+    @ExcelProperty("长")
+    private BigDecimal fnum3;
 
-    @ExcelProperty("含铁量%")
-    private BigDecimal ironCont;
+    @ExcelProperty("捆单重")
+    private BigDecimal fnum6;
 
-    @ExcelProperty("水分%")
-    private BigDecimal moisture;
+    @ExcelProperty("捆支数")
+    private BigDecimal fnum7;
 
-    @ExcelProperty("煤焦计价水%")
-    private BigDecimal coalMoisture;
+    @ExcelProperty("捆数")
+    private BigDecimal fnum8;
 
-    @ExcelProperty("采购单价")
-    private BigDecimal poprice;
+    @ExcelProperty("件数")
+    private BigDecimal qua;
 
-    @ExcelProperty("计价方式")
-    private String priceMtd;
+    @ExcelProperty("单位")
+    private String ut;
 
     @ExcelProperty("数量")
     private BigDecimal qty;
 
-    @ExcelProperty("采购汇率")
-    private BigDecimal ratePo;
-
-    @ExcelProperty("退税率 %")
-    private BigDecimal reTaxRate;
-
-    @ExcelProperty("资源号")
-    private String resourceNo;
-
-    @ExcelProperty("钢厂资源号")
-    private String smrNo;
-
-    @ExcelProperty("批次号")
-    private String batchNo;
-
-    @ExcelProperty("QP描述")
-    private String qpDesc;
-
-    @ExcelProperty("规格描述")
-    private String spec;
-
-    @ExcelProperty("件数")
-    private BigDecimal qua;
-
     @ExcelProperty("销售单价")
     private BigDecimal soPrice;
 
-    @ExcelProperty("长")
-    private BigDecimal fnum3;
+    @ExcelProperty("金额")
+    private BigDecimal soAmt;
 
-    @ExcelProperty("米重")
-    private BigDecimal fnum4;
-
-    @ExcelProperty("捆数")
-    private BigDecimal fnum8;
-
-    @ExcelProperty("捆单重")
-    private BigDecimal fnum6;
+    @ExcelProperty("水分%")
+    private BigDecimal moisture;
 
-    @ExcelProperty("捆支数")
-    private BigDecimal fnum7;
+    @ExcelProperty("含铁量%")
+    private BigDecimal ironCont;
 
     @ExcelProperty("色标")
     private String ftype5;
 
-    @ExcelProperty("螺纹规格库")
-    private String ftype7;
-
     @ExcelProperty("计重方式")
     private String ftype4;
 
-    @ExcelProperty("净重")
-    private BigDecimal fnw;
+    @ExcelProperty("计价方式")
+    private String priceMtd;
 
-    @ExcelProperty("毛重")
-    private BigDecimal fgw;
+    @ExcelProperty("增值税率%")
+    private BigDecimal inTaxRate;
 
-    @ExcelProperty("税额")
-    private BigDecimal taxAmt;
+    @ExcelProperty("海关编码")
+    private String hsCode;
 
-    @ExcelProperty("单位")
-    private String ut;
+    @ExcelProperty("采购合同号")
+    private String pono;
 
     @ExcelProperty("装运港")
     private String lPort;
@@ -110,15 +81,75 @@ public class SalesDtlExcelDTO {
     @ExcelProperty("目的港")
     private String dPort;
 
-    @ExcelProperty("海关编码")
-    private String hsCode;
-
-    @ExcelProperty("海关中文名称")
-    private String hsNameCn;
-
-    @ExcelProperty("海关英文名称")
-    private String hsNameEn;
-
-    @ExcelProperty("备注")
-    private String remark;
+//    @ExcelProperty("采购币种")
+//    private String curcyPo;
+//
+//
+//    @ExcelProperty("煤焦计价水%")
+//    private BigDecimal coalMoisture;
+//
+//    @ExcelProperty("采购单价")
+//    private BigDecimal poprice;
+//
+//
+//
+//
+//
+//    @ExcelProperty("采购汇率")
+//    private BigDecimal ratePo;
+//
+//    @ExcelProperty("退税率 %")
+//    private BigDecimal reTaxRate;
+//
+//    @ExcelProperty("资源号")
+//    private String resourceNo;
+//
+//    @ExcelProperty("钢厂资源号")
+//    private String smrNo;
+//
+//
+//    @ExcelProperty("QP描述")
+//    private String qpDesc;
+//
+//
+//
+//    @ExcelProperty("米重")
+//    private BigDecimal fnum4;
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//    @ExcelProperty("螺纹规格库")
+//    private String ftype7;
+//
+//
+//
+//    @ExcelProperty("净重")
+//    private BigDecimal fnw;
+//
+//    @ExcelProperty("毛重")
+//    private BigDecimal fgw;
+//
+//    @ExcelProperty("税额")
+//    private BigDecimal taxAmt;
+//
+//
+//
+//
+//
+//
+//
+//    @ExcelProperty("海关中文名称")
+//    private String hsNameCn;
+//
+//    @ExcelProperty("海关英文名称")
+//    private String hsNameEn;
+//
+//    @ExcelProperty("备注")
+//    private String remark;
 }

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

@@ -33,4 +33,7 @@ public interface DicMapper extends BaseMapper<DataDic> {
     List<DataDic> selectByFtyped(@Param("ftype4") String ftype4);
 
     List<DataDic> selectByPaymentType(@Param("paymentType") String paymentType);
+
+    List<DataDic> selectDicByTerms(@Param("terms") String terms);
+
 }

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

@@ -24,17 +24,23 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     List<SysUser> selectByCtName(@Param("ctName") String ctName);
 
-    @Select("select    a.id,a.fname,a.fname1,\n" +
-            "          (select rate from SGGMIIP.curcydtl where a.id=rid and targetcode='CNY' and nvl(del_flag,0)<>1) as rate ,\n" +
-            "          (select rate from SGGMIIP.curcydtl where a.id=rid and targetcode='USD' and nvl(del_flag,0)<>1) rateUsd ,\n" +
-            "          (SELECT b.rate from  SGGMIIP.curcyctrl a\n" +
-            "                                   left join SGGMIIP.curcydtl b on a.id=rid\n" +
-            "           where targetcode='CNY' and a.fname='USD' and nvl(b.del_flag,0)<>1 and nvl(a.del_flag,0)<>1) as rateUs\n" +
+    @Select("select a.id,\n" +
+            "       a.fname,\n" +
+            "       a.fname1,\n" +
+            "       (select rate from SGGMIIP.curcydtl where a.id = rid and targetcode = 'CNY' and nvl(del_flag, 0) <> 1) as rate,\n" +
+            "       (select rate from SGGMIIP.curcydtl where a.id = rid and targetcode = 'USD' and nvl(del_flag, 0) <> 1)    rateUsd,\n" +
+            "       (SELECT b.rate\n" +
+            "        from SGGMIIP.curcyctrl a\n" +
+            "                 left join SGGMIIP.curcydtl b on a.id = rid\n" +
+            "        where targetcode = 'CNY'\n" +
+            "          and a.fname = 'USD'\n" +
+            "          and nvl(b.del_flag, 0) <> 1\n" +
+            "          and nvl(a.del_flag, 0) <> 1)                                                               as rateUs\n" +
             "from SGGMIIP.curcyctrl A\n" +
             "where ifnull(a.del_flag, 0) <> 1\n" +
             "  and ifnull(a.placed, '') = '2'\n" +
-            "  and a.fname =#{curcy}\n" +
-            "group by a.id,a.fname,a.fname1")
+            "  and a.fname = #{curcy}\n" +
+            "group by a.id, a.fname, a.fname1")
     List<SysUser> selectByCurcy(@Param("curcy") String curcy);
 
 

src/main/java/com/example/backend/util/ExcelUtil.java

@@ -31,21 +31,6 @@ public class ExcelUtil {
         List<SalesContractExcelDTO> dataList = listener.getDataList();
         System.out.println("主表读取到 " + dataList.size() + " 条数据");
 
-        // 打印表头信息用于调试
-        if (!dataList.isEmpty()) {
-            SalesContractExcelDTO firstRow = dataList.get(0);
-            System.out.println("=== 第一行数据详情 ===");
-            System.out.println("销售合同号: " + firstRow.getSono());
-            System.out.println("制单人代码: " + firstRow.getCreateBy());
-            System.out.println("业务类型: " + firstRow.getServiceType());
-            System.out.println("合同类型: " + firstRow.getBizType());
-            System.out.println("合同产品类型: " + firstRow.getBizProductType());
-            System.out.println("最迟集港日期: " + firstRow.getEstArrDt());
-            System.out.println("最迟装运日期: " + firstRow.getEstLoadDt());
-            System.out.println("预计客商占款天数: " + firstRow.getOutstandingDay());
-            // 可以根据需要打印更多字段...
-        }
-
         return dataList;
     }
 

src/main/resources/mapper/DicMapper.xml

@@ -66,4 +66,13 @@
           and i.status = '0'
           and d.status = '0'
     </select>
+    <select id="selectDicByTerms" resultType="com.example.backend.entity.common.DataDic">
+        select d.dic_name, i.item_value
+        from SGGMIIP.data_dic d
+                 left join SGGMIIP.data_item i on d.id = i.dic_id
+        where i.item_value = #{terms}
+          and d.dic_name = '价格条款'
+          and i.status = '0'
+          and d.status = '0'
+    </select>
 </mapper>