1

src/main/java/com/example/backend/controller/contract/SalesContractController1.java

@@ -0,0 +1,62 @@
+package com.example.backend.controller.contract;
+
+import com.example.backend.service.contract.SalesContractService;
+import com.example.backend.service.contract.SalesContractService1;
+import com.example.backend.util.ExcelImportResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 销售合同控制器
+ */
+@RestController
+@RequestMapping("/salesContract1")
+@CrossOrigin(origins = "*") // 添加这个注解
+public class SalesContractController1 {
+
+    @Autowired
+    private SalesContractService1 salesContractService;
+
+    /**
+     * 导入Excel文件
+     */
+    @PostMapping("/import")
+    public ResponseEntity<Map<String, Object>> importExcel(@RequestParam("file") MultipartFile file) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            ExcelImportResult<Void> importResult = salesContractService.importExcelSales(file);
+
+            if (importResult.isSuccess()) {
+                result.put("code", 200);
+                result.put("success", true);
+                result.put("message", importResult.getMessage());
+                // 添加统计信息
+                if (importResult.getTotalCount() != null) {
+                    result.put("totalCount", importResult.getTotalCount());
+                    result.put("successCount", importResult.getSuccessCount());
+                    result.put("errorCount", importResult.getErrorCount());
+                }
+            } else {
+                result.put("code", 500);
+                result.put("success", false);
+                result.put("message", importResult.getMessage());
+                // 添加详细的错误信息
+                if (importResult.getErrors() != null && !importResult.getErrors().isEmpty()) {
+                    result.put("errors", importResult.getErrors());
+                    result.put("errorCount", importResult.getErrors().size());
+                }
+            }
+        } catch (Exception e) {
+            result.put("code", 500);
+            result.put("success", false);
+            result.put("message", "系统处理异常：" + e.getMessage());
+            e.printStackTrace();
+        }
+        return ResponseEntity.ok(result);
+    }
+}

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

@@ -122,6 +122,7 @@ public class ExpSvcRateEntity {
     private Integer curChangeVer;
 
     //销售合同号
-    @TableField("fno")
+    @TableField(exist = false)
+
     private String fno;
 }

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

@@ -457,7 +457,7 @@ public class SalesContractEntity {
     private String createByName;
 
     // 更新账号
-    @TableField("update_by")
+        @TableField("update_by")
     private String updateBy;
 
     // 更新时间
@@ -860,6 +860,9 @@ public class SalesContractEntity {
     @TableField("edesc")
     private String edesc;
 
+    @TableField("isinitDate")
+    private String isinitDate;
+
     // 附件列表
 //    @TableField(exist = false)
 //    private List<ConFilAffEntity> attachList;

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

@@ -22,7 +22,7 @@ public class SalesDtlExcelDTO {
     private String itemno;
 
     @ExcelProperty("规格描述")
-    private String spec;
+    private String ftype3;
 
     @ExcelProperty("长")
     private BigDecimal fnum3;

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

@@ -0,0 +1,14 @@
+package com.example.backend.service.contract;
+
+import com.example.backend.util.ExcelImportResult;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 销售合同服务接口
+ */
+
+public interface SalesContractService1 {
+    ExcelImportResult<Void> importExcelSales(MultipartFile file);
+
+
+}

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

@@ -83,10 +83,10 @@ public class SalesContractServiceImpl implements SalesContractService {
                 List<String> currentContractErrors = new ArrayList<>();
                 boolean currentContractValid = true;
 
-                if (StringUtils.isEmpty(currentSono)) {
-                    errors.add("主表(Sheet1) 销售合同号不能为空！");
-                    continue;
-                }
+//                if (StringUtils.isEmpty(currentSono)) {
+//                    errors.add("主表(Sheet1) 销售合同号不能为空！");
+//                    continue;
+//                }
 
                 try {
                     // ================= 1. 校验并收集主表数据 =================
@@ -99,7 +99,7 @@ public class SalesContractServiceImpl implements SalesContractService {
 
                     // 基础校验
                     if (StringUtils.isEmpty(entity.getSono())) {
-                        currentContractErrors.add("主表(Sheet1)合同号: " + currentSono +  " ：销售合同号不能为空！");
+//                        currentContractErrors.add("主表(Sheet1)合同号: " + currentSono +  " ：销售合同号不能为空！");
                         currentContractValid = false;
                     }
                     if(!StringUtils.isEmpty(entity.getSono())){
@@ -219,10 +219,10 @@ public class SalesContractServiceImpl implements SalesContractService {
                         entity.setCtName(ctName);
                     }
 
-                    if (ctNameList == null || ctNameList.isEmpty()) {
-                        currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：客户名称有误,未匹配到相关信息！");
-                        currentContractValid = false;
-                    }
+//                    if (ctNameList == null || ctNameList.isEmpty()) {
+//                        currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：客户名称有误,未匹配到相关信息！");
+//                        currentContractValid = false;
+//                    }
 
 //                    if (ctNameList != null && !ctNameList.isEmpty() && !"2".equals(ctNameList.get(0).getPlaced())) {
 //                        currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：客户名称没有审批通过！");
@@ -295,16 +295,16 @@ public class SalesContractServiceImpl implements SalesContractService {
                     }
 
                     if ("出口销售".equals(entity.getBizType()) || "转口销售".equals(entity.getBizType())) {
-                        if (entity.getEstLoadDt() == null) {
-                            currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：合同类型为出口销售或转口销售时，最迟装运日期不能为空！");
-                            currentContractValid = false;
-                        }
+                            if (entity.getEstLoadDt() == null) {
+//                                currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：合同类型为出口销售或转口销售时，最迟装运日期不能为空！");
+//                                currentContractValid = false;
+                            }
                     }
 
                     if (entity.getServiceType().contains("代理进口") || entity.getServiceType().contains("代理内贸")) {
                         if (Objects.isNull(entity.getOutstandingDay())) {
-                            currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：业务类型为代理进口或代理内贸时，预计客商占款天数不能为空！");
-                            currentContractValid = false;
+//                            currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：业务类型为代理进口或代理内贸时，预计客商占款天数不能为空！");
+//                            currentContractValid = false;
                         }
                     }
 
@@ -368,6 +368,7 @@ public class SalesContractServiceImpl implements SalesContractService {
                     if (StringUtils.isEmpty(entity.getIfBidding())) {
                         entity.setIfBidding("是");
                     }
+                    entity.setIsinitDate("是");
 //                    if(StringUtils.isEmpty(entity.getIfBatch())){
 //                        entity.setIfBatch("否");
 //                    }
@@ -398,26 +399,26 @@ public class SalesContractServiceImpl implements SalesContractService {
                                 .collect(Collectors.toList());
 
                         if (currentSalesDtlList != null && !currentSalesDtlList.isEmpty()) {
-//                            if (StringUtils.isEmpty(currentSalesDtlList.get(0).getLPort())) {
+                            if (StringUtils.isEmpty(currentSalesDtlList.get(0).getLPort())) {
 //                                currentContractErrors.add("主表(Sheet2)合同号：" + currentSono + "的合同产品 装运港不能为空！");
 //                                currentContractValid = false;
-//                            }
-//                            if (StringUtils.isEmpty(currentSalesDtlList.get(0).getDPort())) {
+                            }
+                            if (StringUtils.isEmpty(currentSalesDtlList.get(0).getDPort())) {
 //                                currentContractErrors.add("主表(Sheet2)合同号：" + currentSono + "的合同产品 目的港不能为空！");
 //                                currentContractValid = false;
-//                            }
+                            }
                             entity.setLPort(currentSalesDtlList.get(0).getLPort());
                             entity.setDPort(currentSalesDtlList.get(0).getDPort());
                         }
 
                         if (StringUtils.isEmpty(entity.getLPort())) {
-                            currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：合同类型为出口销售或转口销售或业务类型包含主业时,装运港不能为空");
-                            currentContractValid = false;
+//                            currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：合同类型为出口销售或转口销售或业务类型包含主业时,装运港不能为空");
+//                            currentContractValid = false;
                         }
                         List<CustCtrl> lPortList = custCtrlMapper.selectLPortByLportName(entity.getLPort());
                         if (lPortList == null || lPortList.isEmpty()) {
-                            currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：装运港有误！");
-                            currentContractValid = false;
+//                            currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：装运港有误！");
+//                            currentContractValid = false;
                         }
                         if (lPortList != null && !lPortList.isEmpty() && !StringUtils.isEmpty(lPortList.get(0).getFno())) {
                             entity.setLpno(lPortList.get(0).getFno());
@@ -431,13 +432,13 @@ public class SalesContractServiceImpl implements SalesContractService {
                         }
 
                         if (StringUtils.isEmpty(entity.getDPort())) {
-                            currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：合同类型为出口销售或转口销售或业务类型包含主业时,目的港不能为空");
-                            currentContractValid = false;
+//                            currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：合同类型为出口销售或转口销售或业务类型包含主业时,目的港不能为空");
+//                            currentContractValid = false;
                         }
                         List<CustCtrl> dPortList = custCtrlMapper.selectLPortByLportName(entity.getDPort());
                         if (dPortList == null || dPortList.isEmpty()) {
-                            currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：目的港有误！");
-                            currentContractValid = false;
+//                            currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：目的港有误！");
+//                            currentContractValid = false;
                         }
                         if (dPortList != null && !dPortList.isEmpty() && !StringUtils.isEmpty(dPortList.get(0).getFno())) {
                             entity.setDpno(dPortList.get(0).getFno());
@@ -487,8 +488,8 @@ public class SalesContractServiceImpl implements SalesContractService {
                     }
                     if ("出口销售".equals(entity.getBizType()) || "转口销售".equals(entity.getBizType())) {
                         if (StringUtils.isEmpty(entity.getTerms())) {
-                            currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：合同类型为出口销售或转口销售时，价格条款不能为空");
-                            currentContractValid = false;
+//                            currentContractErrors.add("主表(Sheet1) 合同号: " + currentSono + "：合同类型为出口销售或转口销售时，价格条款不能为空");
+//                            currentContractValid = false;
                         }
 //                        if (!StringUtils.isEmpty(entity.getTerms())) {
 //                            List<DataDic> termsList = dicMapper.selectDicByTerms(entity.getTerms());
@@ -520,7 +521,7 @@ public class SalesContractServiceImpl implements SalesContractService {
                             .filter(dto -> currentSono.equals(dto.getFno()))
                             .collect(Collectors.toList());
                     if(currentSalesDtlList==null||currentSalesDtlList.isEmpty()){
-                        currentContractErrors.add(" 合同号 " + currentSono + " 的销售产品信息不能为空！");
+//                        currentContractErrors.add(" 合同号 " + currentSono + " 的销售产品信息不能为空！");
 
                     }
 
@@ -555,21 +556,21 @@ public class SalesContractServiceImpl implements SalesContractService {
                             }
 
                             if (Objects.isNull(entity1.getInTaxRate())) {
-                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +  " ：增值税率不能为空");
-                                currentContractValid = false;
+//                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +  " ：增值税率不能为空");
+//                                currentContractValid = false;
                             }
 
                             if (StringUtils.isEmpty(entity1.getUt())) {
-                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +  "单位不能为空");
-                                currentContractValid = false;
+//                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +  "单位不能为空");
+//                                currentContractValid = false;
                             }
 
                             // 商品信息校验
                             if (!StringUtils.isEmpty(itemno) && bizProductType != null) {
                                 List<CustCtrl> itemnoList = custCtrlMapper.selectByItemno(itemno, bizProductType);
                                 if (itemnoList == null || itemnoList.isEmpty()) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +  " ：商品编号有误！");
-                                    currentContractValid = false;
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +  " ：商品编号有误！");
+//                                    currentContractValid = false;
                                 }
 
                                 if (itemnoList != null && !itemnoList.isEmpty()) {
@@ -622,26 +623,26 @@ public class SalesContractServiceImpl implements SalesContractService {
                             // 产品类型特定校验
                             if ("铁矿石".equals(bizProductType)) {
                                 if (Objects.isNull(entity1.getIronCont())) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " ：合同产品类型为铁矿石时，含铁量%不能为空!");
-                                    currentContractValid = false;
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " ：合同产品类型为铁矿石时，含铁量%不能为空!");
+//                                    currentContractValid = false;
                                 }
                             }
 
                             if ("铁矿石".equals(bizProductType) || "煤炭".equals(bizProductType)) {
                                 if (Objects.isNull(entity1.getMoisture())) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +  " ：合同产品类型为铁矿石或煤炭时，水分%不能为空!");
-                                    currentContractValid = false;
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +  " ：合同产品类型为铁矿石或煤炭时，水分%不能为空!");
+//                                    currentContractValid = false;
                                 }
 
                                 if (StringUtils.isEmpty(entity1.getPriceMtd())) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +  " ：合同产品类型为铁矿石或煤炭时，计价方式不能为空！");
-                                    currentContractValid = false;
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +  " ：合同产品类型为铁矿石或煤炭时，计价方式不能为空！");
+//                                    currentContractValid = false;
                                 }
 
                                 List<DataDic> priceMtdList = dicMapper.selectByPriceMtd(entity1.getPriceMtd());
                                 if (priceMtdList == null || priceMtdList.isEmpty()) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +  " ：输入的计价方式在数据字典中不存在！");
-                                    currentContractValid = false;
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +  " ：输入的计价方式在数据字典中不存在！");
+//                                    currentContractValid = false;
                                 }
 
                                 if (!StringUtils.isEmpty(entity1.getResourceNo())) {
@@ -664,15 +665,15 @@ public class SalesContractServiceImpl implements SalesContractService {
                                     }
                                 }
 
-                                if (StringUtils.isEmpty(entity1.getFtype3())) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +  "：合同产品类型为钢产品时，规格描述不能为空！");
-                                    currentContractValid = false;
-                                }
+//                                if (StringUtils.isEmpty(entity1.getFtype3())) {
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +  "：合同产品类型为钢产品时，规格描述不能为空！");
+//                                    currentContractValid = false;
+//                                }
 
                                 List<CustCtrl> ftype3List = custCtrlMapper.selectByFtype3(entity1.getFtype3());
                                 if (ftype3List == null || ftype3List.isEmpty()) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " ：输入的规格描述有误！");
-                                    currentContractValid = false;
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " ：输入的规格描述有误！");
+//                                    currentContractValid = false;
                                 }
 
                                 if (ftype3List != null && !ftype3List.isEmpty() && !Objects.isNull(ftype3List.get(0).getFnum4())
@@ -684,14 +685,14 @@ public class SalesContractServiceImpl implements SalesContractService {
                                 }
 
                                 if (StringUtils.isEmpty(entity1.getFtype4())) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +   " ：合同产品类型为钢产品时，计重方式不能为空！");
-                                    currentContractValid = false;
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono +   " ：合同产品类型为钢产品时，计重方式不能为空！");
+//                                    currentContractValid = false;
                                 }
 
                                 List<DataDic> ftype4List = dicMapper.selectByFtyped(entity1.getFtype4());
                                 if (ftype4List == null || ftype4List.isEmpty()) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + "：输入的计重方式在数据字典中不存在");
-                                    currentContractValid = false;
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + "：输入的计重方式在数据字典中不存在");
+//                                    currentContractValid = false;
                                 }
 
 //                                if (Objects.isNull(entity1.getQua())) {
@@ -706,13 +707,13 @@ public class SalesContractServiceImpl implements SalesContractService {
                             }
 
                             if (Objects.isNull(entity1.getQty())) {
-                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + "：数量不能为空!");
-                                currentContractValid = false;
+//                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + "：数量不能为空!");
+//                                currentContractValid = false;
                             }
 
                             if (Objects.isNull(entity1.getSoPrice())) {
-                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + "：销售单价不能为空！");
-                                currentContractValid = false;
+//                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + "：销售单价不能为空！");
+//                                currentContractValid = false;
                             }
 
                             // 钢材特定校验
@@ -751,12 +752,12 @@ public class SalesContractServiceImpl implements SalesContractService {
 //                                currentContractValid = false;
 //                            }
 
-                            if (StringUtils.isEmpty(entity1.getPono())) {
-                                entity1.setCurcyPo(entity.getCurcy());
-                                entity1.setPoprice(entity1.getSoPrice());
-                                entity1.setRatePo(entity.getRate());
-                                entity1.setPoamt(entity1.getSoAmt());
-                            }
+//                            if (StringUtils.isEmpty(entity1.getPono())) {
+//                                entity1.setCurcyPo(entity.getCurcy());
+//                                entity1.setPoprice(entity1.getSoPrice());
+//                                entity1.setRatePo(entity.getRate());
+//                                entity1.setPoamt(entity1.getSoAmt());
+//                            }
 
                             if (StringUtils.isEmpty(entity1.getItemno())) {
                                 entity1.setCurcyPo(entity.getCurcy());
@@ -802,28 +803,28 @@ public class SalesContractServiceImpl implements SalesContractService {
                             // 港口信息校验
                             if ("出口销售".equals(bizType) || "转口销售".equals(bizType) || (serviceType != null && serviceType.contains("主业"))) {
                                 if (StringUtils.isEmpty(entity1.getLPort())) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + "：合同类型为出口销售或转口销售或业务类型包含主业时,装运港不能为空");
-                                    currentContractValid = false;
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + "：合同类型为出口销售或转口销售或业务类型包含主业时,装运港不能为空");
+//                                    currentContractValid = false;
                                 }
 
                                 List<CustCtrl> lPortList = custCtrlMapper.selectLPortByLportName(entity1.getLPort());
                                 if (lPortList == null || lPortList.isEmpty()) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + "：装运港有误！");
-                                    currentContractValid = false;
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + "：装运港有误！");
+//                                    currentContractValid = false;
                                 }
                                 if (lPortList != null && !lPortList.isEmpty() && !StringUtils.isEmpty(lPortList.get(0).getFno())) {
                                     entity1.setLpno(lPortList.get(0).getFno());
                                 }
 
                                 if (StringUtils.isEmpty(entity1.getDPort())) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + "：合同类型为出口销售或转口销售或业务类型包含主业时,目的港不能为空");
-                                    currentContractValid = false;
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + "：合同类型为出口销售或转口销售或业务类型包含主业时,目的港不能为空");
+//                                    currentContractValid = false;
                                 }
 
                                 List<CustCtrl> dPortList = custCtrlMapper.selectLPortByLportName(entity1.getDPort());
                                 if (dPortList == null || dPortList.isEmpty()) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + "：目的港有误！");
-                                    currentContractValid = false;
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + "：目的港有误！");
+//                                    currentContractValid = false;
                                 }
                                 if (dPortList != null && !dPortList.isEmpty() && !StringUtils.isEmpty(dPortList.get(0).getFno())) {
                                     entity1.setDpno(dPortList.get(0).getFno());
@@ -854,8 +855,8 @@ public class SalesContractServiceImpl implements SalesContractService {
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
 
                         if (totalRatio.compareTo(new BigDecimal("100")) != 0) {
-                            currentContractErrors.add("收款计划(Sheet3) 合同号: " + currentSono + " 的收款比例总和必须为100%，当前总和为：" + totalRatio + "%");
-                            currentContractValid = false;
+//                            currentContractErrors.add("收款计划(Sheet3) 合同号: " + currentSono + " 的收款比例总和必须为100%，当前总和为：" + totalRatio + "%");
+//                            currentContractValid = false;
                         }
 
                         for (int i = 0; i < currentSalesCollectList.size(); i++) {
@@ -873,12 +874,12 @@ public class SalesContractServiceImpl implements SalesContractService {
                                 currentContractValid = false;
                             }
 
-                            if ("预付款-发货后".equals(entity2.getPaymentType()) || "发票后结算款".equals(entity2.getPaymentType())) {
-                                if (Objects.isNull(entity2.getPayDays())) {
-                                    currentContractErrors.add("收款计划(Sheet3) 合同号 :" + currentSono +" 的款项类别为'预付款-发货后'或'发票后结算款',账期不能为空！");
-                                    currentContractValid = false;
-                                }
-                            }
+//                            if ("预付款-发货后".equals(entity2.getPaymentType()) || "发票后结算款".equals(entity2.getPaymentType())) {
+//                                if (Objects.isNull(entity2.getPayDays())) {
+//                                    currentContractErrors.add("收款计划(Sheet3) 合同号 :" + currentSono +" 的款项类别为'预付款-发货后'或'发票后结算款',账期不能为空！");
+//                                    currentContractValid = false;
+//                                }
+//                            }
 
                             if (StringUtils.isEmpty(entity2.getPayMode())) {
                                 currentContractErrors.add("收款计划(Sheet3) 合同号 :" + currentSono +" 的收款方式不能为空！");
@@ -914,13 +915,13 @@ public class SalesContractServiceImpl implements SalesContractService {
                                 .reduce(BigDecimal.ZERO, BigDecimal::add);
 
                         if (totalAssessQtyRate.compareTo(new BigDecimal("100")) != 0) {
-                            currentContractErrors.add("责任中心(Sheet4) 合同号 " + currentSono + " 的利润考核占比总和必须为100%，当前总和为：" + totalAssessQtyRate + "%");
-                            currentContractValid = false;
+//                            currentContractErrors.add("责任中心(Sheet4) 合同号 " + currentSono + " 的利润考核占比总和必须为100%，当前总和为：" + totalAssessQtyRate + "%");
+//                            currentContractValid = false;
                         }
 
                         if (totalAssessRatio.compareTo(new BigDecimal("100")) != 0) {
-                            currentContractErrors.add("责任中心(Sheet4) 合同号 " + currentSono + " 的金额考核占比总和必须为100%，当前总和为：" + totalAssessRatio + "%");
-                            currentContractValid = false;
+//                            currentContractErrors.add("责任中心(Sheet4) 合同号 " + currentSono + " 的金额考核占比总和必须为100%，当前总和为：" + totalAssessRatio + "%");
+//                            currentContractValid = false;
                         }
 
                         for (int i = 0; i < currentRCenterDtlList.size(); i++) {
@@ -1078,10 +1079,10 @@ public class SalesContractServiceImpl implements SalesContractService {
                                     currentContractValid = false;
                                 }
 
-                                if (Objects.isNull(entity4.getMinDays())) {
-                                    currentContractErrors.add("服务费率(Sheet5) 合同号：" + currentSono + " 起步天数不能为空！");
-                                    currentContractValid = false;
-                                }
+//                                if (Objects.isNull(entity4.getMinDays())) {
+//                                    currentContractErrors.add("服务费率(Sheet5) 合同号：" + currentSono + " 起步天数不能为空！");
+//                                    currentContractValid = false;
+//                                }
 
                                 entity4.setLine(i+1);
 
@@ -1122,7 +1123,7 @@ public class SalesContractServiceImpl implements SalesContractService {
                         currentMainEntity.setCreateTime(new Date());
                         currentMainEntity.setFmodalid(6L);
                         currentMainEntity.setPlaced("0");
-                        currentMainEntity.setRemark("期初2");
+                        currentMainEntity.setRemark("期初");
 
                         salesContractMapper.insert(currentMainEntity);
                         Long mainId = currentMainEntity.getId();
@@ -1215,7 +1216,7 @@ public class SalesContractServiceImpl implements SalesContractService {
                 ContractErrorLogEntity log = new ContractErrorLogEntity();
                 log.setErrorLog(String.join("\n", errors));
                 log.setCreateDate(new Date());
-                contractErrorLogMapper.insert(log);
+//                contractErrorLogMapper.insert(log);
             } catch (Exception logException) {
                 System.err.println("保存错误日志失败: " + logException.getMessage());
             }

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

@@ -87,7 +87,7 @@ public class ExcelUtil {
         SimpleDataListener<ExpSvcRateExcelDTO> listener = new SimpleDataListener<>();
         EasyExcel.read(file.getInputStream(), ExpSvcRateExcelDTO.class, listener)
                 .sheet(4) // 第五个sheet
-                .headRowNumber(3) // 跳过前0行
+                .headRowNumber(1) // 跳过前0行
                 .doRead();
         List<ExpSvcRateExcelDTO> dataList = listener.getDataList();
         System.out.println("服务费率读取到 " + dataList.size() + " 条数据");

src/main/resources/application.yml

@@ -11,7 +11,7 @@ spring:
       max-request-size: 10MB
   datasource:
     driver-class-name: dm.jdbc.driver.DmDriver
-    url: jdbc:dm://10.19.13.211:5236
+    url: jdbc:dm://10.19.14.22:5236
     username: SGGMIIP
     password: SXxxjsgs2025
     druid: