diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDetailsVo.java index dfaed602aa..2a9e89dbd9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDetailsVo.java @@ -13,6 +13,8 @@ import lombok.Data; public class BaseManufacturerDetailsVo implements Vo { private static final long serialVersionUID = -462032340831359179L; + private String sid; + @ApiModelProperty(value = "厂商名称") private String manufacturerName; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java index c42c6fbe18..20916fcd4d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerDto.java @@ -26,7 +26,6 @@ import javax.validation.constraints.Pattern; @Data public class BaseManufacturerDto implements Dto { - @ApiModelProperty(value = "厂商名称", required = true) @NotBlank(message = "厂商名称不能为空") private String manufacturerName; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java index b3b9543d81..165502a300 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java @@ -181,4 +181,8 @@ public interface BaseManufacturerFeign { @ResponseBody ResultBean saveAllByOrgSid(@SpringQueryMap BaseManufaQuery query); + @ApiOperation("获取厂商信息新增或更新分公司供应商信息") + @GetMapping("/saveGysByOrgSid/{orgSid}") + @ResponseBody + ResultBean saveGysByOrgSid(@PathVariable("orgSid") String orgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java index 7170e6f8e0..b155a20f03 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java @@ -105,4 +105,9 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign { public ResultBean saveAllByOrgSid(BaseManufaQuery query) { return null; } + + @Override + public ResultBean saveGysByOrgSid(String orgSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java index ee475b4417..71c8234897 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java @@ -14,6 +14,19 @@ public class BaseManufacturerListVo implements Vo { private static final long serialVersionUID = 4951280280938626700L; @ApiModelProperty("供应商sid") private String sid; + @ApiModelProperty("供应商销售通路") private String name; + + @ApiModelProperty("厂家销售通路") + private String actualPay; + + @ApiModelProperty("开户行") + private String depositBank; + + @ApiModelProperty("收款银行账号") + private String bankAccount; + + @ApiModelProperty("厂家销售通路sid") + private String actualPaySid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerSidVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerSidVo.java new file mode 100644 index 0000000000..2db5c922b6 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerSidVo.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.base.api.basemanufacturer; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class BaseManufacturerSidVo implements Vo { + private static final long serialVersionUID = -1309588441418176413L; + + @ApiModelProperty(value = "厂商sid") + private String manufacturerSid; + + @ApiModelProperty(value = "供应商sid") + private String supplierSid; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java index ffdb9da545..2aafd11df3 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java @@ -151,4 +151,13 @@ public class BaseVehicle extends BaseEntity { @ApiModelProperty(value = "厂家销售通路名称") private String manufSaleAccessName; + @ApiModelProperty(value = "品牌sid") + private String carBrandSid; + @ApiModelProperty(value = "品牌名称") + private String carBrandName; + @ApiModelProperty(value = "厂商sid") + private String manufacturerSid; + @ApiModelProperty(value = "供应商sid") + private String supplierSid; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java index 59e7be64ab..153711439c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java @@ -118,4 +118,14 @@ public class BaseVehicleDto implements Dto { private String rebate1; @ApiModelProperty(value = "备注") private String remarks; + + @ApiModelProperty(value = "品牌sid") + private String carBrandSid; + @ApiModelProperty(value = "品牌名称") + private String carBrandName; + + @ApiModelProperty(value = "厂商sid") + private String manufacturerSid; + @ApiModelProperty(value = "供应商sid") + private String supplierSid; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java index 2585637890..d2abb709da 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java @@ -123,4 +123,14 @@ public class BaseVehicleSelectVo implements Vo { private String remarks; @ApiModelProperty("买断备注") private String rebate1; + + @ApiModelProperty(value = "品牌sid") + private String carBrandSid; + @ApiModelProperty(value = "品牌名称") + private String carBrandName; + + @ApiModelProperty(value = "厂商sid") + private String manufacturerSid; + @ApiModelProperty(value = "供应商sid") + private String supplierSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleQuery.java index 9a56f687cd..c2c7186cb0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVehicleQuery.java @@ -14,5 +14,6 @@ public class BaseVehmodelConfigVehicleQuery implements Query { private String configName; @ApiModelProperty(value = "分公司sid") private String useOrgSid; - + @ApiModelProperty(value = "品牌sid") + private String brandSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java index b9610f3cc1..e20153a359 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java @@ -77,4 +77,9 @@ public class BusVehicleApply extends BaseEntity { @ApiModelProperty(value = "品牌名称") private String carBrandName; + @ApiModelProperty(value = "厂商sid") + private String manufacturerSid; + @ApiModelProperty(value = "供应商sid") + private String supplierSid; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java index 077d74a500..c092547721 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java @@ -77,4 +77,9 @@ public class BusVehicleApplyDto implements Dto { @ApiModelProperty(value = "品牌名称") private String carBrandName; + @ApiModelProperty(value = "厂商sid") + private String manufacturerSid; + @ApiModelProperty(value = "供应商sid") + private String supplierSid; + } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java index 59b3abbef8..d8b4cd46f4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.biz.basemanufacturer; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -123,4 +124,11 @@ public interface BaseManufacturerMapper extends BaseMapper { BaseManufacturer fetchByManBankSid(String s); List selectOrgList(String type); + + List saveGysByOrgSid(@Param(Constants.WRAPPER) QueryWrapper qw); + + BaseManufacturerDetailsVo selectByOrgSidAndManBankSid(@Param("orgSid") String orgSid,@Param("manBankSid") String manBankSid); + + + BaseManufacturerSidVo getManufacturerSidAndSupplierSid(@Param("manBankSid") String manBankSid, @Param("useOrgSid") String useOrgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index a931a6362a..5a95c5d0e5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml @@ -19,7 +19,7 @@ bm.createOrgName, bm.manufacturerCode FROM base_manufacturer bm - ${ew.customSqlSegment} + ${ew.customSqlSegment} - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java index 88eaa60eb9..e354a7fbbe 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java @@ -195,4 +195,9 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { public ResultBean saveAllByOrgSid(BaseManufaQuery query) { return baseManufacturerService.saveAllByOrgSid(query); } + + @Override + public ResultBean saveGysByOrgSid(String orgSid) { + return baseManufacturerService.saveGysByOrgSid(orgSid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java index 77c71d5122..cea009e90b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java @@ -460,6 +460,18 @@ public class BaseManufacturerService extends MybatisBaseService getManufacturerSidAndSupplierSid(String carBrandSid, String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + BaseManufacturerSidVo vo = null; + String manBankSid = baseVehicleBrandService.selectByManufacturerSid(carBrandSid); + if (StringUtils.isNotBlank(manBankSid)){ + vo = baseMapper.getManufacturerSidAndSupplierSid(manBankSid, useOrgSid); + vo.setManufacturerSid(manBankSid); + } + return rb.success().setData(vo); + } + public ResultBean copyManBankToGys(String orgSid) { ResultBean rb = ResultBean.fireFail(); List stringList = baseVehicleBrandService.selectManSidByOrgSid(orgSid); @@ -550,4 +562,30 @@ public class BaseManufacturerService extends MybatisBaseService qw = new QueryWrapper<>(); + qw.eq("bm.isDelete", 0); + qw.eq("bm.supplierType", "0001"); + qw.and(wrapper -> wrapper.isNull("bm.manBankSid").or().eq("bm.manBankSid", "")); + List baseManufacturerDetailsVos = baseMapper.saveGysByOrgSid(qw); + for (BaseManufacturerDetailsVo baseManufacturerDetailsVo : baseManufacturerDetailsVos) { + String manBankSid = baseManufacturerDetailsVo.getSid(); + BaseManufacturerDetailsVo baseManufacturerDetailsVo1 = baseMapper.selectByOrgSidAndManBankSid(orgSid, manBankSid); + if (baseManufacturerDetailsVo1 != null){ + BaseManufacturerDto baseManufacturerDto = new BaseManufacturerDto(); + BeanUtil.copyProperties(baseManufacturerDetailsVo, baseManufacturerDto, "sid", "manufacturerCode"); + updateBySid(baseManufacturerDto,baseManufacturerDetailsVo1.getSid()); + }else { + BaseManufacturer baseManufacturer = new BaseManufacturer(); + BeanUtil.copyProperties(baseManufacturerDetailsVo, baseManufacturer, "sid", "manufacturerCode"); + baseManufacturer.setManBankSid(baseManufacturerDetailsVo.getSid()); + baseManufacturer.setCreateOrg(orgSid); + baseManufacturer.setUseOrg(orgSid); + insert(baseManufacturer); + } + } + return rb.success().setMsg("添加成功"); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index a68e2da39a..e782f863f1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; +import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerSidVo; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; @@ -158,7 +159,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { record.setSettlementLibraryAge(betweenDay * i * -1); } String vinNo = record.getVinNo(); - if (StringUtils.isNotBlank(vinNo)){ + if (StringUtils.isNotBlank(vinNo)) { record.setLastVinNo(vinNo.substring(vinNo.length() - 8)); } String modelSid = record.getModelSid(); @@ -206,6 +207,13 @@ public class BaseVehicleRest implements BaseVehicleFeign { baseVehicle.setSettlementStatusValue(dto.getSettlementStatusValue()); baseVehicle.setWitPinState(dto.getWitPinState()); baseVehicle.setWitPinStateValue(dto.getWitPinStateValue()); + + BaseManufacturerSidVo baseManufacturerSidVo = baseManufacturerService.getManufacturerSidAndSupplierSid(dto.getCarBrandSid(), dto.getUseOrgSid()).getData(); + if (baseManufacturerSidVo != null) { + baseVehicle.setManufacturerSid(baseManufacturerSidVo.getManufacturerSid()); + baseVehicle.setSupplierSid(baseManufacturerSidVo.getSupplierSid()); + } + boolean isSave = baseVehicleService.save(baseVehicle); if (StringUtils.isNotBlank(dto.getVinNo())) { BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate(); @@ -282,7 +290,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { } } - if(ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())){//外采 + if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) {//外采 //根据外采编号查询外采的申请人部门 BaseOutsourcingApplication baseOutsourcingApplication = baseOutsourcingApplicationService.selectByNo(baseVehicle.getOrderingNo()); String createBySid = baseOutsourcingApplication.getCreateBySid(); @@ -290,7 +298,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { ResultBean sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(createBySid); if (sysUserInfoVoResultBean.getSuccess()) { SysUserInfoVo sysUserInfoVo = sysUserInfoVoResultBean.getData(); - if(sysUserInfoVo != null){ + if (sysUserInfoVo != null) { String orgDeptCode = sysUserInfoVo.getOrgCode(); stkInStock.setFPurchaseDeptId(orgDeptCode); } @@ -299,7 +307,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(baseOutsourcingApplication.getPurchasingUnitSid()); stkInStock.setFSupplierId(baseManufacturer.getManufacturerCode()); - }else if(ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey()) || ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())){//厂家采购 + } else if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey()) || ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) {//厂家采购 ResultBean pcResubean = sysOrganizationFeign.fetchBySid(baseVehicle.getPurchaseSystemSid()); if (pcResubean.getSuccess()) { SysOrganizationVo vo = pcResubean.getData(); @@ -308,7 +316,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { } } //车型品牌对应厂商生成的分公司的主机厂供应商编码 - String manCode = baseVehicleModelService.getCode(baseVehicle.getModelSid(),baseVehicle.getCreateOrgSid()); + String manCode = baseVehicleModelService.getCode(baseVehicle.getModelSid(), baseVehicle.getCreateOrgSid()); stkInStock.setFSupplierId(manCode); } /** @@ -341,15 +349,15 @@ public class BaseVehicleRest implements BaseVehicleFeign { * 单价 对应厂家结算价 */ sf.setFPrice(baseVehicleDto.getCostPrice() + ""); - if(ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey()) || ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())){ + if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey()) || ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { //根据sid查询 BaseManufacturerBank baseManufacturerBank = baseManufacturerBankService.fetchBySid(baseVehicle.getManufSaleAccessSid()); - if(baseManufacturerBank != null){ + if (baseManufacturerBank != null) { sf.setCllx(baseManufacturerBank.getActualPayKey()); sf.setCllxType("sellChannel"); } - }else if(ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())){ + } else if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { /** * 车辆类型 */ @@ -369,10 +377,10 @@ public class BaseVehicleRest implements BaseVehicleFeign { /** * // 仓库:FStockId */ - if(StringUtils.isBlank(baseVehicleDto.getLocation())){ + if (StringUtils.isBlank(baseVehicleDto.getLocation())) { // 在途仓库 sf.setFStockId("ARZTCK"); - }else{ + } else { sf.setFStockId(baseVehicleDto.getLocation()); } @@ -380,14 +388,14 @@ public class BaseVehicleRest implements BaseVehicleFeign { * 物料分组 */ BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseVehicleDto.getModelSid()); - if(baseVehicleBrand != null){ + if (baseVehicleBrand != null) { sf.setWlfz(baseVehicleBrand.getBrandCode()); } // sf.setWlfz("01"); /** * 物料分组 */ - // sf.setWlfzType("01"); + // sf.setWlfzType("01"); fInStockEntry.add(sf); } stkInStock.setFInStockEntry(fInStockEntry); @@ -438,6 +446,12 @@ public class BaseVehicleRest implements BaseVehicleFeign { baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode()); baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks()); baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());*/ + //根据品牌查询供应商sid 和 厂商sid + BaseManufacturerSidVo baseManufacturerSidVo = baseManufacturerService.getManufacturerSidAndSupplierSid(dto.getCarBrandSid(), dto.getUseOrgSid()).getData(); + if (baseManufacturerSidVo != null) { + baseVehicle.setManufacturerSid(baseManufacturerSidVo.getManufacturerSid()); + baseVehicle.setSupplierSid(baseManufacturerSidVo.getSupplierSid()); + } baseVehicle.setLockedState(dto.getLockedState()); baseVehicle.setLockedStateValue(dto.getLockedStateValue()); baseVehicle.setVehicleState(dto.getVehicleState()); @@ -451,7 +465,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { if (!isTrue) { return rb.setMsg("修改失败"); } - baseVehicleCertificateService.updateVinNoByVehSid(baseVehicle.getVinNo(),sid); + baseVehicleCertificateService.updateVinNoByVehSid(baseVehicle.getVinNo(), sid); return rb.success().setMsg("修改成功"); } @@ -550,7 +564,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { @Override public ResultBean updateVehRemarks(String remarks, String sid) { - return baseVehicleService.updateVehRemarks(remarks,sid); + return baseVehicleService.updateVehRemarks(remarks, sid); } /** @@ -1041,6 +1055,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { List> pcInspectionVinList = baseVehicleService.getPCInspectionVinList(query); return rb.success().setData(pcInspectionVinList); } + @Override public ResultBean> saleOrderVin(PagerQuery query) { ResultBean> rb = ResultBean.fireFail(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml index 21325e4539..5500587bc2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml @@ -26,7 +26,9 @@ money, isPay, useOrgSid, - useOrgName + useOrgName, + carBrandSid, + carBrandName from base_vehicle_actual_sales where sid = #{sid} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java index dd96bc54a3..c9aa35662d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java @@ -133,4 +133,7 @@ public interface BaseVehicleBrandMapper extends BaseMapper { List selectOrgSidBySid(String orgSid); BaseVehicleBrand selectByModelSid(String modelSid); + + @Select("select bvb.manufacturerSid from base_vehicle_brand bvb where bvb.sid = #{carBrandSid}") + String selectByManufacturerSid(@Param("carBrandSid") String carBrandSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java index 39a1a0611e..f657acdd24 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java @@ -243,4 +243,8 @@ public class BaseVehicleBrandService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("bvc.useOrgSid", query.getUseOrgSid()); qw.like("bb.useOrg", query.getUseOrgSid()); + qw.eq("bb.sid",query.getBrandSid()); if (StringUtils.isNotBlank(query.getVehicleAlias())) { qw.and(wrapper -> wrapper.like("bvm.vehicleAlias", query.getVehicleAlias()).or().like("bvm.vehicleTypeCode", query.getVehicleAlias())); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 73260c775d..46a498b78d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionDto; +import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; +import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerSidVo; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; import com.yxt.anrui.base.api.busvehicleapply.*; import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyListVo; @@ -21,6 +23,7 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo; import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySz; import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo; import com.yxt.anrui.base.biz.basemanufactorsubscription.BaseManufactorSubscriptionService; +import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService; @@ -102,6 +105,8 @@ public class BusVehicleApplyService extends MybatisBaseService busApplyVo = baseManufacturerBankService.selectBankByApplySid(busVehicleApply.getCreateOrgSid()); busApplyVo.removeAll(Collections.singleton(null)); @@ -806,6 +817,6 @@ public class BusVehicleApplyService extends MybatisBaseService vehicleList = new ArrayList<>(); private String isVeh; + @ApiModelProperty(value = "品牌sid") + private String carBrandSid; + @ApiModelProperty(value = "品牌名称") + private String carBrandName; + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java index fdbcd991af..a96c9138ca 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java @@ -92,4 +92,9 @@ public class FinPaymentapplyDto implements Dto { @ApiModelProperty("是否涉及车辆，1是，0否") private String isVeh; + @ApiModelProperty(value = "品牌sid") + private String carBrandSid; + @ApiModelProperty(value = "品牌名称") + private String carBrandName; + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml index c2ae1f66ea..190e68f0b5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyMapper.xml @@ -76,7 +76,9 @@ fp.remarks, fp.name, DATE_FORMAT(fp.createTime, '%Y-%m-%d') as createTime, - fp.isVeh + fp.isVeh, + fp.carBrandSid, + fp.carBrandName from fin_paymentapply fp where fp.sid = #{sid}