From 2e03cc07776e523b1798978a1649a57ab5ce23b6 Mon Sep 17 00:00:00 2001 From: liupopo Date: Fri, 7 Apr 2023 19:13:16 +0800 Subject: [PATCH] 11 --- .../PurchaseRequisitionCheckVo.java | 2 +- .../SupplierBankInfoService.java | 48 +++++++++++++++++-- .../supplierindex/SupplierIndexService.java | 8 +++- 3 files changed, 52 insertions(+), 6 deletions(-) diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java index 88923fe4..091f563b 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/PurchaseRequisitionCheckVo.java @@ -16,7 +16,7 @@ public class PurchaseRequisitionCheckVo { private String supplierName; private String supplierCodeUnified; - private int resState = 0; // 0=正常；1=无供应商信息；2=供应商编码不符；3=有在途 + private int resState = 0; // 0=正常；1=无供应商信息；2=供应商编码不符；3=有在途；4=供应商索引编码重复；5=没有对应订单 private String msg; public String getPrSid() { diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java index 7a0e4eb9..e328ee13 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierbankinfo/SupplierBankInfoService.java @@ -37,7 +37,6 @@ import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisition; import com.yxt.supervise.customer.api.supplierbankinfo.*; import com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoDto; import com.yxt.supervise.customer.api.supplierindex.SupplierIndex; -import com.yxt.supervise.customer.api.supplierindex.SupplierIndexQuery; import com.yxt.supervise.customer.biz.purchaserequisition.PurchaseRequisitionService; import com.yxt.supervise.customer.biz.suppliercontractinfo.SupplierContractInfoService; import com.yxt.supervise.customer.biz.supplierindex.SupplierIndexService; @@ -253,13 +252,47 @@ public class SupplierBankInfoService extends MybatisBaseService checkPurchaseRequisition(String purchaseRequisitionSid) { List list = new ArrayList<>(); PurchaseRequisition pr = purchaseRequisitionService.fetchBySid(purchaseRequisitionSid); - if (pr == null) + if (pr == null) { + PurchaseRequisitionCheckVo vo = new PurchaseRequisitionCheckVo(purchaseRequisitionSid, "", 5); + vo.setMsg("没有对应采购订单"); + list.add(vo); return list; + } + String prCode = pr.getCode(); + String prSid = pr.getSid(); String supplierCode = pr.getSupplierCode(); String supplierName = pr.getSupplierName(); String supplierOnlyCode = pr.getSupplierOnlyCode(); - SupplierIndex si = supplierIndexService.fetchbyCode(supplierCode); + List silist = supplierIndexService.listByCode(supplierCode); + if (silist != null && silist.size() > 1) { + PurchaseRequisitionCheckVo vo = new PurchaseRequisitionCheckVo(prSid, prCode, 4); + vo.setSupplierCode(supplierCode); + vo.setSupplierName(supplierName); + vo.setSupplierCodeUnified(supplierOnlyCode); + vo.setMsg("【" + supplierCode + "】在索引表中有重复值"); + list.add(vo); + return list; + } + + if (silist == null || silist.isEmpty()) { + SupplierBankInfo sbi = this.fetchByName(supplierName); + if (sbi == null) { + PurchaseRequisitionCheckVo vo = new PurchaseRequisitionCheckVo(prSid, prCode, 1); + vo.setSupplierCode(supplierCode); + vo.setSupplierName(supplierName); + vo.setSupplierCodeUnified(supplierOnlyCode); + vo.setMsg("没有该供应商信息"); + list.add(vo); + return list; + } else { + String sbiCodeUnified = sbi.getCodeUnified(); + String sbiSid = sbi.getSid(); + + } + } + + SupplierIndex si = null; if (si == null) { } @@ -268,6 +301,15 @@ public class SupplierBankInfoService extends MybatisBaseService qw = new QueryWrapper<>(); + qw.eq("name", supplierName); + List list = baseMapper.selectList(qw); + if (list == null || list.isEmpty()) + return null; + return list.get(0); + } + public void checkInTransitByUniCode(String supplierOnlyCode) { } diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java index b10cbd30..2e48fe56 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/supplierindex/SupplierIndexService.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; @@ -115,9 +114,14 @@ public class SupplierIndexService extends ServiceImpl qw = new QueryWrapper<>(); qw.eq("code", supplierCode); return baseMapper.selectOne(qw); } + public List listByCode(String supplierCode) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("code", supplierCode); + return baseMapper.selectList(qw); + } }