修改大量

src/main/java/com/example/backend/pAndSExe/mapper/InfExe1Mapper.java

@@ -53,9 +53,9 @@ public interface InfExe1Mapper extends BaseMapper
     @Select("SELECT * FROM SGGMINFT.INF_EXE1")
     List<InfExe1> selectAllData();
 
-    @Select("select create_by from SGGMIIP.purchaseContract where fno =#{pono} where del_flag !=1 limit 1")
+    @Select("select create_by from SGGMIIP.purchaseContract where fno =#{pono} and del_flag !=1 limit 1")
     String selectCreateByFromPono(String pono);
 
-    @Select("select create_by from SGGMIIP.salesContract where fno =#{sono} where del_flag !=1 limit 1")
+    @Select("select create_by from SGGMIIP.salesContract where fno =#{sono} and del_flag !=1 limit 1")
     String selectCreateByFromSono(String sono);
 }

src/main/java/com/example/backend/pAndSExe/mapper/InfExe3Mapper.java

@@ -24,7 +24,7 @@ public interface InfExe3Mapper extends BaseMapper
     @Select("SELECT * FROM SGGMINFT.INF_EXE4 WHERE dataStatus = '0'")
     List<InfExe3> selectValidData();
 
-    @Update("UPDATE SGGMINFT.INF_EXE3 SET dataStatus = '1' WHERE ID = #{id}")
+    @Update("UPDATE SGGMINFT.INF_EXE4 SET dataStatus = '1' WHERE ID = #{id}")
     int updateStatusById(@Param("id") String id);
     @Select("SELECT * FROM SGGMINFT.INF_EXE4")
     List<InfExe3> selectAllData();

src/main/java/com/example/backend/pAndSExe/mapper/SalesContractMapper.java → src/main/java/com/example/backend/pAndSExe/mapper/SalesContractExeMapper.java

@@ -1,14 +1,13 @@
 package com.example.backend.pAndSExe.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.example.backend.pAndSExe.model.PurchaseOrder;
 import com.example.backend.pAndSExe.model.SalesContract;
 import org.apache.ibatis.annotations.Select;
 
 /**
  * 采购订单 存储仓
  */
-public interface SalesContractMapper extends BaseMapper <SalesContract> {
+public interface SalesContractExeMapper extends BaseMapper <SalesContract> {
 
 
     @Select("select * from SGGMIIP.salesContract where fno=#{sono} and del_flag != 1 limit 1")

src/main/java/com/example/backend/pAndSExe/model/SalesContract.java

@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
  * 注：若数据库表指定了模式（如 SGGMIIP.salesContract），请补充到 @TableName 中，例：@TableName("SGGMIIP.salesContract")
  */
 @Data
-@TableName("salesContract") // 数据库表名，需根据实际调整模式前缀
+@TableName("SGGMIIP.salesContract") // 数据库表名，需根据实际调整模式前缀
 public class SalesContract {
     /** 主键ID（雪花ID，适配BIGINT类型） */
     @TableId(type = IdType.ASSIGN_ID)

src/main/java/com/example/backend/pAndSExe/service/impl/DaodandengjiSettleServiceImpl.java

@@ -36,7 +36,7 @@ public class DaodandengjiSettleServiceImpl implements DaodandengjiSettleService
         // 1. 查询中间表有效数据（dataStatus=0）
         List<InfDaodandengji> infList = infDaodandengjiMapper.selectValidData();
         //todo
-        infList=infDaodandengjiMapper.selectAllData();
+        //infList=infDaodandengjiMapper.selectAllData();
         if (infList.isEmpty()) {
             return "未查询到到货登记中间表中有效数据（dataStatus=0），无需导入";
         }
@@ -69,7 +69,7 @@ public class DaodandengjiSettleServiceImpl implements DaodandengjiSettleService
 
                 // 更新中间表状态为已导入
                 //todo
-                //infDaodandengjiMapper.updateStatusById(inf.getId());
+                infDaodandengjiMapper.updateStatusById(inf.getId());
                 successCount++;
             } catch (Exception e) {
                 failCount++;

src/main/java/com/example/backend/pAndSExe/service/impl/FeeInvoiceSettleServiceImpl.java

@@ -42,7 +42,7 @@ public class FeeInvoiceSettleServiceImpl implements FeeInvoiceSettleService {
         // 1. 查询中间表中有效数据（dataStatus=0）
         List<InfFeiyongfapiaodengji> infList = infFeiyongfapiaodengjiMapper.selectValidData();
         //todo
-        infList=infFeiyongfapiaodengjiMapper.selectAllData();
+        //infList=infFeiyongfapiaodengjiMapper.selectAllData();
         if (infList.isEmpty()) {
             return "未查询到中间表中有效数据（dataStatus=0），无需导入";
         }
@@ -109,7 +109,7 @@ public class FeeInvoiceSettleServiceImpl implements FeeInvoiceSettleService {
 
                 // 更新中间表状态为已导入
                 //todo
-                // infFeiyongfapiaodengjiMapper.updateStatusById(inf.getId());
+                 infFeiyongfapiaodengjiMapper.updateStatusById(inf.getId());
                 successCount++;
             } catch (Exception e) {
                 failCount++;

src/main/java/com/example/backend/pAndSExe/service/impl/FeePayServiceImpl.java

@@ -1,7 +1,6 @@
 package com.example.backend.pAndSExe.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.example.backend.entity.contract.SalesContractEntity;
 import com.example.backend.pAndSExe.mapper.*;
 import com.example.backend.pAndSExe.model.*;
 import com.example.backend.pAndSExe.service.FeePayService;
@@ -35,7 +34,7 @@ public class FeePayServiceImpl implements FeePayService {
     private MdkcctrlMapper mdkcctrlMapper;
 
     @Autowired
-    private SalesContractMapper salesContractMapper;
+    private SalesContractExeMapper salesContractExeMapper;
 
     /**
      * 批量导入费用付款数据到业务表（事务控制，保证主从表一致性）
@@ -45,7 +44,7 @@ public class FeePayServiceImpl implements FeePayService {
     public String importInfFeiyongfukuanToPay() {
         // 1. 查询inf_feiyongfukuan中有效数据（dataStatus=0，校验通过的数据）
         List<InfFeiyongfukuan> feiyongList = infExe4Mapper.selectValidData(); // 同Exe3：查询dataStatus=0的有效数据
-        feiyongList=infExe4Mapper.selectAllData();
+        //feiyongList=infExe4Mapper.selectAllData();
         if (feiyongList.isEmpty()) {
             return "未查询到inf_feiyongfukuan中有效数据（dataStatus=0），无需导入";
         }
@@ -98,7 +97,7 @@ public class FeePayServiceImpl implements FeePayService {
                         ctrl.setFoursname(purchasecontract.getFoursname());
                     }
                 } else if (fee.getSono() != null && !fee.getSono().isEmpty()){
-                    salesContract=salesContractMapper.selectByFno(fee.getSono());
+                    salesContract= salesContractExeMapper.selectByFno(fee.getSono());
                     if (salesContract!=null) {
                         ctrl.setFours(salesContract.getFours());
                         ctrl.setFoursname(salesContract.getFoursname());
@@ -111,7 +110,7 @@ public class FeePayServiceImpl implements FeePayService {
                // paymgrctrlMapper.insertFeePaymgrctrl(ctrl);
                 // 同Exe3：更新inf_feiyongfukuan的状态（标记为已导入）
                 // todo 先不改状态
-               // infExe4Mapper.updateStatusById(fee.getID());
+                infExe4Mapper.updateStatusById(fee.getID());
 
                 // ========== 第二步：插入子表paystockdtl（补充费用名称字段） ==========
                 Paystockdtl dtl = new Paystockdtl();

src/main/java/com/example/backend/pAndSExe/service/impl/JinxiangInvoiceSettleServiceImpl.java

@@ -43,7 +43,7 @@ public class JinxiangInvoiceSettleServiceImpl implements JinxiangInvoiceSettleSe
         // 1. 查询中间表中有效数据（dataStatus=0）
         List<InfJinxiangfapiao> infList = infJinxiangfapiaoMapper.selectValidData();
         //todo
-        infList=infJinxiangfapiaoMapper.selectAllData();
+        //infList=infJinxiangfapiaoMapper.selectAllData();
 
         if (infList.isEmpty()) {
             return "未查询到进项发票中间表中有效数据（dataStatus=0），无需导入";
@@ -55,7 +55,7 @@ public class JinxiangInvoiceSettleServiceImpl implements JinxiangInvoiceSettleSe
         // 2. 遍历导入每条数据
         for (InfJinxiangfapiao inf : infList) {
             try {
-                PurchaseOrder purchaseOrder = purchaseorderMapper.selectByPurchaseContract(inf.getFno());
+                PurchaseOrder purchaseOrder = purchaseorderMapper.selectByPurchaseContract(inf.getPono());
                 Purchasecontract purchasecontract = purchasecontractMapper.selectByFno(inf.getFno());
 
 
@@ -136,7 +136,7 @@ public class JinxiangInvoiceSettleServiceImpl implements JinxiangInvoiceSettleSe
 
                 // 更新中间表状态为已导入
                 //todo
-               // infJinxiangfapiaoMapper.updateStatusById(inf.getId());
+                infJinxiangfapiaoMapper.updateStatusById(inf.getId());
                 successCount++;
             } catch (Exception e) {
                 failCount++;

src/main/java/com/example/backend/pAndSExe/service/impl/PayServiceImpl.java

@@ -47,7 +47,7 @@ public class PayServiceImpl implements PayService {
         // 1. 查询inf_exe3中有效数据（dataStatus=0，校验通过的数据）
         List<InfExe3> infExe3List = infExe3Mapper.selectValidData(); // 同Exe1：查询dataStatus=0的有效数据
         //todo
-        infExe3List=infExe3Mapper.selectAllData();
+        //infExe3List=infExe3Mapper.selectAllData();
         if (infExe3List.isEmpty()) {
             return "未查询到inf_exe3中有效数据（dataStatus=0），无需导入";
         }
@@ -110,7 +110,7 @@ public class PayServiceImpl implements PayService {
                 //paymgrctrlMapper.insertPaymgrctrl(ctrl);
                 // 同Exe1：更新inf_exe3的状态（标记为已导入）
                 //todo 暂时取消状态修改
-                // infExe3Mapper.updateStatusById(exe3.getID());
+                 infExe3Mapper.updateStatusById(exe3.getID());
 
                 // ========== 第二步：插入子表paystockdtl ==========
                 Paystockdtl dtl = new Paystockdtl();

src/main/java/com/example/backend/pAndSExe/service/impl/ShoukuanrenlingSettleServiceImpl.java

@@ -30,7 +30,7 @@ public class ShoukuanrenlingSettleServiceImpl implements ShoukuanrenlingSettleSe
     private MdkcctrlMapper mdkcctrlMapper;
 
     @Autowired
-    private SalesContractMapper salesContractMapper;
+    private SalesContractExeMapper salesContractExeMapper;
 
     @Autowired
     private PaymgrctrlMapper paymgrctrlMapper;
@@ -43,7 +43,7 @@ public class ShoukuanrenlingSettleServiceImpl implements ShoukuanrenlingSettleSe
         // 1. 查询中间表有效数据（dataStatus=0）
         List<InfShoukuanrenling> infList = infShoukuanrenlingMapper.selectValidData();
         //todo 临时替换为查询全部，后续可删除
-        infList=infShoukuanrenlingMapper.selectAllData();
+        //infList=infShoukuanrenlingMapper.selectAllData();
         if (infList.isEmpty()) {
             return "未查询到收款人认领中间表中有效数据（dataStatus=0），无需导入";
         }
@@ -54,7 +54,7 @@ public class ShoukuanrenlingSettleServiceImpl implements ShoukuanrenlingSettleSe
         // 2. 遍历导入每条数据（主表+明细表联动插入）
         for (InfShoukuanrenling inf : infList) {
             try {
-                SalesContract salesContract = salesContractMapper.selectByFno(inf.getSono());
+                SalesContract salesContract = salesContractExeMapper.selectByFno(inf.getSono());
 
 
                 // -------------------- 第一步：插入主表breceiptctrl --------------------
@@ -82,7 +82,7 @@ public class ShoukuanrenlingSettleServiceImpl implements ShoukuanrenlingSettleSe
                 breceiptctrl.setUpdateTime(new Date());
                 breceiptctrl.setFours(salesContract.getFours());
                 breceiptctrl.setFoursname(salesContract.getFoursname());
-                String cpal=salesContractMapper.selectCpalByFours(salesContract.getFours());
+                String cpal= salesContractExeMapper.selectCpalByFours(salesContract.getFours());
                 breceiptctrl.setCpal(cpal);
                 breceiptctrl.setClaimerCd(inf.getCreateBy());
                 breceiptctrl.setClaimerNm(s);
@@ -121,7 +121,7 @@ public class ShoukuanrenlingSettleServiceImpl implements ShoukuanrenlingSettleSe
 
                 // -------------------- 第三步：更新中间表状态为已导入 --------------------
                 //todo 后续启用：更新中间表状态
-                //infShoukuanrenlingMapper.updateStatusById(inf.getId());
+                infShoukuanrenlingMapper.updateStatusById(inf.getId());
                 successCount++;
             } catch (Exception e) {
                 failCount++;

src/main/java/com/example/backend/pAndSExe/service/impl/StockServiceImpl.java

@@ -45,7 +45,7 @@ public class StockServiceImpl implements StockService {
         // 1. 查询inf_exe1中有效数据（dataStatus=0，校验通过的数据）
         List<InfExe1> infExe1List = infExe1Mapper.selectValidData(); // 需补充该查询方法
         // todo 暂时发全部
-        infExe1List = infExe1Mapper.selectAllData(); // 需补充该查询方法
+        // infExe1List = infExe1Mapper.selectAllData(); // 需补充该查询方法
 
         if (infExe1List.isEmpty()) {
             return "未查询到inf_exe1中有效数据（dataStatus=0），无需导入";
@@ -101,6 +101,7 @@ public class StockServiceImpl implements StockService {
                         ctrl.setBizType(purchaseOrder.getBizType());
                         ctrl.setBizProductType(purchaseOrder.getBizProductType());
 
+
                     }
                 }else if (exe1.getFmodalid()==24){
                      salesOrder = salesorderMapper.selectBySalesContract(exe1.getSfno());
@@ -132,7 +133,7 @@ public class StockServiceImpl implements StockService {
                 // 插入主表
                 //mdkcctrlMapper.insertMdkcctrl(ctrl);
                 //todo 暂时不修改状态
-                //infExe1Mapper.updateStatusById(exe1.getID());
+                infExe1Mapper.updateStatusById(exe1.getID());
 
                 // ========== 第二步：插入子表mdkcdtl ==========
                 Mdkcdtl dtl = new Mdkcdtl();

src/main/java/com/example/backend/pAndSExe/service/impl/XiaoshoujiesuankaipiaoSettleServiceImpl.java

@@ -45,7 +45,7 @@ public class XiaoshoujiesuankaipiaoSettleServiceImpl implements Xiaoshoujiesuank
         // 1. 查询中间表有效数据（dataStatus=0）
         List<InfXiaoshoujiesuankaipiao> infList = infXiaoshoujiesuankaipiaoMapper.selectValidData();
         //todo
-        infList=infXiaoshoujiesuankaipiaoMapper.selectAllData();
+        //infList=infXiaoshoujiesuankaipiaoMapper.selectAllData();
         if (infList.isEmpty()) {
             return "未查询到销售结算开票中间表中有效数据（dataStatus=0），无需导入";
         }
@@ -154,7 +154,7 @@ public class XiaoshoujiesuankaipiaoSettleServiceImpl implements Xiaoshoujiesuank
 
                 // -------------------- 第三步：更新中间表状态为已导入 --------------------
                 //todo
-                //infXiaoshoujiesuankaipiaoMapper.updateStatusById(inf.getId());
+                infXiaoshoujiesuankaipiaoMapper.updateStatusById(inf.getId());
                 successCount++;
             } catch (Exception e) {
                 failCount++;

src/main/java/com/example/backend/pAndSExe/util/PsExeExcelUtil.java

@@ -275,11 +275,16 @@ public class PsExeExcelUtil {
 
         // 5. 业务字段赋值（适配新列）
         entity.setPfno(trimField(dto.getPfno()));
+        if (dto.getStockname() != null&& !dto.getStockname().isEmpty()) {
         String s = trimField(dto.getStockname());
-        String[] split = s.split("-");
+        if (s.contains("-")) {
 
-        entity.setStockname(split[1]);
-        entity.setStockcode(split[0]);
+            String[] split = s.split("-");
+
+            entity.setStockname(split[1]);
+            entity.setStockcode(split[0]);
+        }else entity.setStockname(s);
+        }
 
         if (dto.getCreateBy() ==null || dto.getCreateBy().isEmpty()){
             String createBy=infExe1Mapper.selectCreateByFromPono(dto.getPfno());
@@ -296,7 +301,7 @@ public class PsExeExcelUtil {
             SimpleDateFormat sdf = new SimpleDateFormat("yy");
             String year = sdf.format(new Date());
             StringBuilder sb = new StringBuilder();
-            StringBuilder rukudanhao = sb.append("POIS").append(year).append(String.format(String.valueOf(id)));
+            StringBuilder rukudanhao = sb.append("POIS").append(year).append(String.format(String.valueOf(id))).append("QC");
             entity.setFno(rukudanhao.toString());
             entity.setFphno(rukudanhao + "-01");
         }else {
@@ -309,10 +314,12 @@ public class PsExeExcelUtil {
         }
         entity.setFmodalid(22);
         // 拆分itemno-sdesc-brand字段
-        String[] itemFields = splitCombinedField(dto.getItemnoSdescBrand());
-        entity.setItemno(itemFields.length >= 1 ? itemFields[0].trim() : null);
-        entity.setSdesc(itemFields.length >= 2 ? itemFields[1].trim() : null);
-        entity.setBrand(itemFields.length >= 3 ? itemFields[2].trim() : null);
+        if (dto.getItemnoSdescBrand() != null&& !dto.getItemnoSdescBrand().isEmpty()) {
+            String[] itemFields = splitCombinedField(dto.getItemnoSdescBrand());
+            entity.setItemno(itemFields.length >= 1 ? itemFields[0].trim() : null);
+            entity.setSdesc(itemFields.length >= 2 ? itemFields[1].trim() : null);
+            entity.setBrand(itemFields.length >= 3 ? itemFields[2].trim() : null);
+        }
 
         entity.setFtype3(trimField(dto.getFtype3()));
         entity.setUt(trimField(dto.getUt()));
@@ -417,11 +424,15 @@ public class PsExeExcelUtil {
 
         // 5. 业务字段赋值（替换pfno为sfno）
         entity.setSfno(trimField(dto.getSfno())); // 销售合同号赋值
+        if (dto.getStockname() != null&& !dto.getStockname().isEmpty()) {
         String s = trimField(dto.getStockname());
-        String[] split = s.split("-");
+        if (s.contains("-")) {
+            String[] split = s.split("-");
 
-        entity.setStockname(split[1]);
-        entity.setStockcode(split[0]);
+            entity.setStockname(split[1]);
+            entity.setStockcode(split[0]);
+        }else entity.setStockname(s);
+        }
 
         // 6. 流水号生成逻辑
         int danhaochongfu = infExe1Mapper.selectFnoBySfnoCount(dto.getSfno());
@@ -433,7 +444,7 @@ public class PsExeExcelUtil {
             SimpleDateFormat sdf = new SimpleDateFormat("yy");
             String year = sdf.format(new Date());
             StringBuilder sb = new StringBuilder();
-            StringBuilder rukudanhao = sb.append("POIS").append(year).append(String.format(String.valueOf(id)));
+            StringBuilder rukudanhao = sb.append("SOOS").append(year).append(String.format(String.valueOf(id))).append("QC");
             entity.setFno(rukudanhao.toString());
             entity.setFphno(rukudanhao + "-01");
         } else {
@@ -447,10 +458,12 @@ public class PsExeExcelUtil {
         entity.setFmodalid(24); //
 
         // 7. 拆分itemno-sdesc-brand字段（与InfExe1一致）
-        String[] itemFields = splitCombinedField(dto.getItemnoSdescBrand());
-        entity.setItemno(itemFields.length >= 1 ? itemFields[0].trim() : null);
-        entity.setSdesc(itemFields.length >= 2 ? itemFields[1].trim() : null);
-        entity.setBrand(itemFields.length >= 3 ? itemFields[2].trim() : null);
+        if (dto.getItemnoSdescBrand() != null&& !dto.getItemnoSdescBrand().isEmpty()) {
+            String[] itemFields = splitCombinedField(dto.getItemnoSdescBrand());
+            entity.setItemno(itemFields.length >= 1 ? itemFields[0].trim() : null);
+            entity.setSdesc(itemFields.length >= 2 ? itemFields[1].trim() : null);
+            entity.setBrand(itemFields.length >= 3 ? itemFields[2].trim() : null);
+        }
 
         // 8. 其余字段赋值（与InfExe1完全一致）
         entity.setFtype3(trimField(dto.getFtype3()));
@@ -538,10 +551,12 @@ public class PsExeExcelUtil {
         // 5. 业务字段赋值（补充trim处理+数值转换，和Sheet1一致）
         entity.setPfno(trimField(dto.getPfno()));
         // 拆分收款/受益人信息（复用Sheet1的拆分方法）
-        String[] payFields = splitCombinedField(dto.getCombinedPaymentInfo());
-        entity.setSupName(payFields.length >= 1 ? payFields[0].trim() : null);
-        entity.setSupBank(payFields.length >= 2 ? payFields[1].trim() : null);
-        entity.setIssuingBankAcc(payFields.length >= 3 ? payFields[2].trim() : null);
+        if (dto.getCombinedPaymentInfo() != null&& !dto.getCombinedPaymentInfo().isEmpty()) {
+            String[] payFields = splitCombinedField(dto.getCombinedPaymentInfo());
+            entity.setSupName(payFields.length >= 1 ? payFields[0].trim() : null);
+            entity.setSupBank(payFields.length >= 2 ? payFields[1].trim() : null);
+            entity.setIssuingBankAcc(payFields.length >= 3 ? payFields[2].trim() : null);
+        }
         entity.setPayType(trimField(dto.getPayType()));
         entity.setPayment(trimField(dto.getPayment()));
         // 申请金额：数值转换（保留2位小数，和Sheet1的金额字段一致）
@@ -656,10 +671,12 @@ public class PsExeExcelUtil {
 
 
         // 拆分收款人组合信息（复用Sheet1/Exe3的拆分方法，按英文逗号","拆分）
-        String[] suppFields = splitCombinedField(dto.getCombinedSuppInfo());
-        entity.setSuppName(suppFields.length >= 1 ? suppFields[0].trim() : null); // 收款人名称
-        entity.setSuppBank(suppFields.length >= 2 ? suppFields[1].trim() : null); // 收款人银行
-        entity.setSuppAcc(suppFields.length >= 3 ? suppFields[2].trim() : null);   // 银行账号
+        if (dto.getCombinedSuppInfo() != null&& !dto.getCombinedSuppInfo().isEmpty()) {
+            String[] suppFields = splitCombinedField(dto.getCombinedSuppInfo());
+            entity.setSuppName(suppFields.length >= 1 ? suppFields[0].trim() : null); // 收款人名称
+            entity.setSuppBank(suppFields.length >= 2 ? suppFields[1].trim() : null); // 收款人银行
+            entity.setSuppAcc(suppFields.length >= 3 ? suppFields[2].trim() : null);   // 银行账号
+        }
 
         entity.setPayment(trimField(dto.getPayment()));       // 付款方式
         entity.setFeeNm(trimField(dto.getFeeNm()));           // 费用名称
@@ -870,15 +887,15 @@ public class PsExeExcelUtil {
         }
 
         // 3. 税额逻辑校验（税额=不含税金额*税率，误差校验）
-        if (dto.getNtPoAmt() != null && dto.getInTaxRate() != null && dto.getTaxAmt() != null) {
+       /* if (dto.getNtPoAmt() != null && dto.getInTaxRate() != null && dto.getTaxAmt() != null) {
             BigDecimal calcTaxAmt = parseBigDecimal(dto.getNtPoAmt(), 6)
-                    .multiply(parseBigDecimal(dto.getInTaxRate(), 6))
+                    .multiply(parseBigDecimal(dto.getInTaxRate(), 6)).multiply(new BigDecimal("0.01"))
                     .setScale(6, RoundingMode.HALF_UP);
             BigDecimal inputTaxAmt = parseBigDecimal(dto.getTaxAmt(), 6);
             if (calcTaxAmt.compareTo(inputTaxAmt) != 0) {
                 errorLogList.add("税额校验失败：不含税金额【" + dto.getNtPoAmt() + "】*税率【" + dto.getInTaxRate() + "】=" + calcTaxAmt + "，与录入税额【" + dto.getTaxAmt() + "】不一致");
             }
-        }
+        }*/
 
         // 4. 构建errorLog字符串（多错误用分号分隔）
         String errorLog = errorLogList.isEmpty() ? "" : String.join("；", errorLogList);
@@ -902,10 +919,12 @@ public class PsExeExcelUtil {
         entity.setTaxInvNo(trimField(dto.getTaxInvNo())); // 发票号码
 
         // 拆分物料编码+物料描述+品牌组合字段
-        String[] itemFields = splitCombinedField(dto.getItemnoSdescBrand());
-        entity.setItemno(itemFields.length >= 1 ? itemFields[0].trim() : null);
-        entity.setSdesc(itemFields.length >= 2 ? itemFields[1].trim() : null);
-        entity.setBrand(itemFields.length >= 3 ? itemFields[2].trim() : null);
+        if (dto.getItemnoSdescBrand() != null&& !dto.getItemnoSdescBrand().isEmpty()) {
+            String[] itemFields = splitCombinedField(dto.getItemnoSdescBrand());
+            entity.setItemno(itemFields.length >= 1 ? itemFields[0].trim() : null);
+            entity.setSdesc(itemFields.length >= 2 ? itemFields[1].trim() : null);
+            entity.setBrand(itemFields.length >= 3 ? itemFields[2].trim() : null);
+        }
 
         // 数值字段转换（DECIMAL(18,6)）
         entity.setQty(parseBigDecimal(dto.getQty(), 6)); // 数量
@@ -1008,12 +1027,20 @@ public class PsExeExcelUtil {
         entity.setAmount(parseBigDecimal(dto.getAmount(), 6)); // 保留6位小数
 
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
-        Date fkdate = Date.from(LocalDate.parse(dto.getFkdate(), formatter).atStartOfDay(ZoneId.systemDefault()).toInstant());
-        Date fdate = Date.from(LocalDate.parse(dto.getFdate(), formatter).atStartOfDay(ZoneId.systemDefault()).toInstant());
-        Date yjfkdate = Date.from(LocalDate.parse(dto.getYjfkdate(), formatter).atStartOfDay(ZoneId.systemDefault()).toInstant());
-        entity.setFkdate(fkdate);
-        entity.setFdate(fdate);
-        entity.setYjfkdate(yjfkdate);
+// 替换分隔符后解析（-、空格 转 /）
+        if (dto.getFkdate()!=null&&!dto.getFkdate().isEmpty()) {
+            Date fkdate = Date.from(LocalDate.parse(dto.getFkdate().trim().replace("-", "/").replace(" ", "/"), formatter).atStartOfDay(ZoneId.systemDefault()).toInstant());
+            entity.setFkdate(fkdate);
+        }
+        if (dto.getFdate()!=null&&!dto.getFdate().isEmpty()) {
+            Date fdate = Date.from(LocalDate.parse(dto.getFdate().trim().replace("-", "/").replace(" ", "/"), formatter).atStartOfDay(ZoneId.systemDefault()).toInstant());
+            entity.setFdate(fdate);
+        }
+        if (dto.getYjfkdate()!=null&&!dto.getYjfkdate().isEmpty()) {
+            Date yjfkdate = Date.from(LocalDate.parse(dto.getYjfkdate().trim().replace("-", "/").replace(" ", "/"), formatter).atStartOfDay(ZoneId.systemDefault()).toInstant());
+            entity.setYjfkdate(yjfkdate);
+        }
+
 
         // 6. 生成流水号（前缀LC+年月+6位自增ID）
         InfExe1Amount infExe1Amount = new InfExe1Amount();
@@ -1055,6 +1082,7 @@ public class PsExeExcelUtil {
             errorLogList.add("客户编号+名称为空");
         } else {
             // 拆分规则：按第一个空格/逗号拆分，左侧为编号，右侧为名称
+
             String[] ctArr = ctNoCtName.split("[,\\s]+", 2);
             if (ctArr.length >= 1) {
                 ctNo = ctArr[0];
@@ -1167,6 +1195,7 @@ public class PsExeExcelUtil {
             errorLogList.add("客户信息（名称+银行+账号+合同名）为空");
         } else {
             // 拆分规则：按【|】分隔（优先），无则按【；】，最后按【，】/空格，最多拆4段
+
             String[] ctArr = ctInfo.split("[,|；，\\s]+", 4);
             if (ctArr.length >= 1) ctName = ctArr[0];
             if (ctArr.length >= 2) ctInvoiceBankName = ctArr[1];