完善金蝶其他应收单增加物料编码物料名称2

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java

@@ -31,6 +31,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
@@ -127,6 +129,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
     private LoanFinPolicyFeign loanFinPolicyFeign;
     @Autowired
     private LoanFinBankFeign loanFinBankFeign;
+    @Autowired
+    private BaseVehicleFeign baseVehicleFeign;
 
     private QueryWrapper<BusSalesOrderLoancontract> createQueryWrapper(BusSalesOrderLoancontractQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -380,8 +384,11 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
                 if (!busSalesOrderVehicleList.isEmpty()) {
                     for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicleList) {
                         String vinNoCode = "";
-                        if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
+                        if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) {
-                            vinNoCode = busSalesOrderVehicle.getLinkNo();
+                            BaseVehicleSelectVo data = baseVehicleFeign.details(busSalesOrderVehicle.getLinkSid()).getData();
+                            if (null != data) {
+                                vinNoCode = data.getVinNo();
+                            }
                         }
                         String customerNumber = "";
                         //判断财务系统是否有客户