diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java new file mode 100644 index 00000000..38c52534 --- /dev/null +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/purchaserequisitionpro/InTransitCheckVo.java @@ -0,0 +1,49 @@ +package com.yxt.supervise.customer.api.purchaserequisitionpro; + +public class InTransitCheckVo { + + public InTransitCheckVo() { + } + + public InTransitCheckVo(String supplierOnlyCode ) { + this.supplierOnlyCode = supplierOnlyCode; +// this.supplierName = supplierName; + } + + private String supplierOnlyCode; +// private String supplierName; + private double orderAmount = 0.0; + private double instorageAmount = 0.0; + + public String getSupplierOnlyCode() { + return supplierOnlyCode; + } + + public void setSupplierOnlyCode(String supplierOnlyCode) { + this.supplierOnlyCode = supplierOnlyCode; + } + +// public String getSupplierName() { +// return supplierName; +// } +// +// public void setSupplierName(String supplierName) { +// this.supplierName = supplierName; +// } + + public double getOrderAmount() { + return orderAmount; + } + + public void setOrderAmount(double orderAmount) { + this.orderAmount = orderAmount; + } + + public double getInstorageAmount() { + return instorageAmount; + } + + public void setInstorageAmount(double instorageAmount) { + this.instorageAmount = instorageAmount; + } +} 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 091f563b..a646c4e7 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=有在途;4=供应商索引编码重复;5=没有对应订单 + private int resState = 0; // 0=正常;1=无供应商信息;2=供应商编码不符;3=有在途;4=供应商索引编码重复;5=没有对应订单;6=供应商没审核 private String msg; public String getPrSid() { diff --git a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfo.java b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfo.java index 0db7b0b0..5d54b937 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfo.java +++ b/yxt_supervise/supervise-customer/supervise-customer-api/src/main/java/com/yxt/supervise/customer/api/supplierbankinfo/SupplierBankInfo.java @@ -38,16 +38,17 @@ public class SupplierBankInfo extends BaseEntity { @ApiModelProperty("营业执照号") private String businessLicenseNo; // 营业执照号 @ApiModelProperty("监管审核状态0待审核1为通过2为拒绝") - private Integer purchaseRequisition; // 监管审核状态0待审核1为通过2为拒绝 + private Integer purchaseRequisition = 0; // 监管审核状态0待审核1为通过2为拒绝 @ApiModelProperty("监管审批意见") private String purchaseRemarks; // 监管审批意见 @ApiModelProperty("银行0未审核,1审核通过,2审核不通过") - private Integer bankState; // 银行0未审核,1审核通过,2审核不通过 + private Integer bankState = 0; // 银行0未审核,1审核通过,2审核不通过 @ApiModelProperty("银行审批意见") private String bankRemarks; // 银行审批意见 @ApiModelProperty("锁定状态1.锁定2.未锁定 ") - private Integer lockingStatus; + private Integer lockingStatus = 1; @ApiModelProperty("锁定原因") private String lockingReason; + } diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java index 10cf5175..3eaf5012 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionMapper.java @@ -14,6 +14,7 @@ import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrand; import com.yxt.supervise.customer.api.restrictedbrand.RestrictedBrandVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -27,4 +28,6 @@ public interface PurchaseRequisitionMapper extends BaseMapper selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); //查询导出的数据 List exportExcel(@Param(Constants.WRAPPER) Wrapper qw); + @Select("") + double amountBySupplierOnlyCode(@Param("") String supplierOnlyCode); } diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java index 057fa0f4..50298840 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/purchaserequisition/PurchaseRequisitionService.java @@ -6,6 +6,7 @@ import com.alibaba.excel.read.builder.ExcelReaderBuilder; import com.alibaba.excel.read.listener.ReadListener; import com.alibaba.excel.read.metadata.holder.ReadRowHolder; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -279,4 +280,15 @@ public class PurchaseRequisitionService extends MybatisBaseService uw = new UpdateWrapper<>(); + uw.set("supplierOnlyCode", codeUnified); + uw.eq("sid", sid); + this.update(uw); + } + + public double amountOfSupplier(String supplierOnlyCode) { + return baseMapper.amountBySupplierOnlyCode(supplierOnlyCode); + } } 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 e328ee13..fb171eac 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 @@ -34,6 +34,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.customer.api.purchaserequisition.PurchaseRequisition; +import com.yxt.supervise.customer.api.purchaserequisitionpro.InTransitCheckVo; import com.yxt.supervise.customer.api.supplierbankinfo.*; import com.yxt.supervise.customer.api.suppliercontractinfo.SupplierContractInfoDto; import com.yxt.supervise.customer.api.supplierindex.SupplierIndex; @@ -250,6 +251,21 @@ public class SupplierBankInfoService extends MybatisBaseService checkPurchaseRequisition(String purchaseRequisitionSid) { + List list = checkSupplierByPRSid(purchaseRequisitionSid); + if (list.isEmpty()) { + PurchaseRequisition pr = purchaseRequisitionService.fetchBySid(purchaseRequisitionSid); + if (pr == null) { + PurchaseRequisitionCheckVo vo = new PurchaseRequisitionCheckVo(purchaseRequisitionSid, "", 5); + vo.setMsg("没有对应采购订单"); + list.add(vo); + return list; + } + list = checkInTransitByUniCode(pr.getSupplierOnlyCode()); + } + return list; + } + + public List checkSupplierByPRSid(String purchaseRequisitionSid) { List list = new ArrayList<>(); PurchaseRequisition pr = purchaseRequisitionService.fetchBySid(purchaseRequisitionSid); if (pr == null) { @@ -288,16 +304,52 @@ public class SupplierBankInfoService extends MybatisBaseService