调车 外采推送车辆台账字段

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java

@@ -196,4 +196,8 @@ public interface BaseManufacturerFeign {
     @ResponseBody
     ResultBean<BaseOutManuVo> getManDetails(@PathVariable("modelSid")String modelSid);
 
+    @ApiOperation("根据车型sid查询品牌、厂商等信息")
+    @GetMapping("/selectByInternalPurchaseSid/{buyerOrgSid}/{sellerOrgName}")
+    @ResponseBody
+    ResultBean<String> selectByInternalPurchaseSid(@PathVariable("buyerOrgSid")String buyerOrgSid,@PathVariable("sellerOrgName") String sellerOrgName);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java

@@ -120,4 +120,9 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
     public ResultBean<BaseOutManuVo> getManDetails(String modelSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<String> selectByInternalPurchaseSid(String buyerOrgSid, String sellerOrgName) {
+        return null;
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basemanufacturer.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
@@ -127,7 +128,7 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
 
     List<BaseManufacturerDetailsVo> saveGysByOrgSid(@Param(Constants.WRAPPER) QueryWrapper<BaseManufacturerVo> qw);
 
-    BaseManufacturerDetailsVo selectByOrgSidAndManBankSid(@Param("orgSid") String orgSid,@Param("manBankSid") String manBankSid);
+    BaseManufacturerDetailsVo selectByOrgSidAndManBankSid(@Param("orgSid") String orgSid, @Param("manBankSid") String manBankSid);
 
 
     BaseManufacturerSidVo getManufacturerSidAndSupplierSid(@Param("manBankSid") String manBankSid, @Param("useOrgSid") String useOrgSid);
@@ -137,4 +138,7 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
     int updateMank(@Param("sid") String sid, @Param("name") String name, @Param("createName") String name1);
 
     BaseOutManuVo getManDetails(String modelSid);
+
+    @Select("SELECT bm.sid as supplierSid  FROM base_manufacturer bm WHERE bm.useOrg = #{buyerOrgSid} and bm.manufacturerName = #{sellerOrgName} and bm.supplierType = '0005' ")
+    String selectByInternalPurchaseSid(@Param("buyerOrgSid") String buyerOrgSid, @Param("sellerOrgName") String sellerOrgName);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java

@@ -210,4 +210,9 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
     public ResultBean<BaseOutManuVo> getManDetails(String modelSid) {
         return baseManufacturerService.getManDetails(modelSid);
     }
+
+    @Override
+    public ResultBean<String> selectByInternalPurchaseSid(String buyerOrgSid, String sellerOrgName) {
+        return baseManufacturerService.selectByInternalPurchaseSid(buyerOrgSid,sellerOrgName);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -466,7 +466,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         String manBankSid = baseVehicleBrandService.selectByManufacturerSid(carBrandSid);
         if (StringUtils.isNotBlank(manBankSid)) {
             vo = baseMapper.getManufacturerSidAndSupplierSid(manBankSid, useOrgSid);
-            if(vo == null){
+            if (vo == null) {
                 vo = new BaseManufacturerSidVo();
             }
             vo.setManufacturerSid(manBankSid);
@@ -637,4 +637,9 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         return rb.success().setData(vo);
     }
 
+    public ResultBean<String> selectByInternalPurchaseSid(String buyerOrgSid, String sellerOrgName) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String sid = baseMapper.selectByInternalPurchaseSid(buyerOrgSid, sellerOrgName);
+        return rb.success().setData(sid);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -36,6 +36,7 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.anrui.base.api.basemanufacturer.BaseOutManuVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
 import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
@@ -230,7 +231,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
         IPage<AppScmVehicleEnterlibraryPageQuery> page = PagerUtil.queryToPage(pq);
         AppScmVehicleEnterlibraryPageQuery params = pq.getParams();
         String orgPath = params.getOrgPath();
-        if(StringUtils.isBlank(orgPath)){
+        if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData();
         }
         params.setUseOrgSid(orgPath);
@@ -473,6 +474,27 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleDto.setSpecialInstructions(scmVehicleEnterlibrary.getSpecialInstructions()); // 特殊差异说明 验车
                     baseVehicleDto.setManPurOrderTypeKey(scmVehicleEnterlibrary.getPurchaseTypeKey());
                     baseVehicleDto.setManPurOrderTypeValue(scmVehicleEnterlibrary.getPurchaseType());
+                    //根据车型sid查询品牌及名称及厂商sid
+                    ResultBean<BaseOutManuVo> resultBeanBaseManu = baseManufacturerFeign.getManDetails(scmVehicleEnterlibrary.getModelSid());
+                    ResultBean<String> stringResultBean = baseManufacturerFeign.selectByInternalPurchaseSid(vehicleDetailsVo.getBuyerOrgSid(), vehicleDetailsVo.getSellerOrgName());
+                    if (stringResultBean.getData() != null) {
+                        baseVehicleDto.setSupplierSid(stringResultBean.getData());
+                    }
+                    //厂商sid 品牌 和 品牌 sid
+                    if (resultBeanBaseManu.getData() != null) {
+                        baseVehicleDto.setManufacturerSid(resultBeanBaseManu.getData().getManufacturerSid());
+                        baseVehicleDto.setCarBrandSid(resultBeanBaseManu.getData().getBrandSid());
+                        baseVehicleDto.setCarBrandName(resultBeanBaseManu.getData().getBrandName());
+                    }
+                    //采购部门sid 和采购部门名称
+                    baseVehicleDto.setPurchaseSystemSid(internalPurchaseDetailsVo.getCallInBuyerOrgSid());
+                    baseVehicleDto.setPurchaseSystemName(internalPurchaseDetailsVo.getCallInBuyerOrgName());
+                    ResultBean<BaseVehicle> baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(scmVehicleEnterlibrary.getVinNo(), vehicleDetailsVo.getSellerOrgSid());
+                    //厂家回款通路sid 厂家回款通路名称
+                    if (baseVehicleResultBean.getData() != null) {
+                        baseVehicleDto.setManufSaleAccessSid(baseVehicleResultBean.getData().getManufSaleAccessSid());
+                        baseVehicleDto.setManufSaleAccessName(baseVehicleResultBean.getData().getManufSaleAccessName());
+                    }
                     List<BaseVehicleDto> list = new ArrayList<>();
                     list.add(baseVehicleDto);
                     baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.TC_SAVEVEH.getCode());