1 修改供应商银行判断sql

src/main/java/com/example/backend/pAndSExe/dto/InfJinxiangfapiaoExcelDTO.java

@@ -21,26 +21,26 @@ public class InfJinxiangfapiaoExcelDTO {
     private String taxInvType;
     @ExcelProperty(index = 5) // C列 - 发票号码
     private String taxInvNo;
-    @ExcelProperty(index = 6) // D列 - 发票号
-    private String invNo;
-    @ExcelProperty(index = 7) // D列 - 物料编码，物料描述，品牌
+/*    @ExcelProperty(index = 6) // D列 - 发票号
+    private String invNo;*/
+    @ExcelProperty(index = 6) // D列 - 物料编码，物料描述，品牌
     private String itemnoSdescBrand;
-    @ExcelProperty(index = 8) // E列 - 数量
+    @ExcelProperty(index = 7) // E列 - 数量
     private Double qty;
-    @ExcelProperty(index = 9)
+    @ExcelProperty(index = 8)
     private Double poPrice;
-    @ExcelProperty(index = 10) // F列 - 不含税单价
+    @ExcelProperty(index = 9) // F列 - 不含税单价
     private Double ntPoPrice;
-    @ExcelProperty(index = 11) // G列 - 单位
+    @ExcelProperty(index = 10) // G列 - 单位
     private String ut;
-    @ExcelProperty(index = 12)
+    @ExcelProperty(index = 11)
     private Double poamt;
-    @ExcelProperty(index = 13) // H列 - 不含税金额
+    @ExcelProperty(index = 12) // H列 - 不含税金额
     private Double ntPoAmt;
-    @ExcelProperty(index = 14) // I列 - 税率
+    @ExcelProperty(index = 13) // I列 - 税率
     private Double inTaxRate;
-    @ExcelProperty(index = 15) // J列 - 税额
+    @ExcelProperty(index = 14) // J列 - 税额
     private Double taxAmt;
-    @ExcelProperty(index = 16) // K列 - 币别
+    @ExcelProperty(index = 15) // K列 - 币别
     private String curcypo;
 }

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

@@ -29,6 +29,7 @@ public interface GongyingshangMapper  extends BaseMapper<Gongyingshang> {
             "        LEFT JOIN (\n" +
             "        SELECT  rid , bankNm , bankAcct , ROW_NUMBER() OVER (PARTITION BY rid ORDER BY id) as row_num\n" +
             "        FROM SGGMIIP.custbank   WHERE NVL(del_flag, 0) != 1\n" +
+            "        and nvl(ctStatus,'')='已准入'\n" +
             "        ) b ON a.id = b.rid AND b.row_num = 1\n" +
             "        left join SGGMIIP.custattn c on a.id = c.rid\n" +
             "        where ifnull(a.del_flag, 0) != 1\n" +

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

@@ -646,12 +646,12 @@ public class PsExeExcelUtil {
                     }else {
                         int i=0;
                         for (Gongyingshang gongyingshang : gongyingshangList) {
-                            if (gongyingshang.getCtBankAcct().equals(strings[2])&&gongyingshang.getCtBankName().equals(strings[1])) {
+                            if (gongyingshang.getCtBankAcct().equals(strings[2])) {
                                 i++;
                             }
                         }
                         if (i==0) {
-                            errorLogList.add("银行名称/账号不存在/匹配");
+                            errorLogList.add("银行账号不存在/匹配/准入");
                         }
                     }
                 }
@@ -792,12 +792,12 @@ public class PsExeExcelUtil {
                     }else {
                         int i=0;
                         for (Gongyingshang gongyingshang : gongyingshangList) {
-                            if (gongyingshang.getCtBankAcct().equals(strings[2])&&gongyingshang.getCtBankName().equals(strings[1])) {
+                            if (gongyingshang.getCtBankAcct().equals(strings[2])) {
                                 i++;
                             }
                         }
                         if (i==0) {
-                            errorLogList.add("银行名称/账号不存在/匹配");
+                            errorLogList.add("银行账号不存在/匹配/准入");
                         }
                     }
                 }
@@ -1067,9 +1067,9 @@ public class PsExeExcelUtil {
         if (dto.getTaxInvNo() == null || dto.getTaxInvNo().isEmpty()) {
             errorLogList.add("税票号码为空");
         }
-        if (dto.getInvNo()==null|| dto.getInvNo().isEmpty()) {
+/*        if (dto.getInvNo()==null|| dto.getInvNo().isEmpty()) {
             errorLogList.add("发票号码为空");
-        }
+        }*/
 
         if (dto.getItemnoSdescBrand() != null&& !dto.getItemnoSdescBrand().isEmpty()) {
             String[] itemFields = splitCombinedField(dto.getItemnoSdescBrand());
@@ -1136,7 +1136,8 @@ public class PsExeExcelUtil {
             String createBy=infExe1Mapper.selectCreateByFromPono(dto.getPono());
             entity.setCreateBy(createBy);
         }
-        entity.setInvNo(dto.getInvNo());
+
+        //entity.setInvNo(dto.getInvNo());
 
         entity.setDataStatus(errorLog.isEmpty() ? "0" : "9"); // 0=有效，9=无效
         entity.setErrorLog(errorLog); // 错误日志
@@ -1459,12 +1460,12 @@ public class PsExeExcelUtil {
                         }else {
                             int i=0;
                             for (Gongyingshang gongyingshang : gongyingshangList) {
-                                if (gongyingshang.getCtBankAcct().equals(ctInvoiceBankAcct)&&gongyingshang.getCtBankName().equals(ctInvoiceBankName)&&gongyingshang.getCtContNm().equals(ctContNm)) {
+                                if (gongyingshang.getCtBankAcct().equals(ctInvoiceBankAcct)&&gongyingshang.getCtContNm().equals(ctContNm)) {
                                     i++;
                                 }
                             }
                             if (i==0) {
-                                errorLogList.add("银行名称/账号/收票人不存在/匹配");
+                                errorLogList.add("银行名称/账号/收票人不存在/匹配/准入");
                             }
                         }
                     }
@@ -1773,7 +1774,7 @@ public class PsExeExcelUtil {
                         }else {
                             int i=0;
                             for (Gongyingshang gongyingshang : gongyingshangList) {
-                                if (gongyingshang.getCtBankAcct().equals(ctInvoiceBankAcct)&&gongyingshang.getCtBankName().equals(ctInvoiceBankName)&&gongyingshang.getCtContNm().equals(ctContNm)) {
+                                if (gongyingshang.getCtBankAcct().equals(ctInvoiceBankAcct)&&gongyingshang.getCtContNm().equals(ctContNm)) {
                                     i++;
                                 }
                             }