在途

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;
+    }
+}

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() {

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;
 
+
 }

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<PurchaseRequisitio
     IPage<PurchaseRequisitionVo> selectPageVo(IPage<PurchaseRequisition> page, @Param(Constants.WRAPPER) Wrapper<PurchaseRequisition> qw);
     //查询导出的数据
     List<PurchaseRequisitionExcelVo> exportExcel(@Param(Constants.WRAPPER) Wrapper<PurchaseRequisition> qw);
+    @Select("")
+    double amountBySupplierOnlyCode(@Param("") String supplierOnlyCode);
 }

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<PurchaseRequi
             }
         };
     }
+
+    public void updateOnlyCodeBySid(String sid, String codeUnified) {
+        UpdateWrapper<PurchaseRequisition> uw = new UpdateWrapper<>();
+        uw.set("supplierOnlyCode", codeUnified);
+        uw.eq("sid", sid);
+        this.update(uw);
+    }
+
+    public double amountOfSupplier(String supplierOnlyCode) {
+        return baseMapper.amountBySupplierOnlyCode(supplierOnlyCode);
+    }
 }

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<SupplierBankInfo
     }
 
     public List<PurchaseRequisitionCheckVo> checkPurchaseRequisition(String purchaseRequisitionSid) {
+        List<PurchaseRequisitionCheckVo> 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<PurchaseRequisitionCheckVo> checkSupplierByPRSid(String purchaseRequisitionSid) {
         List<PurchaseRequisitionCheckVo> list = new ArrayList<>();
         PurchaseRequisition pr = purchaseRequisitionService.fetchBySid(purchaseRequisitionSid);
         if (pr == null) {
@@ -288,16 +304,52 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
             } else {
                 String sbiCodeUnified = sbi.getCodeUnified();
                 String sbiSid = sbi.getSid();
+                String name = sbi.getName();
+                SupplierIndex sui = new SupplierIndex();
+                sui.setPSid(sbiSid);
+                sui.setCode(supplierCode);
+                sui.setName(supplierName);
+                sui.setCodeUnified(sbiCodeUnified);
+                sui.setNameUnified(name);
+                supplierIndexService.save(sui);
+                if (StringUtils.isBlank(supplierOnlyCode)) {
+                    purchaseRequisitionService.updateOnlyCodeBySid(purchaseRequisitionSid, sbiCodeUnified);
+                }
+                Integer purchaseRequisition = sbi.getPurchaseRequisition();
+                Integer bankState = sbi.getBankState();
+                Integer lockingStatus = sbi.getLockingStatus();
+                if (purchaseRequisition != null && purchaseRequisition.equals(1) && bankState != null && bankState.equals(1) && lockingStatus != null && lockingStatus.equals(0))
+                    return list;
 
+                PurchaseRequisitionCheckVo vo = new PurchaseRequisitionCheckVo(prSid, prCode, 6);
+                vo.setSupplierCode(supplierCode);
+                vo.setSupplierName(supplierName);
+                vo.setSupplierCodeUnified(supplierOnlyCode);
+                vo.setMsg("该供应商没有审核");
+                list.add(vo);
+                return list;
             }
         }
 
-        SupplierIndex si = null;
+        SupplierIndex si = silist.get(0);
-        if (si == null) {
+        SupplierBankInfo supplierBankInfo = this.fetchBySid(si.getPSid());
+        if (supplierBankInfo == null) {
 
         }
 
+        Integer purchaseRequisition = supplierBankInfo.getPurchaseRequisition();
+        Integer bankState = supplierBankInfo.getBankState();
+        Integer lockingStatus = supplierBankInfo.getLockingStatus();
 
+        if (purchaseRequisition != null && purchaseRequisition.equals(1) && bankState != null && bankState.equals(1) && lockingStatus != null && lockingStatus.equals(0))
+            return list;
+
+        PurchaseRequisitionCheckVo vo = new PurchaseRequisitionCheckVo(prSid, prCode, 6);
+        vo.setSupplierCode(supplierCode);
+        vo.setSupplierName(supplierName);
+        vo.setSupplierCodeUnified(supplierOnlyCode);
+        vo.setMsg("该供应商没有审核");
+        list.add(vo);
         return list;
     }
 
@@ -310,7 +362,9 @@ public class SupplierBankInfoService extends MybatisBaseService<SupplierBankInfo
         return list.get(0);
     }
 
-    public void checkInTransitByUniCode(String supplierOnlyCode) {
+    public InTransitCheckVo checkInTransitByUniCode(String supplierOnlyCode) {
-
+        InTransitCheckVo vo = new InTransitCheckVo(supplierOnlyCode);
+        vo.setOrderAmount(purchaseRequisitionService.amountOfSupplier(supplierOnlyCode));
+        return vo;
     }
 }