1 修改大量逻辑

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.backend.pAndSExe.model.Gongyingshang;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 public interface GongyingshangMapper  extends BaseMapper<Gongyingshang> {
 
     @Select("select a.id, a.fno,a.rptg,a.ctCnNm,a.ctEnNm,\n" +
@@ -34,8 +36,8 @@ public interface GongyingshangMapper  extends BaseMapper<Gongyingshang> {
             "        and nvl(ctStatus,'')='已准入'\n" +
             "        and a.ctCnNm = #{ctName}\n" +
             "        order by a.fno\n" +
-            "        limit 1")
-    Gongyingshang selectGongyingshangByName(String ctName);
+            "        ")
+        List<Gongyingshang> selectGongyingshangByName(String ctName);
 
     @Select(" select a.id, a.fno,a.rptg,a.ctCnNm,a.ctEnNm,\n" +
             "        case\n" +

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

@@ -150,6 +150,7 @@ public class DailijiesuanSettleServiceImpl implements DailijiesuanSettleService
                 settleProdDtl3.setAcctSet(salesOrder.getAcctSet());
                 settleProdDtl3.setCtName(salesOrder.getCtName());
                 settleProdDtl3.setCtNo(salesOrder.getCtNo());
+                settleProdDtl3.setSoOrderNo(inf.getSono());
 
 
 
@@ -170,6 +171,7 @@ public class DailijiesuanSettleServiceImpl implements DailijiesuanSettleService
                 salesInvDtl.setNtSoAmt(inf.getNtSoAmt());
 
 
+
                 salesInvDtlMapper.insert(salesInvDtl);
 
                 saleSettle3Mapper.insertDLID(settleId);

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

@@ -63,6 +63,8 @@ public class DaodandengjiSettleServiceImpl implements DaodandengjiSettleService
                 lcctrl.setCreateByName(s);
                 lcctrl.setCreateTime(new Date());
                 lcctrl.setUpdateTime(new Date());
+                lcctrl.setPlaced("2");
+
 
                 // 插入业务表
                 lcctrlMapper.insert(lcctrl);

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

@@ -98,7 +98,7 @@ public class XiaoshoujiesuankaipiaoSettleServiceImpl implements Xiaoshoujiesuank
                 saleSettle.setTrdCtry(salesOrder.getTrdCtry());
                 saleSettle.setPayment(salesOrder.getPayment());
                 saleSettle.setTradeway(salesOrder.getTradeway());
-                saleSettle.setSoOrderNo(salesOrder.getFno());
+                saleSettle.setSoOrderNo(inf.getSono());
                 saleSettle.setQtyOver(salesOrder.getQtyOver());
                 saleSettle.setQtyShort(salesOrder.getQtyShort());
                 saleSettle.setAmtOver(salesOrder.getAmtOver());
@@ -172,6 +172,7 @@ public class XiaoshoujiesuankaipiaoSettleServiceImpl implements Xiaoshoujiesuank
                 settleProdDtl.setAcctSet(salesOrder.getAcctSet());
                 settleProdDtl.setCtName(salesOrder.getCtName());
                 settleProdDtl.setCtNo(salesOrder.getCtNo());
+                settleProdDtl.setSoOrderNo(inf.getSono());
 
                 settleProdDtlMapper.insert(settleProdDtl);
 

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

@@ -629,19 +629,26 @@ public class PsExeExcelUtil {
             if (strings.length<3) {
                 errorLogList.add("收款人名称+收款人银行+银行账号格式不正确");
             }else {
-                Gongyingshang gongyingshang = gongyingshangMapper.selectGongyingshangByName(strings[0]);
-                if (gongyingshang == null) {
+                List<Gongyingshang> gongyingshangList = gongyingshangMapper.selectGongyingshangByName(strings[0]);
+                if (gongyingshangList==null|| gongyingshangList.isEmpty()) {
                     errorLogList.add("供应商名称没有审批通过,需要先申请供应商; ");
-                }
-                else if ("无".equals(strings[1]) || "无".equals(strings[2]) || "".equals(gongyingshang.getCtBankAcct())||gongyingshang.getCtBankAcct()==null) {
-                    errorLogList.add("银行名称/账号为空，需要申请客商银行信息");
+                }else {
+                    if ("无".equals(strings[1]) || "无".equals(strings[2])){
+                        errorLogList.add("银行名称/账号为空，需要申请客商银行信息");
+                    }else {
+                        int i=0;
+                        for (Gongyingshang gongyingshang : gongyingshangList) {
+                            if (gongyingshang.getCtBankAcct().equals(strings[2])&&gongyingshang.getCtBankName().equals(strings[1])) {
+                                i++;
+                            }
+                        }
+                        if (i==0) {
+                            errorLogList.add("银行名称/账号不存在/匹配");
+                        }
+                    }
                 }
             }
-
-
         }
-
-
         // 付款类型：非空校验
         if (dto.getPayType() == null || dto.getPayType().isEmpty()) {
             errorLogList.add("付款类型为空");
@@ -768,12 +775,23 @@ public class PsExeExcelUtil {
             if (strings.length<3) {
                 errorLogList.add("收款人名称+收款人银行+银行账号格式不正确");
             }else {
-                Gongyingshang gongyingshang = gongyingshangMapper.selectGongyingshangByName(strings[0]);
-                if (gongyingshang == null) {
+                List<Gongyingshang> gongyingshangList = gongyingshangMapper.selectGongyingshangByName(strings[0]);
+                if (gongyingshangList==null|| gongyingshangList.isEmpty()) {
                     errorLogList.add("供应商名称没有审批通过,需要先申请供应商; ");
-                }
-                else if ("无".equals(strings[1]) || "无".equals(strings[2]) || "".equals(gongyingshang.getCtBankAcct())||gongyingshang.getCtBankAcct()==null) {
-                    errorLogList.add("银行名称/账号为空，需要申请客商银行信息");
+                }else {
+                    if ("无".equals(strings[1]) || "无".equals(strings[2])){
+                        errorLogList.add("银行名称/账号为空，需要申请客商银行信息");
+                    }else {
+                        int i=0;
+                        for (Gongyingshang gongyingshang : gongyingshangList) {
+                            if (gongyingshang.getCtBankAcct().equals(strings[2])&&gongyingshang.getCtBankName().equals(strings[1])) {
+                                i++;
+                            }
+                        }
+                        if (i==0) {
+                            errorLogList.add("银行名称/账号不存在/匹配");
+                        }
+                    }
                 }
             }
 
@@ -1404,7 +1422,7 @@ public class PsExeExcelUtil {
         String ctInvoiceBankAcct = "";
         String ctContNm = "";
         if (ctInfo.isEmpty()) {
-            errorLogList.add("客户信息（名称+银行+账号+合同名）为空");
+            errorLogList.add("客户信息（名称+银行+账号+客户收票人）为空");
         } else {
             // 拆分规则：按【|】分隔（优先），无则按【；】，最后按【，】/空格，最多拆4段
 
@@ -1415,19 +1433,29 @@ public class PsExeExcelUtil {
             if (ctArr.length >= 4) ctContNm = ctArr[3].trim();
             // 核心字段校验：客户名称不能为空
             if (ctArr.length<4){
-                errorLogList.add("客户信息（名称+银行+账号+合同名）格式错误");
-            }else if (ctName.isEmpty()) {
-                errorLogList.add("客户名称解析失败，原始值：" + ctInfo);
-            }
-            if (ctName.isEmpty()) {
-                errorLogList.add("客户名称解析失败，原始值：" + ctInfo);
+                errorLogList.add("客户信息（名称+银行+账号+客户收票人）格式错误");
             }else {
-                Gongyingshang gongyingshang = gongyingshangMapper.selectGongyingshangByName(ctName);
-                if (gongyingshang == null) {
-                    errorLogList.add("供应商没有,需要先申请供应商; ");
-                }
-                else if ("无".equals(ctInvoiceBankName)||"无".equals(ctInvoiceBankAcct)|| "".equals(gongyingshang.getCtBankAcct())||gongyingshang.getCtBankAcct()==null) {
-                    errorLogList.add("银行名称/账号为空，需要申请客商银行信息");
+                if (ctName.isEmpty()) {
+                    errorLogList.add("客户名称解析失败，原始值：" + ctInfo);
+                } else {
+                    List<Gongyingshang> gongyingshangList = gongyingshangMapper.selectGongyingshangByName(ctName);
+                    if (gongyingshangList==null|| gongyingshangList.isEmpty()) {
+                        errorLogList.add("供应商名称没有审批通过,需要先申请供应商; ");
+                    }else {
+                        if ("无".equals(ctInvoiceBankName) || "无".equals(ctInvoiceBankAcct)){
+                            errorLogList.add("银行名称/账号为空，需要申请客商银行信息");
+                        }else {
+                            int i=0;
+                            for (Gongyingshang gongyingshang : gongyingshangList) {
+                                if (gongyingshang.getCtBankAcct().equals(ctInvoiceBankAcct)&&gongyingshang.getCtBankName().equals(ctInvoiceBankName)&&gongyingshang.getCtContNm().equals(ctContNm)) {
+                                    i++;
+                                }
+                            }
+                            if (i==0) {
+                                errorLogList.add("银行名称/账号/收票人不存在/匹配");
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -1719,19 +1747,29 @@ public class PsExeExcelUtil {
             if (ctArr.length >= 4) ctContNm = ctArr[3];
             // 核心字段校验：客户名称不能为空
             if (ctArr.length<4){
-                errorLogList.add("客户信息（名称+银行+账号+合同名）格式错误");
-            }else if (ctName.isEmpty()) {
-                errorLogList.add("客户名称解析失败，原始值：" + ctInfo);
-            }
-            if (ctName.isEmpty()) {
-                errorLogList.add("客户名称解析失败，原始值：" + ctInfo);
+                errorLogList.add("客户信息（名称+银行+账号+客户收票人）格式错误");
             }else {
-                Gongyingshang gongyingshang = gongyingshangMapper.selectGongyingshangByName(ctName);
-                if (gongyingshang == null) {
-                    errorLogList.add("供应商没有,需要先申请供应商; ");
-                }
-                else if ("无".equals(ctInvoiceBankName)||"无".equals(ctInvoiceBankAcct)|| "".equals(gongyingshang.getCtBankAcct())||gongyingshang.getCtBankAcct()==null) {
-                    errorLogList.add("银行名称/账号为空，需要申请客商银行信息");
+                if (ctName.isEmpty()) {
+                    errorLogList.add("客户名称解析失败，原始值：" + ctInfo);
+                } else {
+                    List<Gongyingshang> gongyingshangList = gongyingshangMapper.selectGongyingshangByName(ctName);
+                    if (gongyingshangList==null|| gongyingshangList.isEmpty()) {
+                        errorLogList.add("供应商名称没有审批通过,需要先申请供应商; ");
+                    }else {
+                        if ("无".equals(ctInvoiceBankName) || "无".equals(ctInvoiceBankAcct)){
+                            errorLogList.add("银行名称/账号为空，需要申请客商银行信息");
+                        }else {
+                            int i=0;
+                            for (Gongyingshang gongyingshang : gongyingshangList) {
+                                if (gongyingshang.getCtBankAcct().equals(ctInvoiceBankAcct)&&gongyingshang.getCtBankName().equals(ctInvoiceBankName)&&gongyingshang.getCtContNm().equals(ctContNm)) {
+                                    i++;
+                                }
+                            }
+                            if (i==0) {
+                                errorLogList.add("银行名称/账号/收票人不存在/匹配");
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -1839,7 +1877,7 @@ public class PsExeExcelUtil {
         entity.setDataStatus(errorLog.isEmpty() ? "0" : "9");
         entity.setErrorLog(errorLog);
         entity.setCreateTime(new Date());
-
+        entity.setSono(dto.getSono());
         // 5. 业务字段赋值
         entity.setInvoiceSort(invoiceSort);
         entity.setCtName(ctName);