Browse Source

1 修改大量逻辑

11816 3 months ago
parent
commit
7b485e7bc4

+ 4
- 2
src/main/java/com/example/backend/pAndSExe/mapper/GongyingshangMapper.java View File

4
 import com.example.backend.pAndSExe.model.Gongyingshang;
4
 import com.example.backend.pAndSExe.model.Gongyingshang;
5
 import org.apache.ibatis.annotations.Select;
5
 import org.apache.ibatis.annotations.Select;
6
 
6
 
7
+import java.util.List;
8
+
7
 public interface GongyingshangMapper  extends BaseMapper<Gongyingshang> {
9
 public interface GongyingshangMapper  extends BaseMapper<Gongyingshang> {
8
 
10
 
9
     @Select("select a.id, a.fno,a.rptg,a.ctCnNm,a.ctEnNm,\n" +
11
     @Select("select a.id, a.fno,a.rptg,a.ctCnNm,a.ctEnNm,\n" +
34
             "        and nvl(ctStatus,'')='已准入'\n" +
36
             "        and nvl(ctStatus,'')='已准入'\n" +
35
             "        and a.ctCnNm = #{ctName}\n" +
37
             "        and a.ctCnNm = #{ctName}\n" +
36
             "        order by a.fno\n" +
38
             "        order by a.fno\n" +
37
-            "        limit 1")
38
-    Gongyingshang selectGongyingshangByName(String ctName);
39
+            "        ")
40
+        List<Gongyingshang> selectGongyingshangByName(String ctName);
39
 
41
 
40
     @Select(" select a.id, a.fno,a.rptg,a.ctCnNm,a.ctEnNm,\n" +
42
     @Select(" select a.id, a.fno,a.rptg,a.ctCnNm,a.ctEnNm,\n" +
41
             "        case\n" +
43
             "        case\n" +

+ 2
- 0
src/main/java/com/example/backend/pAndSExe/service/impl/DailijiesuanSettleServiceImpl.java View File

150
                 settleProdDtl3.setAcctSet(salesOrder.getAcctSet());
150
                 settleProdDtl3.setAcctSet(salesOrder.getAcctSet());
151
                 settleProdDtl3.setCtName(salesOrder.getCtName());
151
                 settleProdDtl3.setCtName(salesOrder.getCtName());
152
                 settleProdDtl3.setCtNo(salesOrder.getCtNo());
152
                 settleProdDtl3.setCtNo(salesOrder.getCtNo());
153
+                settleProdDtl3.setSoOrderNo(inf.getSono());
153
 
154
 
154
 
155
 
155
 
156
 
170
                 salesInvDtl.setNtSoAmt(inf.getNtSoAmt());
171
                 salesInvDtl.setNtSoAmt(inf.getNtSoAmt());
171
 
172
 
172
 
173
 
174
+
173
                 salesInvDtlMapper.insert(salesInvDtl);
175
                 salesInvDtlMapper.insert(salesInvDtl);
174
 
176
 
175
                 saleSettle3Mapper.insertDLID(settleId);
177
                 saleSettle3Mapper.insertDLID(settleId);

+ 2
- 0
src/main/java/com/example/backend/pAndSExe/service/impl/DaodandengjiSettleServiceImpl.java View File

63
                 lcctrl.setCreateByName(s);
63
                 lcctrl.setCreateByName(s);
64
                 lcctrl.setCreateTime(new Date());
64
                 lcctrl.setCreateTime(new Date());
65
                 lcctrl.setUpdateTime(new Date());
65
                 lcctrl.setUpdateTime(new Date());
66
+                lcctrl.setPlaced("2");
67
+
66
 
68
 
67
                 // 插入业务表
69
                 // 插入业务表
68
                 lcctrlMapper.insert(lcctrl);
70
                 lcctrlMapper.insert(lcctrl);

+ 2
- 1
src/main/java/com/example/backend/pAndSExe/service/impl/XiaoshoujiesuankaipiaoSettleServiceImpl.java View File

98
                 saleSettle.setTrdCtry(salesOrder.getTrdCtry());
98
                 saleSettle.setTrdCtry(salesOrder.getTrdCtry());
99
                 saleSettle.setPayment(salesOrder.getPayment());
99
                 saleSettle.setPayment(salesOrder.getPayment());
100
                 saleSettle.setTradeway(salesOrder.getTradeway());
100
                 saleSettle.setTradeway(salesOrder.getTradeway());
101
-                saleSettle.setSoOrderNo(salesOrder.getFno());
101
+                saleSettle.setSoOrderNo(inf.getSono());
102
                 saleSettle.setQtyOver(salesOrder.getQtyOver());
102
                 saleSettle.setQtyOver(salesOrder.getQtyOver());
103
                 saleSettle.setQtyShort(salesOrder.getQtyShort());
103
                 saleSettle.setQtyShort(salesOrder.getQtyShort());
104
                 saleSettle.setAmtOver(salesOrder.getAmtOver());
104
                 saleSettle.setAmtOver(salesOrder.getAmtOver());
172
                 settleProdDtl.setAcctSet(salesOrder.getAcctSet());
172
                 settleProdDtl.setAcctSet(salesOrder.getAcctSet());
173
                 settleProdDtl.setCtName(salesOrder.getCtName());
173
                 settleProdDtl.setCtName(salesOrder.getCtName());
174
                 settleProdDtl.setCtNo(salesOrder.getCtNo());
174
                 settleProdDtl.setCtNo(salesOrder.getCtNo());
175
+                settleProdDtl.setSoOrderNo(inf.getSono());
175
 
176
 
176
                 settleProdDtlMapper.insert(settleProdDtl);
177
                 settleProdDtlMapper.insert(settleProdDtl);
177
 
178
 

+ 78
- 40
src/main/java/com/example/backend/pAndSExe/util/PsExeExcelUtil.java View File

629
             if (strings.length<3) {
629
             if (strings.length<3) {
630
                 errorLogList.add("收款人名称+收款人银行+银行账号格式不正确");
630
                 errorLogList.add("收款人名称+收款人银行+银行账号格式不正确");
631
             }else {
631
             }else {
632
-                Gongyingshang gongyingshang = gongyingshangMapper.selectGongyingshangByName(strings[0]);
633
-                if (gongyingshang == null) {
632
+                List<Gongyingshang> gongyingshangList = gongyingshangMapper.selectGongyingshangByName(strings[0]);
633
+                if (gongyingshangList==null|| gongyingshangList.isEmpty()) {
634
                     errorLogList.add("供应商名称没有审批通过,需要先申请供应商; ");
634
                     errorLogList.add("供应商名称没有审批通过,需要先申请供应商; ");
635
-                }
636
-                else if ("无".equals(strings[1]) || "无".equals(strings[2]) || "".equals(gongyingshang.getCtBankAcct())||gongyingshang.getCtBankAcct()==null) {
637
-                    errorLogList.add("银行名称/账号为空,需要申请客商银行信息");
635
+                }else {
636
+                    if ("无".equals(strings[1]) || "无".equals(strings[2])){
637
+                        errorLogList.add("银行名称/账号为空,需要申请客商银行信息");
638
+                    }else {
639
+                        int i=0;
640
+                        for (Gongyingshang gongyingshang : gongyingshangList) {
641
+                            if (gongyingshang.getCtBankAcct().equals(strings[2])&&gongyingshang.getCtBankName().equals(strings[1])) {
642
+                                i++;
643
+                            }
644
+                        }
645
+                        if (i==0) {
646
+                            errorLogList.add("银行名称/账号不存在/匹配");
647
+                        }
648
+                    }
638
                 }
649
                 }
639
             }
650
             }
640
-
641
-
642
         }
651
         }
643
-
644
-
645
         // 付款类型:非空校验
652
         // 付款类型:非空校验
646
         if (dto.getPayType() == null || dto.getPayType().isEmpty()) {
653
         if (dto.getPayType() == null || dto.getPayType().isEmpty()) {
647
             errorLogList.add("付款类型为空");
654
             errorLogList.add("付款类型为空");
768
             if (strings.length<3) {
775
             if (strings.length<3) {
769
                 errorLogList.add("收款人名称+收款人银行+银行账号格式不正确");
776
                 errorLogList.add("收款人名称+收款人银行+银行账号格式不正确");
770
             }else {
777
             }else {
771
-                Gongyingshang gongyingshang = gongyingshangMapper.selectGongyingshangByName(strings[0]);
772
-                if (gongyingshang == null) {
778
+                List<Gongyingshang> gongyingshangList = gongyingshangMapper.selectGongyingshangByName(strings[0]);
779
+                if (gongyingshangList==null|| gongyingshangList.isEmpty()) {
773
                     errorLogList.add("供应商名称没有审批通过,需要先申请供应商; ");
780
                     errorLogList.add("供应商名称没有审批通过,需要先申请供应商; ");
774
-                }
775
-                else if ("无".equals(strings[1]) || "无".equals(strings[2]) || "".equals(gongyingshang.getCtBankAcct())||gongyingshang.getCtBankAcct()==null) {
776
-                    errorLogList.add("银行名称/账号为空,需要申请客商银行信息");
781
+                }else {
782
+                    if ("无".equals(strings[1]) || "无".equals(strings[2])){
783
+                        errorLogList.add("银行名称/账号为空,需要申请客商银行信息");
784
+                    }else {
785
+                        int i=0;
786
+                        for (Gongyingshang gongyingshang : gongyingshangList) {
787
+                            if (gongyingshang.getCtBankAcct().equals(strings[2])&&gongyingshang.getCtBankName().equals(strings[1])) {
788
+                                i++;
789
+                            }
790
+                        }
791
+                        if (i==0) {
792
+                            errorLogList.add("银行名称/账号不存在/匹配");
793
+                        }
794
+                    }
777
                 }
795
                 }
778
             }
796
             }
779
 
797
 
1404
         String ctInvoiceBankAcct = "";
1422
         String ctInvoiceBankAcct = "";
1405
         String ctContNm = "";
1423
         String ctContNm = "";
1406
         if (ctInfo.isEmpty()) {
1424
         if (ctInfo.isEmpty()) {
1407
-            errorLogList.add("客户信息(名称+银行+账号+合同名)为空");
1425
+            errorLogList.add("客户信息(名称+银行+账号+客户收票人)为空");
1408
         } else {
1426
         } else {
1409
             // 拆分规则:按【|】分隔(优先),无则按【;】,最后按【,】/空格,最多拆4段
1427
             // 拆分规则:按【|】分隔(优先),无则按【;】,最后按【,】/空格,最多拆4段
1410
 
1428
 
1415
             if (ctArr.length >= 4) ctContNm = ctArr[3].trim();
1433
             if (ctArr.length >= 4) ctContNm = ctArr[3].trim();
1416
             // 核心字段校验:客户名称不能为空
1434
             // 核心字段校验:客户名称不能为空
1417
             if (ctArr.length<4){
1435
             if (ctArr.length<4){
1418
-                errorLogList.add("客户信息(名称+银行+账号+合同名)格式错误");
1419
-            }else if (ctName.isEmpty()) {
1420
-                errorLogList.add("客户名称解析失败,原始值:" + ctInfo);
1421
-            }
1422
-            if (ctName.isEmpty()) {
1423
-                errorLogList.add("客户名称解析失败,原始值:" + ctInfo);
1436
+                errorLogList.add("客户信息(名称+银行+账号+客户收票人)格式错误");
1424
             }else {
1437
             }else {
1425
-                Gongyingshang gongyingshang = gongyingshangMapper.selectGongyingshangByName(ctName);
1426
-                if (gongyingshang == null) {
1427
-                    errorLogList.add("供应商没有,需要先申请供应商; ");
1428
-                }
1429
-                else if ("无".equals(ctInvoiceBankName)||"无".equals(ctInvoiceBankAcct)|| "".equals(gongyingshang.getCtBankAcct())||gongyingshang.getCtBankAcct()==null) {
1430
-                    errorLogList.add("银行名称/账号为空,需要申请客商银行信息");
1438
+                if (ctName.isEmpty()) {
1439
+                    errorLogList.add("客户名称解析失败,原始值:" + ctInfo);
1440
+                } else {
1441
+                    List<Gongyingshang> gongyingshangList = gongyingshangMapper.selectGongyingshangByName(ctName);
1442
+                    if (gongyingshangList==null|| gongyingshangList.isEmpty()) {
1443
+                        errorLogList.add("供应商名称没有审批通过,需要先申请供应商; ");
1444
+                    }else {
1445
+                        if ("无".equals(ctInvoiceBankName) || "无".equals(ctInvoiceBankAcct)){
1446
+                            errorLogList.add("银行名称/账号为空,需要申请客商银行信息");
1447
+                        }else {
1448
+                            int i=0;
1449
+                            for (Gongyingshang gongyingshang : gongyingshangList) {
1450
+                                if (gongyingshang.getCtBankAcct().equals(ctInvoiceBankAcct)&&gongyingshang.getCtBankName().equals(ctInvoiceBankName)&&gongyingshang.getCtContNm().equals(ctContNm)) {
1451
+                                    i++;
1452
+                                }
1453
+                            }
1454
+                            if (i==0) {
1455
+                                errorLogList.add("银行名称/账号/收票人不存在/匹配");
1456
+                            }
1457
+                        }
1458
+                    }
1431
                 }
1459
                 }
1432
             }
1460
             }
1433
         }
1461
         }
1719
             if (ctArr.length >= 4) ctContNm = ctArr[3];
1747
             if (ctArr.length >= 4) ctContNm = ctArr[3];
1720
             // 核心字段校验:客户名称不能为空
1748
             // 核心字段校验:客户名称不能为空
1721
             if (ctArr.length<4){
1749
             if (ctArr.length<4){
1722
-                errorLogList.add("客户信息(名称+银行+账号+合同名)格式错误");
1723
-            }else if (ctName.isEmpty()) {
1724
-                errorLogList.add("客户名称解析失败,原始值:" + ctInfo);
1725
-            }
1726
-            if (ctName.isEmpty()) {
1727
-                errorLogList.add("客户名称解析失败,原始值:" + ctInfo);
1750
+                errorLogList.add("客户信息(名称+银行+账号+客户收票人)格式错误");
1728
             }else {
1751
             }else {
1729
-                Gongyingshang gongyingshang = gongyingshangMapper.selectGongyingshangByName(ctName);
1730
-                if (gongyingshang == null) {
1731
-                    errorLogList.add("供应商没有,需要先申请供应商; ");
1732
-                }
1733
-                else if ("无".equals(ctInvoiceBankName)||"无".equals(ctInvoiceBankAcct)|| "".equals(gongyingshang.getCtBankAcct())||gongyingshang.getCtBankAcct()==null) {
1734
-                    errorLogList.add("银行名称/账号为空,需要申请客商银行信息");
1752
+                if (ctName.isEmpty()) {
1753
+                    errorLogList.add("客户名称解析失败,原始值:" + ctInfo);
1754
+                } else {
1755
+                    List<Gongyingshang> gongyingshangList = gongyingshangMapper.selectGongyingshangByName(ctName);
1756
+                    if (gongyingshangList==null|| gongyingshangList.isEmpty()) {
1757
+                        errorLogList.add("供应商名称没有审批通过,需要先申请供应商; ");
1758
+                    }else {
1759
+                        if ("无".equals(ctInvoiceBankName) || "无".equals(ctInvoiceBankAcct)){
1760
+                            errorLogList.add("银行名称/账号为空,需要申请客商银行信息");
1761
+                        }else {
1762
+                            int i=0;
1763
+                            for (Gongyingshang gongyingshang : gongyingshangList) {
1764
+                                if (gongyingshang.getCtBankAcct().equals(ctInvoiceBankAcct)&&gongyingshang.getCtBankName().equals(ctInvoiceBankName)&&gongyingshang.getCtContNm().equals(ctContNm)) {
1765
+                                    i++;
1766
+                                }
1767
+                            }
1768
+                            if (i==0) {
1769
+                                errorLogList.add("银行名称/账号/收票人不存在/匹配");
1770
+                            }
1771
+                        }
1772
+                    }
1735
                 }
1773
                 }
1736
             }
1774
             }
1737
         }
1775
         }
1839
         entity.setDataStatus(errorLog.isEmpty() ? "0" : "9");
1877
         entity.setDataStatus(errorLog.isEmpty() ? "0" : "9");
1840
         entity.setErrorLog(errorLog);
1878
         entity.setErrorLog(errorLog);
1841
         entity.setCreateTime(new Date());
1879
         entity.setCreateTime(new Date());
1842
-
1880
+        entity.setSono(dto.getSono());
1843
         // 5. 业务字段赋值
1881
         // 5. 业务字段赋值
1844
         entity.setInvoiceSort(invoiceSort);
1882
         entity.setInvoiceSort(invoiceSort);
1845
         entity.setCtName(ctName);
1883
         entity.setCtName(ctName);

Loading…
Cancel
Save