厂家采购-入库推车辆台账异常修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java

@@ -55,4 +55,8 @@ public interface BaseManufacturerBankFeign {
     @ApiOperation("付款申请获取厂家销售通路")
     @GetMapping("/payList")
     ResultBean<List<BaseManPayVo>> payList();
+
+    @ApiOperation("根据厂商开户行sid查询开户行信息")
+    @GetMapping("/details/{sid}")
+    public ResultBean<BaseManufacturerBankVo> details(@PathVariable("sid") String sid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java

@@ -40,4 +40,9 @@ public class BaseManufacturerBankFeignFallback implements BaseManufacturerBankFe
     public ResultBean<List<BaseManPayVo>> payList() {
         return null;
     }
+
+    @Override
+    public ResultBean<BaseManufacturerBankVo> details(String sid) {
+        return null;
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java

@@ -69,4 +69,6 @@ public interface BaseManufacturerBankMapper extends BaseMapper<BaseManufacturerB
     List<BaseManPayVo> payList(@Param("supplierTypeValue") String supplierTypeValue, @Param("code") String code);
 
     String fetchByMainSidAndManufSaleAccessName(@Param("manufacturerSid") String manufacturerSid,@Param("manufSaleAccessName") String manufSaleAccessName);
+
+    BaseManufacturerBankVo details(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml

@@ -53,22 +53,22 @@
         <!--银行代码-->
         bmb.swiftCode,
         bmb.remarks,
-        /*厂家销售通路*/
+            /*厂家销售通路*/
         bmb.actualPay,
         bmb.actualPayKey,
         bmb.paymentAccessNoKey,
         bmb.paymentAccessNoValue
         FROM base_manufacturer_bank bmb
         WHERE bmb.manufacturerSid = #{sid}
-        AND bmb.isDelete = 0
+          AND bmb.isDelete = 0
     </select>
 
     <select id="selectByApplySid" resultType="com.yxt.anrui.base.api.busvehicleapply.BusApplyVo">
         select bmb.bankAccount num, bmb.accountName name
         from base_manufacturer_bank bmb
-                     left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
-                     left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
-                     left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
+                 left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
+                 left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
+                 left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
         where bvm.sid = #{modelSid}
           and bmb.dueBankValue = '订金账户'
           and bmb.isDelete = 0
@@ -81,7 +81,7 @@
                bmb.bankAccount,
                bmb.sid actualPaySid
         from base_manufacturer_bank bmb
-                     left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
+                 left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
         where bmb.isDelete = 0
           and bm.isDelete = 0
           AND bm.supplierTypeValue = #{supplierTypeValue}
@@ -91,7 +91,7 @@
     <select id="selectBankByApplySid" resultType="com.yxt.anrui.base.api.busvehicleapply.BusApplyVo">
         select bm.manufacturerCode code, bmb.bankAccount num, bmb.accountName name
         from base_manufacturer bm
-                     left join base_manufacturer_bank bmb on bm.manBankSid = bmb.sid
+                 left join base_manufacturer_bank bmb on bm.manBankSid = bmb.sid
         where bm.createOrg = #{createOrgSid}
           and dueBankValue = '订金账户'
           and bmb.isDelete = 0
@@ -103,7 +103,7 @@
                bmb.depositBank,
                bmb.bankAccount
         from base_manufacturer_bank bmb
-                     left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
+                 left join base_manufacturer bm on bmb.manufacturerSid = bm.sid
         where bmb.isDelete = 0
           and bm.isDelete = 0
           AND bm.supplierTypeValue = #{supplierTypeValue}
@@ -116,4 +116,37 @@
         WHERE manufacturerSid = #{manufacturerSid}
           AND actualPay = #{manufSaleAccessName}
     </select>
+
+    <select id="details" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo">
+        SELECT bmb.sid,
+        <!--账户名称-->
+        bmb.accountName,
+        <!--银行账号-->
+        bmb.bankAccount,
+        <!--银行网点-->
+        bmb.bankingOutlets,
+        <!--国家-->
+        bmb.country,
+        <!--币种-->
+        bmb.currency,
+        <!--开户银行-->
+        bmb.depositBank,
+        <!--账户类型key-->
+        bmb.dueBankKey,
+        <!--账户类型value-->
+        bmb.dueBankValue,
+        <!--开户行地址-->
+        bmb.bankAddress,
+        bmb.paymentLines,
+        <!--银行代码-->
+        bmb.swiftCode,
+        bmb.remarks,
+        bmb.actualPay,
+        bmb.actualPayKey,
+        bmb.paymentAccessNoKey,
+        bmb.paymentAccessNoValue
+        FROM base_manufacturer_bank bmb
+        WHERE bmb.sid = #{sid}
+          AND bmb.isDelete = 0
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java

@@ -92,5 +92,12 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign {
         return rb.success().setData(voList);
     }
 
+    @Override
+    public ResultBean<BaseManufacturerBankVo> details(String sid) {
+        ResultBean<BaseManufacturerBankVo> rb = ResultBean.fireFail();
+        BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankService.details(sid);
+        return rb.success().setData(baseManufacturerBankVo);
+    }
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java

@@ -86,4 +86,8 @@ public class BaseManufacturerBankService extends MybatisBaseService<BaseManufact
     public String fetchByMainSidAndManufSaleAccessName(String manufacturerSid, String manufSaleAccessName) {
         return baseMapper.fetchByMainSidAndManufSaleAccessName(manufacturerSid,manufSaleAccessName);
     }
+
+    public BaseManufacturerBankVo details(String sid) {
+        return baseMapper.details(sid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -6,7 +6,6 @@ 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.anrui.base.api.basemanufacturer.BaseManufacturerAllVo;
-import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
 import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
@@ -20,7 +19,6 @@ import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign;
-import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.OperVehicleState;
@@ -537,10 +535,18 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             //厂家销售通路
             baseVehicleDto.setManufSaleAccessName(aaodd.getActualPay());
             //厂家回款通路类别key
-            BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankFeign.selectDetails(aaodd.getActualSid()).getData();
-            baseVehicleDto.setManufSaleAccessKey(baseManufacturerBankVo.getActualPayKey());
-            //付款通路code
-            baseVehicleDto.setPaymentAccessNoKey(baseManufacturerBankVo.getPaymentAccessNoKey());
+            ResultBean<BaseManufacturerBankVo> baseManufacturerBankVoResultBean = baseManufacturerBankFeign.details(aaodd.getActualSid());
+            if(baseManufacturerBankVoResultBean.getSuccess()){
+                BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankVoResultBean.getData();
+                if(baseManufacturerBankVo != null){
+                    baseVehicleDto.setManufSaleAccessKey(baseManufacturerBankVo.getActualPayKey());
+                    //付款通路code
+                    baseVehicleDto.setPaymentAccessNoKey(baseManufacturerBankVo.getPaymentAccessNoKey());
+                }
+            }
+           /* BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankFeign.selectDetails(aaodd.getActualSid()).getData();
+            baseVehicleDto.setManufSaleAccessKey(baseManufacturerBankVo.getActualPayKey());*/
+
             baseVehicleDto.setEngineNo(s.getEngineNo());
             baseVehicleDto.setVinNo(s.getVinNo());
             baseVehicleDto.setModelSid(booad.getModelSid());