diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturer.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturer.java index aab5f8eb8f..81cd96e676 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturer.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturer.java @@ -109,4 +109,6 @@ public class BaseManufacturer extends BaseEntity { private String city; @ApiModelProperty(value = "县区") private String county; + @ApiModelProperty(value = "厂商开户行sid") + private String manBankSid; } 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 264a854b11..dfaed602aa 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 @@ -81,4 +81,6 @@ public class BaseManufacturerDetailsVo implements Vo { private String city; @ApiModelProperty(value = "县区") private String county; + @ApiModelProperty(value = "厂商开户行sid") + private String manBankSid; } 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 573c939e16..81723e045c 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 @@ -121,4 +121,6 @@ public class BaseManufacturerDto implements Dto { @ApiModelProperty(value = "使用组织名称") private String useOrgName; + @ApiModelProperty(value = "厂商开户行sid") + private String manBankSid; } \ No newline at end of file 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 a9409bcf26..7a451b4e77 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 @@ -57,6 +57,16 @@ public interface BaseManufacturerFeign { @ResponseBody public ResultBean> gysPagerList(@RequestBody PagerQuery pagerQuery); + /** + * 生成厂商开户行信息到供应商 + * + * @return + */ + @ApiOperation("生成厂商开户行信息到供应商") + @PostMapping("/copyManBankToGys") + @ResponseBody + public ResultBean copyManBankToGys(@RequestParam("orgSid") String orgSid); + /** * 新增保存 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 9bac03f491..ad4777202e 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 @@ -35,6 +35,11 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign { return null; } + @Override + public ResultBean copyManBankToGys(String orgSid) { + return null; + } + @Override public ResultBean save(BaseManufacturerAllDto dto) { return ResultBean.fireFail().setMsg("接口anrui-base/basemanufacturer/save无法访问"); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankVo.java index 971309509c..fbe6425a4f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankVo.java @@ -24,6 +24,8 @@ import lombok.Data; public class BaseManufacturerBankVo implements Vo { private static final long serialVersionUID = 7902385526436803445L; + private String sid; + @ApiModelProperty("国家") private String country; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 3bb82628a3..694e3efcaa 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -175,8 +175,8 @@ public interface BaseVehicleFeign { * @return */ @ApiOperation("修改车辆台账备注") - @PostMapping("/updateVehRemarks/{remarks}/{sid}") - public ResultBean updateVehRemarks(@PathVariable("remarks") String remarks, @PathVariable("sid") String sid); + @PostMapping("/updateVehRemarks") + public ResultBean updateVehRemarks(@RequestParam("remarks") String remarks, @RequestParam("sid") String sid); /***************************************************** PC现车接口 **********************************************************/ /** diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java index 767a2ea9c1..50f6ffb4d8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java @@ -26,6 +26,8 @@ import java.util.Date; @Data public class BaseVehicleVo implements Vo { + @ApiModelProperty(value = "备注") + private String remarks; @ApiModelProperty(value = "车型与配置关联表sid") private String vehModelConfigSid; @ApiModelProperty(value = "车辆sid") @@ -38,6 +40,8 @@ public class BaseVehicleVo implements Vo { private String configName; @ApiModelProperty("车架号(VIN)（陕汽必须的字段）") private String vinNo; + @ApiModelProperty("车架号后八位") + private String lastVinNo; @ApiModelProperty("车辆状态value值") private String vehicleStateValue; @ApiModelProperty("存放地点名称（陕汽必须的字段）") @@ -102,8 +106,12 @@ public class BaseVehicleVo implements Vo { private String witPinStateValue; @ApiModelProperty(value = "合格证状态value") private String certificateStateValue; - @ApiModelProperty(value = "库龄") + @ApiModelProperty(value = "厂家库龄") private Long libraryAge; + @ApiModelProperty(value = "公司库龄") + private Long orgLibraryAge; + @ApiModelProperty(value = "买断库龄") + private Long settlementLibraryAge; @ApiModelProperty(value = "是否为问题车辆（0无问题 1有问题）") private String isProblemVeh; @ApiModelProperty(value = "采购系统sid") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDto.java index ac2fcdbde9..96b0ce2131 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDto.java @@ -35,9 +35,9 @@ public class BaseVehicleBrandDto implements Dto { @NotBlank(message = "品牌名称不能为空") private String brandName; -/* @ApiModelProperty("品牌简称(品牌首字母，但不可重复)") + @ApiModelProperty("品牌简称(品牌首字母，但不可重复)") @NotBlank(message = "品牌简称") - private String brandShortName;*/ + private String brandShortName; @ApiModelProperty(value = "品牌类型", required = true) @NotBlank(message = "品牌类型不能为空") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java index 5db9f35883..b3b61ceb87 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusApplyVo.java @@ -13,4 +13,5 @@ public class BusApplyVo implements Vo { private static final long serialVersionUID = -4976630638474677681L; private String name; private String num; + private String code; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index 37dd7e30e6..b9e306483d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -508,7 +508,8 @@ public class BaseAccadjApplyService extends MybatisBaseService { List> bankNamesDown(String manufacturerSid); List selectNameByOrg(@Param("useOrgSid") String useOrgSid, @Param("supplierTypeValue") String supplierTypeValue); + + BaseManufacturer fetchByManBankSid(String s); } \ 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 2fb8dcdda8..5f3017221d 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 @@ -168,4 +168,8 @@ + + \ 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 7ec09fe7a5..67e1dfbf9e 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 @@ -67,6 +67,11 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { return rb.success().setData(pv1); } + @Override + public ResultBean copyManBankToGys(String orgSid) { + return baseManufacturerService.copyManBankToGys(orgSid); + } + @Override public ResultBean save(BaseManufacturerAllDto dto) { return baseManufacturerService.saveAll(dto); 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 8b05b69281..fccb39fd8b 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 @@ -1,5 +1,6 @@ package com.yxt.anrui.base.biz.basemanufacturer; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemanufacturer.*; @@ -11,6 +12,7 @@ import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceDto import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceVo; import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService; import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService; +import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -55,8 +57,11 @@ public class BaseManufacturerService extends MybatisBaseService>> wcgysNamesDown(String orgSid) { + public ResultBean>> wcgysNamesDown(String orgSid) { ResultBean rb = ResultBean.fireFail(); - List> manufacturerNames = baseMapper.wcgysNamesDown(orgSid); + List> manufacturerNames = baseMapper.wcgysNamesDown(orgSid); return rb.success().setData(manufacturerNames); } public ResultBean>> bankNamesDown(String manufacturerSid) { ResultBean rb = ResultBean.fireFail(); - List> bankNames = baseMapper.bankNamesDown(manufacturerSid); + List> bankNames = baseMapper.bankNamesDown(manufacturerSid); return rb.success().setData(bankNames); } @@ -412,7 +417,53 @@ public class BaseManufacturerService extends MybatisBaseService> rb = ResultBean.fireFail(); String useOrgSid = query.getUseOrgSid(); String supplierTypeValue = "主机厂"; - List list = baseMapper.selectNameByOrg(useOrgSid,supplierTypeValue); + List list = baseMapper.selectNameByOrg(useOrgSid, supplierTypeValue); return rb.success().setData(list); } + + public ResultBean copyManBankToGys(String orgSid) { + ResultBean rb = ResultBean.fireFail(); + List stringList = baseVehicleBrandService.selectManSidByOrgSid(orgSid); + for (String s : stringList) { + BaseManufacturer baseManufacturer = fetchBySid(s); + if (baseManufacturer != null) { + BaseManufacturer baseManufacturer2 = baseMapper.fetchByManBankSid(s); + if (baseManufacturer2 != null) { + String sid = baseManufacturer2.getSid(); + BeanUtil.copyProperties(baseManufacturer, baseManufacturer2); + baseManufacturer2.setSid(sid); + baseManufacturer2.setUseOrg(orgSid); + baseManufacturer2.setManBankSid(baseManufacturer.getSid()); + saveOrUpdate(baseManufacturer2); + } else { + BaseManufacturer baseManufacturer1 = new BaseManufacturer(); + String sid = baseManufacturer1.getSid(); + BeanUtil.copyProperties(baseManufacturer, baseManufacturer1); + baseManufacturer1.setSid(sid); + baseManufacturer1.setUseOrg(orgSid); + baseManufacturer1.setManBankSid(baseManufacturer.getSid()); + save(baseManufacturer1); + } + } + List baseManufacturerBankVos = baseManufacturerBankService.selectDetails(s); + if (baseManufacturerBankVos.size() > 0) { + for (BaseManufacturerBankVo baseManufacturerBankVo : baseManufacturerBankVos) { + BaseManufacturer baseManufacturer2 = baseMapper.fetchByManBankSid(baseManufacturerBankVo.getSid()); + if (baseManufacturer2 != null) { + baseManufacturer2.setManufacturerName(baseManufacturerBankVo.getAccountName()); + baseManufacturer2.setUseOrg(orgSid); + baseManufacturer2.setManBankSid(baseManufacturerBankVo.getSid()); + saveOrUpdate(baseManufacturer2); + } else { + BaseManufacturer baseManufacturer1 = new BaseManufacturer(); + baseManufacturer1.setManufacturerName(baseManufacturerBankVo.getAccountName()); + baseManufacturer1.setUseOrg(orgSid); + baseManufacturer1.setManBankSid(baseManufacturerBankVo.getSid()); + save(baseManufacturer1); + } + } + } + } + return rb.success().setData(stringList); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java index b24e63ebb0..3da867f9eb 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java @@ -62,4 +62,6 @@ public interface BaseManufacturerBankMapper extends BaseMapper selectByApplySid(String modelSid); List actualList(@Param("useOrgSid") String useOrgSid, @Param("code") String code); + + List selectBankByApplySid(String createOrgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml index 700ce73d42..6b114f7579 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml @@ -31,6 +31,7 @@ @@ -73,9 +74,14 @@ 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.useOrg = #{useOrgSid} and bmb.dueBankKey = #{code} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java index 8392392bc5..bfe248a796 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java @@ -73,4 +73,8 @@ public class BaseManufacturerBankService extends MybatisBaseService actualList(String useOrgSid, String code) { return baseMapper.actualList(useOrgSid,code); } + + public List selectBankByApplySid(String createOrgSid) { + return baseMapper.selectBankByApplySid(createOrgSid); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 9e7ceeb329..87c4688d5d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -463,5 +463,5 @@ public interface BaseVehicleMapper extends BaseMapper { IPage saleOrderVin(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); @Update("update base_vehicle set remarks = #{remarks} where sid = #{sid}") - ResultBean updateVehRemarks(@Param("remarks") String remarks,@Param("sid") String sid); + void updateVehRemarks(@Param("remarks") String remarks,@Param("sid") String sid); } \ 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 83c059b4e6..4bc82439c1 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 @@ -103,6 +103,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { IPage page = baseVehicleService.pagerList(pagerQuery); List records = page.getRecords(); for (BaseVehicleVo record : records) { + //厂家库龄 if (record.getPriceDate() != null) { Date priceDate = record.getPriceDate(); String today = DateUtil.today(); @@ -111,6 +112,28 @@ public class BaseVehicleRest implements BaseVehicleFeign { long betweenDay = DateUtil.between(priceDate, currentDate, DateUnit.DAY); record.setLibraryAge(betweenDay * i * -1); } + //公司库龄 + if (record.getArrivalDate() != null) { + Date arrivalDate = record.getArrivalDate(); + String today = DateUtil.today(); + DateTime currentDate = DateUtil.parse(today); + int i = arrivalDate.compareTo(currentDate); + long betweenDay = DateUtil.between(arrivalDate, currentDate, DateUnit.DAY); + record.setOrgLibraryAge(betweenDay * i * -1); + } + //买断库龄 + if (record.getSolidDate() != null) { + Date solidDate = record.getSolidDate(); + String today = DateUtil.today(); + DateTime currentDate = DateUtil.parse(today); + int i = solidDate.compareTo(currentDate); + long betweenDay = DateUtil.between(solidDate, currentDate, DateUnit.DAY); + record.setSettlementLibraryAge(betweenDay * i * -1); + } + String vinNo = record.getVinNo(); + if (StringUtils.isNotBlank(vinNo)){ + record.setLastVinNo(vinNo.substring(vinNo.length() - 8)); + } } PagerVo pv = new PagerVo<>(); PagerVo pv1 = PagerUtil.pageToVo(page, pv); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 0b894d1c1c..f02b3766d3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -2643,6 +2643,8 @@ public class BaseVehicleService extends MybatisBaseService { String getBrandShortName(@Param("sid") String sid); List selectAppListByUserSid(@Param("useOrg") String useOrg); + + @Select("SELECT DISTINCT manufacturerSid FROM base_vehicle_brand WHERE useOrg LIKE %#{orgSid}%") + List selectManSidByOrgSid(String orgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml index 2f0cff7a8d..e151148357 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml @@ -41,6 +41,7 @@ + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 0e6a71822d..420af12785 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -366,4 +366,9 @@ public class SysOrganizationRest implements SysOrganizationFeign { public ResultBean> selectOrgLists(SysOrganizationListQuery query) { return sysOrganizationService.selectOrgLists(query); } + + @Override + public ResultBean selectByPSid(String sid, String name) { + return sysOrganizationService.selectByPSid(sid,name); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index 114f94ca94..ee71c6df3a 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -507,4 +507,10 @@ public class SysOrganizationService extends MybatisBaseService selectByPSid(String sid, String name) { + ResultBean rb = ResultBean.fireFail(); + SysOrganizationVo vo = baseMapper.selectByPSid(sid,name); + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 5c3ed76277..d945f76719 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -9,6 +9,7 @@ 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.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; @@ -32,7 +33,6 @@ import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto; import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleVo; import com.yxt.anrui.scm.api.scmfile.ScmFileDto; import com.yxt.anrui.scm.api.scmfile.ScmFileVo; -import com.yxt.anrui.scm.api.scmvehicleexamine.ScmEntryVehicleExamineDto; import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto; import com.yxt.anrui.scm.biz.scmapplyinboundvehicle.ScmApplyInboundVehicleService; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; @@ -50,7 +50,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; @@ -485,6 +484,11 @@ public class ScmApplyInboundService extends MybatisBaseService baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(s.getVinNo(),scmApplyInbound.getUseOrgSid()); bm.setFName(baseVehicleResultBean.getData().getVinNo());//物料名称 - bm.setFMaterialGroup("03");//物料分组 + bm.setFMaterialGroupKey("03");//物料分组 + bm.setFMaterialGroupType("03");//物料分组 //bm.setFUseOrgId("100");//使用组织 bm.setTOrgIds("100020");//欧曼黑龙江 - bm.setF_PAEZ_Base("牵引");//车辆类型 + bm.setF_PAEZ_BaseKey("牵引");//车辆类型 + bm.setF_PAEZ_BaseType("牵引");//车辆类型 list.add(bm); } }catch (Exception e){