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 be3685d672..02a9db1614 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 @@ -194,7 +194,7 @@ public interface BaseManufacturerFeign { @ApiOperation("根据分公司sid和厂商sid查询供应商sid") @GetMapping("/selectByOrgSidAndManBankSid/{useOrgSid}/{manufacturerSid}") @ResponseBody - ResultBean selectByOrgSidAndManBankSid(@PathVariable("useOrgSid") String useOrgSid,@PathVariable("manufacturerSid") String manufacturerSid); + ResultBean selectByOrgSidAndManBankSid(@PathVariable("useOrgSid") String useOrgSid,@PathVariable("manufacturerSid") String manufacturerSid); @ApiOperation("根据车型sid查询品牌、厂商等信息") @GetMapping("/getManDetails/{modelSid}") 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 2aafd11df3..d9e0701286 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 @@ -160,4 +160,20 @@ public class BaseVehicle extends BaseEntity { @ApiModelProperty(value = "供应商sid") private String supplierSid; + @ApiModelProperty(value = "存放地点code") + private String locationCode; + @ApiModelProperty(value = "部门编码") + private String purchaseSystemCode; + @ApiModelProperty(value = "厂家回款通路类别key") + private String manufSaleAccessKey; + @ApiModelProperty(value = "付款通路code") + private String paymentAccessNoKey; + @ApiModelProperty(value = "品牌code") + private String carBrandCode; + @ApiModelProperty(value = "厂商code") + private String manufacturerCode; + @ApiModelProperty(value = "供应商code") + private String supplierCode; + @ApiModelProperty(value = "分公司code") + private String orgCode; } 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 153711439c..95fd1e2448 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 @@ -128,4 +128,21 @@ public class BaseVehicleDto implements Dto { private String manufacturerSid; @ApiModelProperty(value = "供应商sid") private String supplierSid; + + @ApiModelProperty(value = "存放地点code") + private String locationCode; + @ApiModelProperty(value = "部门编码") + private String purchaseSystemCode; + @ApiModelProperty(value = "厂家回款通路类别key") + private String manufSaleAccessKey; + @ApiModelProperty(value = "付款通路code") + private String paymentAccessNoKey; + @ApiModelProperty(value = "品牌code") + private String carBrandCode; + @ApiModelProperty(value = "厂商code") + private String manufacturerCode; + @ApiModelProperty(value = "供应商code") + private String supplierCode; + @ApiModelProperty(value = "分公司code") + private String orgCode; } \ 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 d2abb709da..765c57764f 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 @@ -133,4 +133,21 @@ public class BaseVehicleSelectVo implements Vo { private String manufacturerSid; @ApiModelProperty(value = "供应商sid") private String supplierSid; + + @ApiModelProperty(value = "存放地点code") + private String locationCode; + @ApiModelProperty(value = "部门编码") + private String purchaseSystemCode; + @ApiModelProperty(value = "厂家回款通路类别key") + private String manufSaleAccessKey; + @ApiModelProperty(value = "付款通路code") + private String paymentAccessNoKey; + @ApiModelProperty(value = "品牌code") + private String carBrandCode; + @ApiModelProperty(value = "厂商code") + private String manufacturerCode; + @ApiModelProperty(value = "供应商code") + private String supplierCode; + @ApiModelProperty(value = "分公司code") + private String orgCode; } 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 d85afbde96..29baae326d 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 @@ -130,7 +130,22 @@ public class BaseVehicleVo implements Vo { private String manufSaleAccessSid; @ApiModelProperty(value = "厂家销售通路名称") private String manufSaleAccessName; - + @ApiModelProperty(value = "存放地点code") + private String locationCode; + @ApiModelProperty(value = "部门编码") + private String purchaseSystemCode; + @ApiModelProperty(value = "厂家回款通路类别key") + private String manufSaleAccessKey; + @ApiModelProperty(value = "付款通路code") + private String paymentAccessNoKey; + @ApiModelProperty(value = "品牌code") + private String carBrandCode; + @ApiModelProperty(value = "厂商code") + private String manufacturerCode; + @ApiModelProperty(value = "供应商code") + private String supplierCode; + @ApiModelProperty(value = "分公司code") + private String orgCode; //车型配置 @ApiModelProperty("车身颜色(陕汽必须的字段)") private String carColor; 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 58cb6334dc..19ef43fc9d 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 @@ -606,7 +606,7 @@ public class BaseAccadjApplyService extends MybatisBaseService voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation()); + fe.setFStockID(baseVehicle.getLocationCode()); + /*ResultBean voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation()); if (voResultBean.getSuccess()) { fe.setFStockID(voResultBean.getData().getGressionCode()); // fe.setFStockID("CK001"); //fe.setFStockID(baseInternalPurchaseVehicle.getInventoryLocationSid()); - } + }*/ /** * 库存状态:FStockStatusID */ 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 91eb95b45b..4532691ece 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 @@ -208,7 +208,7 @@ public class BaseManufacturerRest implements BaseManufacturerFeign { } @Override - public ResultBean selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) { + public ResultBean selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) { return baseManufacturerService.selectByOrgSidAndManBankSid(useOrgSid, manufacturerSid); } 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 4c321150b8..3ffda0c42b 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 @@ -625,10 +625,10 @@ public class BaseManufacturerService extends MybatisBaseService selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) { + public ResultBean selectByOrgSidAndManBankSid(String useOrgSid, String manufacturerSid) { ResultBean rb = ResultBean.fireFail(); BaseManufacturerDetailsVo baseManufacturerDetailsVo = baseMapper.selectByOrgSidAndManBankSid(useOrgSid, manufacturerSid); - return rb.success().setData(baseManufacturerDetailsVo.getSid()); + return rb.success().setData(baseManufacturerDetailsVo); } public ResultBean getManDetails(String modelSid) { 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 3d82b900c4..f15bf38aa9 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 @@ -8,6 +8,7 @@ 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.basemanufacturerbank.BaseManufacturerBankVo; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplication; @@ -235,6 +236,12 @@ public class BaseVehicleRest implements BaseVehicleFeign { int count = baseVehicleService.selectCountByVinNo(vinNo); ResultBean baseVehicleVoResultBean = baseVehicleService.selVehicleByVinNo(vinNo); BaseVehicleVo data = baseVehicleVoResultBean.getData(); + BaseManufacturerSidVo baseManufacturerSidVo = baseManufacturerService.getManufacturerSidAndSupplierSid(dto.getCarBrandSid(), dto.getUseOrgSid()).getData(); + if (baseManufacturerSidVo != null) { + dto.setManufacturerSid(baseManufacturerSidVo.getManufacturerSid()); + dto.setSupplierSid(baseManufacturerSidVo.getSupplierSid()); + } + buildVehicle(dto); if (count > 0) { ResultBean resultBean = update(dto, data.getSid()); if (!resultBean.getSuccess()) { @@ -243,6 +250,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setMsg(resultBean.getMsg()); } BaseVehicle baseVehicle = new BaseVehicle(); + String sid = baseVehicle.getSid(); dto.fillEntity(baseVehicle); //锁定状态 /*String lockedStateKey = VehicleState.LockEnum.UN_LOCK.getCode(); @@ -252,22 +260,19 @@ public class BaseVehicleRest implements BaseVehicleFeign { baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode()); baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks()); baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());*/ - baseVehicle.setLockedState(dto.getLockedState()); + /* baseVehicle.setLockedState(dto.getLockedState()); baseVehicle.setLockedStateValue(dto.getLockedStateValue()); baseVehicle.setVehicleState(dto.getVehicleState()); baseVehicle.setVehicleStateValue(dto.getVehicleStateValue()); baseVehicle.setSettlementStatus(dto.getSettlementStatus()); baseVehicle.setSettlementStatusValue(dto.getSettlementStatusValue()); baseVehicle.setWitPinState(dto.getWitPinState()); - baseVehicle.setWitPinStateValue(dto.getWitPinStateValue()); + baseVehicle.setWitPinStateValue(dto.getWitPinStateValue());*/ - BaseManufacturerSidVo baseManufacturerSidVo = baseManufacturerService.getManufacturerSidAndSupplierSid(dto.getCarBrandSid(), dto.getUseOrgSid()).getData(); - if (baseManufacturerSidVo != null) { - baseVehicle.setManufacturerSid(baseManufacturerSidVo.getManufacturerSid()); - baseVehicle.setSupplierSid(baseManufacturerSidVo.getSupplierSid()); - } + baseVehicle.setSid(sid); boolean isSave = baseVehicleService.save(baseVehicle); + //生成合格证信息 if (StringUtils.isNotBlank(dto.getVinNo())) { BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate(); baseVehicleCertificate.setVinNo(dto.getVinNo()); @@ -287,6 +292,32 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(baseVehicle.getSid()).setMsg("保存成功"); } + public void buildVehicle(BaseVehicleDto dto){ + //分公司code + SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(dto.getCreateOrgSid()).getData(); + dto.setOrgCode(sysOrganizationVo1.getOrgCode()); + //库存地点编码 + ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(dto.getLocation()).getData(); + dto.setLocationCode(scmWarehouseVo.getGressionCode());//库存地点编码 + //部门编码 + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getPurchaseSystemSid()).getData(); + dto.setPurchaseSystemCode(sysOrganizationVo.getOrgCode()); + //厂家回款通路类别key + BaseManufacturerBank baseManufacturerBank = baseManufacturerBankService.fetchBySid(dto.getManufSaleAccessSid()); + dto.setManufSaleAccessKey(baseManufacturerBank.getActualPayKey()); + //付款通路code + dto.setPaymentAccessNoKey(baseManufacturerBank.getPaymentAccessNoKey()); + //品牌编码 + BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.fetchBySid(dto.getCarBrandSid()); + dto.setCarBrandCode(baseVehicleBrand.getBrandCode()); + //厂商编码 + BaseManufacturer baseManufacturer = baseManufacturerService.fetchBySid(dto.getManufacturerSid()); + dto.setManufacturerCode(baseManufacturer.getManufacturerCode()); + //供应商code + SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(dto.getSupplierSid()).getData(); + dto.setSupplierCode(sysOrganizationVo2.getOtherCode()); + } + @Override public ResultBean saveOrUpdate(List dto, String eventType) { ResultBean rb = ResultBean.fireFail(); @@ -331,9 +362,13 @@ public class BaseVehicleRest implements BaseVehicleFeign { try { StkInStock stkInStock = new StkInStock(); BaseVehicleDto baseVehicle = dto.get(0); - String orgSid = baseVehicle.getCreateOrgSid(); + stkInStock.setFPurchaseOrgId(baseVehicle.getOrgCode()); + stkInStock.setTOrgId(baseVehicle.getOrgCode()); + stkInStock.setFPurchaseDeptId(baseVehicle.getPurchaseSystemCode()); + stkInStock.setFSupplierId(baseVehicle.getSupplierCode()); + //String orgSid = baseVehicle.getCreateOrgSid(); //分公司id - ResultBean resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid()); + /*ResultBean resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid()); if (resultBean.getSuccess()) { SysOrganizationVo vo = resultBean.getData(); if (vo != null) { @@ -342,8 +377,8 @@ public class BaseVehicleRest implements BaseVehicleFeign { stkInStock.setTOrgId(vo.getOrgCode()); } - } - 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(); @@ -372,7 +407,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { //车型品牌对应厂商生成的分公司的主机厂供应商编码 String manCode = baseVehicleModelService.getCode(baseVehicle.getModelSid(), baseVehicle.getCreateOrgSid()); stkInStock.setFSupplierId(manCode); - } + }*/ /** * // 入库日期:FDate (必填项) */ @@ -384,13 +419,14 @@ public class BaseVehicleRest implements BaseVehicleFeign { List fInStockEntry = new ArrayList<>(); for (BaseVehicleDto baseVehicleDto : dto) { StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry(); + sf.setWlfz(baseVehicleDto.getCarBrandCode()); /** * 物料分组 */ - BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseVehicleDto.getModelSid()); + /*BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseVehicleDto.getModelSid()); if (baseVehicleBrand != null) { sf.setWlfz(baseVehicleBrand.getBrandCode()); - } + }*/ /** * 单价 对应厂家结算价 */ @@ -403,11 +439,14 @@ public class BaseVehicleRest implements BaseVehicleFeign { if (ManPurOrderType.ManOrderType.PC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey()) || ManPurOrderType.ManOrderType.TC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { //根据sid查询 - BaseManufacturerBank baseManufacturerBank = baseManufacturerBankService.fetchBySid(baseVehicle.getManufSaleAccessSid()); + /* BaseManufacturerBank baseManufacturerBank = baseManufacturerBankService.fetchBySid(baseVehicle.getManufSaleAccessSid()); if (baseManufacturerBank != null) { sf.setCllx(baseManufacturerBank.getActualPayKey()); sf.setCllxType("sellChannel"); - } + }*/ + //车辆类型-厂家外采和调车 + sf.setCllx(baseVehicleDto.getManufSaleAccessKey()); + sf.setCllxType("sellChannel"); } else if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(baseVehicle.getManPurOrderTypeKey())) { //车辆类型-外采主车 sf.setCllx("60"); @@ -430,7 +469,9 @@ public class BaseVehicleRest implements BaseVehicleFeign { /** * // 仓库:FStockId-目前只分在途和正式两个仓库。 */ - if (StringUtils.isBlank(baseVehicleDto.getLocation())) { + //仓库编码 + sf.setFStockId(baseVehicleDto.getLocationCode()); + /*if (StringUtils.isBlank(baseVehicleDto.getLocation())) { // 在途仓库 sf.setFStockId("ARZTCK"); } else { @@ -439,7 +480,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { ScmWarehouseVo data = scmWarehouseVoResultBean.getData(); sf.setFStockId(data.getGressionCode()); } - } + }*/ fInStockEntry.add(sf); } 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 5cc992c508..c411ecb9f2 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 @@ -2557,6 +2557,31 @@ public class BaseVehicleService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid()); + salOutStock.setFSaleOrgId(baseVehicle.getOrgCode()); + /*ResultBean resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid()); if (resultBean.getSuccess()) { SysOrganizationVo vo = resultBean.getData(); if (vo != null) { salOutStock.setFSaleOrgId(vo.getOrgCode()); } - } + }*/ //客户 salOutStock.setFCustomerID(dto.getCustomerNo()); //销售部门id - ResultBean resultBean1 = sysOrganizationFeign.selectByPSid(baseVehicle.getCreateOrgSid(), "销售支持部"); + salOutStock.setFSaleDeptID(baseVehicle.getPurchaseSystemCode()); + /*ResultBean resultBean1 = sysOrganizationFeign.selectByPSid(baseVehicle.getCreateOrgSid(), "销售支持部"); if (resultBean1.getSuccess()) { SysOrganizationVo vo = resultBean1.getData(); if (vo != null) { salOutStock.setFSaleDeptID(vo.getOrgCode()); } - } + }*/ //项目类别key和项目类别type salOutStock.setF_PAEZ_AssistantType("payType"); salOutStock.setF_PAEZ_AssistantKey(dto.getTypeKey()); @@ -172,8 +174,9 @@ public class BaseVehicleOutService extends MybatisBaseService voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation()); - fEntity.setFStockID(voResultBean.getData().getGressionCode()); + fEntity.setFStockID(baseVehicle.getLocationCode()); + /*ResultBean voResultBean = scmWarehouseFeign.fetchBySid(baseVehicle.getLocation()); + fEntity.setFStockID(voResultBean.getData().getGressionCode());*/ //销售折让 if (StringUtils.isNotBlank(dto.getSalesAllowance())) { fEntity.setF_PAEZ_Decimal3(dto.getSalesAllowance()); 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 ccff2e09b1..0f0b99203f 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 @@ -25,6 +25,7 @@ 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.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService; import com.yxt.anrui.base.biz.busvehicleapplysz.BusVehicleApplySzService; @@ -108,6 +109,8 @@ public class BusVehicleApplyService extends MybatisBaseService listPage(PagerQuery pq) { ScmApplyInboundQuery query = pq.getParams(); @@ -520,10 +529,18 @@ public class ScmApplyInboundService extends MybatisBaseService baseVehicleFeign.saveOrUpdate(baseVehicleDtos, OperVehicleState.EventType.RZ_SAVEVEH.getCode())); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index 3175e087a3..d28dc5a4c7 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -32,8 +32,11 @@ import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleFeign; +import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign; import com.yxt.anrui.base.api.basemanufacturer.BaseOutManuVo; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; @@ -56,6 +59,7 @@ import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmvehicleenterlibrary.*; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse; +import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmwarehouse.ScmWarehouseService; import com.yxt.common.base.config.component.FileUploadComponent; @@ -124,6 +128,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService createQueryWrapper(ScmVehicleEnterlibraryQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -417,17 +423,30 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService resultBeanBaseManu = baseManufacturerFeign.getManDetails(scmVehicleEnterlibrary.getModelSid()); baseVehicleDto.setSupplierSid(applicationDetailsVo.getPurchasingUnitSid()); + //供应商code + BaseManufacturerAllVo baseManufacturerAllVo1 = baseManufacturerFeign.details(applicationDetailsVo.getPurchasingUnitSid()).getData(); + baseVehicleDto.setSupplierCode(baseManufacturerAllVo1.getBaseManufacturerDto().getManufacturerCode()); if (resultBeanBaseManu.getData() != null) { + BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(resultBeanBaseManu.getData().getManufacturerSid()).getData(); baseVehicleDto.setManufacturerSid(resultBeanBaseManu.getData().getManufacturerSid()); + baseVehicleDto.setManufacturerCode(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerCode());//厂商编码 baseVehicleDto.setCarBrandSid(resultBeanBaseManu.getData().getBrandSid()); baseVehicleDto.setCarBrandName(resultBeanBaseManu.getData().getBrandName()); + //品牌编码 + BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(resultBeanBaseManu.getData().getBrandSid()); + baseVehicleDto.setCarBrandCode(baseVehicleBrand.getBrandCode()); } } + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(scmVehicleEnterlibrary.getUseOrgSid()).getData(); + baseVehicleDto.setOrgCode(sysOrganizationVo.getOrgCode()); baseVehicleDto.setCreateOrgSid(scmVehicleEnterlibrary.getUseOrgSid()); baseVehicleDto.setCreateOrgName(scmVehicleEnterlibrary.getUseOrgName()); baseVehicleDto.setUseOrgSid(scmVehicleEnterlibrary.getUseOrgSid()); @@ -436,6 +455,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService stringResultBean = baseManufacturerFeign.selectByInternalPurchaseSid(internalPurchaseDetailsVo.getBuyerOrgSid(), internalPurchaseDetailsVo.getSellerOrgName()); - if (stringResultBean.getData() != null) { - baseVehicleDto.setSupplierSid(stringResultBean.getData()); - } + baseVehicleDto.setSupplierSid(internalPurchaseDetailsVo.getSellerOrgSid()); + //供应商code + SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(internalPurchaseDetailsVo.getSellerOrgSid()).getData(); + baseVehicleDto.setSupplierCode(sysOrganizationVo2.getOtherCode()); //厂商sid 品牌 和 品牌 sid BaseVehicleBrand baseVehicleBrand = baseVehicleBrandFeign.fetchBySid(internalPurchaseDetailsVo.getBrandSid()); if (baseVehicleBrand != null) { baseVehicleDto.setManufacturerSid(baseVehicleBrand.getManufacturerSid()); + BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(baseVehicleBrand.getManufacturerSid()).getData(); + baseVehicleDto.setManufacturerCode(baseManufacturerAllVo.getBaseManufacturerDto().getManufacturerCode());//厂商编码 } baseVehicleDto.setCarBrandSid(internalPurchaseDetailsVo.getBrandSid()); baseVehicleDto.setCarBrandName(internalPurchaseDetailsVo.getBrandName()); + //品牌编码 + baseVehicleDto.setCarBrandCode(baseVehicleBrand.getBrandCode()); //采购部门sid 和采购部门名称 baseVehicleDto.setPurchaseSystemSid(internalPurchaseDetailsVo.getCallInBuyerOrgSid()); baseVehicleDto.setPurchaseSystemName(internalPurchaseDetailsVo.getCallInBuyerOrgName()); + //部门编码 + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(internalPurchaseDetailsVo.getCallInBuyerOrgSid()).getData(); + baseVehicleDto.setPurchaseSystemCode(sysOrganizationVo.getOrgCode()); ResultBean baseVehicleResultBean = baseVehicleFeign.selectByVinNoAndOrgSid(scmVehicleEnterlibrary.getVinNo(), internalPurchaseDetailsVo.getSellerOrgSid()); //厂家回款通路sid 厂家回款通路名称 if (baseVehicleResultBean.getData() != null) { baseVehicleDto.setManufSaleAccessSid(baseVehicleResultBean.getData().getManufSaleAccessSid()); baseVehicleDto.setManufSaleAccessName(baseVehicleResultBean.getData().getManufSaleAccessName()); + //厂家回款通路类别key + BaseManufacturerBankVo baseManufacturerBankVo = baseManufacturerBankFeign.selectDetails(baseVehicleResultBean.getData().getManufSaleAccessSid()).getData(); + baseVehicleDto.setManufSaleAccessKey(baseManufacturerBankVo.getActualPayKey()); + //付款通路code + baseVehicleDto.setPaymentAccessNoKey(baseManufacturerBankVo.getPaymentAccessNoKey()); } List list = new ArrayList<>(); list.add(baseVehicleDto); @@ -548,9 +585,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService getToDoNum(String userSid,String orgPath) { + public ResultBean getToDoNum(String userSid, String orgPath) { ResultBean rb = ResultBean.fireFail(); - if(StringUtils.isBlank(orgPath)){ + if (StringUtils.isBlank(orgPath)) { orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); } int count = baseMapper.getToDoNum(orgPath); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index 488f48a74f..43b377bac1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -29,6 +29,8 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo; +import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; @@ -115,6 +117,9 @@ public class ScmVehicleExamineService extends MybatisBaseService createQueryWrapper(ScmVehicleExamineQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -172,7 +177,7 @@ public class ScmVehicleExamineService extends MybatisBaseService selectCarInspectedList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); - String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getParams().getUserSid()).getData().getSid(); + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); pagerQuery.getParams().setUseOrgSid(useOrgSid); QueryWrapper qw = carInspectedQueryWrapper(pagerQuery.getParams()); IPage iPage = baseMapper.selectCarInspectedList(page, qw); @@ -635,10 +640,15 @@ public class ScmVehicleExamineService extends MybatisBaseService