From 326c8d349967d409068b74855e0bed1ff2e170ac Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Fri, 29 Jul 2022 15:08:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/basemodelconfig/BaseModelConfigMapper.xml | 2 +- .../biz/busdeliveredapply/BusDeliveredApplyMapper.xml | 3 ++- .../biz/busdeliveredapply/BusDeliveredApplyService.java | 7 ++++++- .../crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml | 2 +- .../api/scmvehicleexamine/AppScmVehicleExaminePageVo.java | 3 +++ .../anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java | 2 ++ .../scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml | 3 ++- .../biz/scmvehicleexamine/ScmVehicleExamineService.java | 1 + .../supplychain/scmvehicleexamine/AppExaminePageVo.java | 3 +++ 9 files changed, 21 insertions(+), 5 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml index a4967fe000..eae854c2cf 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml @@ -588,7 +588,7 @@ bmc.independentSources, bmc.fuelTank, bmc.multimedia, - bv.guidedPrice, +-- bv.salePrice as price, bmc.otherConfig FROM base_vehicle bv LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml index b0fcdb454f..1491746632 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml @@ -39,7 +39,8 @@ if(length(bd.nodeState) > 0, nodeState, '待提交') as contractState, if(length(bd.nodeState) > 0, false, true) as showUpdata, bd.contractNo as contractId, - bd.applyName as `name`, + bd.applyName, + bd.name as customerName, DATE_FORMAT(bd.applyDate, '%Y-%m-%d') as `date` FROM bus_delivered_apply bd diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 251fcd6d03..e785104bef 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -49,6 +49,7 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; @@ -89,6 +90,8 @@ public class BusDeliveredApplyService extends MybatisBaseService carList = appDeliveredApplyDto.getCarList(); if (carList.size() > 0) { busDeliveredApplyDetailsService.appSaveList(carList, busDeliveredApply.getSid()); @@ -727,6 +730,8 @@ public class BusDeliveredApplyService extends MybatisBaseService ${ew.sqlSegment} 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 69976c1c04..0fa3a89c15 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 @@ -355,6 +355,7 @@ public class ScmVehicleExamineService extends MybatisBaseService Date: Fri, 29 Jul 2022 15:34:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleBuyBlank.java | 23 + .../api/basevehicle/BaseVehicleFeign.java | 18 + .../basevehicle/BaseVehicleFeignFallback.java | 10 + .../basevehicle/BaseVehicleOutLibrary.java | 39 ++ .../BusVehicleOfferDetailVo.java | 4 + .../commonappendix/CommonAttachTypeEnum.java | 3 +- .../biz/basevehicle/BaseVehicleMapper.java | 4 + .../biz/basevehicle/BaseVehicleMapper.xml | 34 +- .../base/biz/basevehicle/BaseVehicleRest.java | 20 +- .../biz/basevehicle/BaseVehicleService.java | 73 ++- .../BusVehicleOfferService.java | 611 +++++++++--------- .../crmcustomertemp/CrmCustomerTempDto.java | 2 + .../scmapplyinbound/ScmApplyInboundQuery.java | 3 + .../api/scmwarehouse/ScmWarehouseQuery.java | 4 +- .../ScmApplyInboundService.java | 27 +- .../biz/scmwarehouse/ScmWarehouseService.java | 4 +- 16 files changed, 538 insertions(+), 341 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleBuyBlank.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleOutLibrary.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleBuyBlank.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleBuyBlank.java new file mode 100644 index 0000000000..9b567087b4 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleBuyBlank.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.anrui.base.api.commonappendix.CommonAppendix; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description 车辆台账买断 + */ +@Data +public class BaseVehicleBuyBlank implements Vo { + + @ApiModelProperty(value = "车辆sid") + private List vehicleSid; + @ApiModelProperty(value = "买断日期") + private String solidDate; + @ApiModelProperty(value = "买断附件信息") + private CommonAppendix commonAppendix; +} 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 5eea07e624..d6c4af5460 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 @@ -70,6 +70,24 @@ public interface BaseVehicleFeign { @PostMapping("/saveAll") public ResultBean saveAll(@Valid @RequestBody List dto); + /** + * 车辆台账出库 + * + * @return + */ + @ApiOperation("车辆台账出库") + @PostMapping("/vehicleOutLibrary") + public ResultBean vehicleOutLibrary(@RequestBody BaseVehicleOutLibrary baseVehicleOutLibrary); + + /** + * 车辆台账买断 + * + * @return + */ + @ApiOperation("车辆台账买断") + @PostMapping("/vehicleBuyBreak") + public ResultBean vehicleBuyBreak(@RequestBody BaseVehicleBuyBlank baseVehicleBuyBlank); + /** * 修改保存 * diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 38a48dc160..f5a5cdb9b9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -46,6 +46,16 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean vehicleOutLibrary(BaseVehicleOutLibrary baseVehicleOutLibrary) { + return null; + } + + @Override + public ResultBean vehicleBuyBreak(BaseVehicleBuyBlank baseVehicleBuyBlank) { + return null; + } + @Override public ResultBean update(BaseVehicleDto dto, String sid) { return ResultBean.fireFail().setMsg("接口anrui-base/basevehicle/update无法访问"); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleOutLibrary.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleOutLibrary.java new file mode 100644 index 0000000000..74189b41a4 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleOutLibrary.java @@ -0,0 +1,39 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description 车辆台账出库 + */ +@Data +public class BaseVehicleOutLibrary implements Vo { + + @ApiModelProperty(value = "车辆sid") + private String vehicleSid; + @ApiModelProperty(value = "库存状态value") + private String vehicleStateValue; + @ApiModelProperty(value = "出库类型value") + private String outLibraryValue; + @ApiModelProperty(value = "userSid") + private String userSid; + @ApiModelProperty(value = "合同编号") + private String contractNo; + @ApiModelProperty(value = "成交价") + private String salePrice; + @ApiModelProperty(value = "客户类型key") + private String customerTypeKey; + @ApiModelProperty(value = "客户类型value") + private String customerType; + @ApiModelProperty(value = "客户名称") + private String customerName; + @ApiModelProperty(value = "手机号码") + private String mobile; + @ApiModelProperty(value = "身份证号码") + private String IDNumber; + @ApiModelProperty(value = "联系地址") + private String address; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferDetailVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferDetailVo.java index 05a5d5a8b4..f740648a32 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferDetailVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferDetailVo.java @@ -197,6 +197,10 @@ public class BusVehicleOfferDetailVo implements Vo { private String salePrice; @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("换装配置") + private String replacementConfig; + @ApiModelProperty("选装配置") + private String optionalConfig; @ApiModelProperty("创建组织sid") private String createOrgSid; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java index b2cb4fc18b..cf5ed5aa82 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java @@ -51,7 +51,8 @@ public enum CommonAttachTypeEnum { MANUFACTOR_RETWARE("0014", "厂家退库车辆附件"), SHUNTINGINVOICINAPPLY("0015", "调车开票附件"), OUTSOURCINGAPPLY("0016", "外采申请附件"), - INBOUNDAPPLY("0017", "入账申请附件"); + INBOUNDAPPLY("0017", "入账申请附件"), + VEHBUYBLANK("0018", "车辆买断附件"); /** * 附件类型 */ 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 386e36ba57..5cb569115a 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 @@ -418,4 +418,8 @@ public interface BaseVehicleMapper extends BaseMapper { IPage getPcVinByWarehouseSid(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("warehouseSid") String warehouseSid); ExiCarConfigDetailVo selectExiCarConfigByVehModelConfigSid(@Param("vehModelConfigSid") String vehModelConfigSid); + + void updateVehicleOutLibrary(@Param("sid") String sid,@Param("vehicleState") String vehicleState,@Param("vehicleStateValue") String vehicleStateValue,@Param("salesDate") String salesDate,@Param("salePrice") String salePrice,@Param("remarks") String remarks); + + void updateVehicleBuyBreak(@Param("sid") String sid,@Param("solidDate") String solidDate,@Param("settlementStatus") String settlementStatus,@Param("settlementStatusValue") String settlementStatusValue); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 4d85c8b345..bf2a976bb7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -324,7 +324,7 @@ bvm.fuelTypeValue, bvm.gearboxTypeValue, bvm.marketSegmentsValue as marketSegments, - bvm.departmentValue as department, + bvm.departmentValue as department, bvm.emissionStandardValue, bvm.engineTypeValue, bvm.announcementModel, @@ -805,9 +805,9 @@ - select bvm.vehicleAlias AS modelName, - convert(bvc.guidedPrice/10000,decimal(10,2)) AS price, - bmc.configName AS commonlyConfig + select bvm.vehicleAlias AS modelName, + convert(bvc.guidedPrice / 10000, decimal (10, 2)) AS price, + bmc.configName AS commonlyConfig from base_vehmodel_config bvc LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid` @@ -961,4 +961,24 @@ and bv.location = #{warehouseSid} + + + UPDATE + base_vehicle + SET vehicleState = #{vehicleState}, + vehicleStateValue = #{vehicleStateValue}, + salesDate = #{salesDate}, + salePrice = #{salePrice}, + remarks = #{remarks} + WHERE sid = #{sid} + + + + UPDATE + base_vehicle + SET solidDate = #{solidDate}, + settlementStatus = #{settlementStatus}, + settlementStatusValue = #{settlementStatusValue} + WHERE sid = #{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 c3002a0a0d..5809318143 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 @@ -108,13 +108,19 @@ public class BaseVehicleRest implements BaseVehicleFeign { BaseVehicle baseVehicle = new BaseVehicle(); dto.fillEntity(baseVehicle); //锁定状态 - String lockedStateKey = VehicleState.LockEnum.UN_LOCK.getCode(); + /*String lockedStateKey = VehicleState.LockEnum.UN_LOCK.getCode(); String lockedStateValue = VehicleState.LockEnum.UN_LOCK.getRemarks(); baseVehicle.setLockedState(lockedStateKey); baseVehicle.setLockedStateValue(lockedStateValue); baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode()); baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks()); - baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode()); + baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());*/ + baseVehicle.setLockedState(dto.getLockedState()); + baseVehicle.setLockedStateValue(dto.getLockedStateValue()); + baseVehicle.setVehicleState(dto.getVehicleState()); + baseVehicle.setVehicleStateValue(dto.getVehicleStateValue()); + baseVehicle.setSettlementStatus(dto.getSettlementStatus()); + baseVehicle.setSettlementStatusValue(dto.getSettlementStatusValue()); boolean isSave = baseVehicleService.save(baseVehicle); BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate(); if (StringUtils.isNotBlank(dto.getVinNo())){ @@ -140,6 +146,16 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setMsg("保存成功"); } + @Override + public ResultBean vehicleOutLibrary(BaseVehicleOutLibrary baseVehicleOutLibrary) { + return baseVehicleService.vehicleOutLibrary(baseVehicleOutLibrary); + } + + @Override + public ResultBean vehicleBuyBreak(BaseVehicleBuyBlank baseVehicleBuyBlank) { + return baseVehicleService.vehicleBuyBreak(baseVehicleBuyBlank); + } + @Override public ResultBean update(BaseVehicleDto dto, String sid) { ResultBean rb = ResultBean.fireFail(); 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 4d92cc7a46..d6b7c2e31d 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 @@ -1,5 +1,6 @@ package com.yxt.anrui.base.biz.basevehicle; +import cn.hutool.core.date.DateUtil; import com.alibaba.nacos.api.config.filter.IFilterConfig; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -10,6 +11,9 @@ import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; +import com.yxt.anrui.base.api.commonappendix.CommonAppendix; +import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; +import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService; import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService; @@ -20,9 +24,15 @@ import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign; import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.DateUtils; @@ -63,9 +73,7 @@ public class BaseVehicleService extends MybatisBaseService 0) { qw.notIn("bv.vinNo", params.getVinNoList()); } - //结算状态：0没买断 + //结算状态：0未买断 qw.eq("bv.settlementStatus", VehicleState.BuyoutEnum.UN_BUYOUT.getCode()); //车辆状态：现车 qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()); @@ -1362,7 +1374,7 @@ public class BaseVehicleService extends MybatisBaseService pagging = baseMapper.getModelNowCarList(page, qw); for (AppBaseVinNowCarVo record : pagging.getRecords()) { BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateService.selStateByVehicleSid(record.getSid()); - if (baseVehicleCertificateVo != null){ + if (baseVehicleCertificateVo != null) { record.setCertificate(baseVehicleCertificateVo.getCertificateStateValue()); } vinNowCarVos.add(record); @@ -1614,4 +1626,53 @@ public class BaseVehicleService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(userSid); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + StringBuffer remarks = new StringBuffer(); + String outLibraryValue = baseVehicleOutLibrary.getOutLibraryValue(); + String contractNo = baseVehicleOutLibrary.getContractNo(); + if (StringUtils.isNotBlank(outLibraryValue)) { + remarks.append(outLibraryValue).append(" "); + } + if (StringUtils.isNotBlank(contractNo)) { + remarks.append(contractNo); + } + String salePrice = baseVehicleOutLibrary.getSalePrice(); + baseMapper.updateVehicleOutLibrary(vehicleSid,VehicleState.StockEnum.OUT_STOCK.getCode(),VehicleState.StockEnum.OUT_STOCK.getRemarks(), DateUtil.today(),salePrice,remarks.toString()); + CrmCustomerTempDto crmCustomerTempDto = new CrmCustomerTempDto(); + crmCustomerTempDto.setCustomerTypeKey(baseVehicleOutLibrary.getCustomerTypeKey()); + crmCustomerTempDto.setCustomerType(baseVehicleOutLibrary.getCustomerType()); + crmCustomerTempDto.setName(baseVehicleOutLibrary.getCustomerName()); + crmCustomerTempDto.setMobile(baseVehicleOutLibrary.getMobile()); + crmCustomerTempDto.setIDNumber(baseVehicleOutLibrary.getIDNumber()); + crmCustomerTempDto.setAddress(baseVehicleOutLibrary.getAddress()); + crmCustomerTempDto.setStaffSid(userVoResultBean.getData().getStaffSid()); + crmCustomerTempFeign.save(crmCustomerTempDto); + return rb.success().setMsg("出库成功"); + } + + public ResultBean vehicleBuyBreak(BaseVehicleBuyBlank baseVehicleBuyBlank) { + ResultBean rb = ResultBean.fireFail(); + List vehicleSid = baseVehicleBuyBlank.getVehicleSid(); + String solidDate = baseVehicleBuyBlank.getSolidDate(); + CommonAppendix commonAppendix = baseVehicleBuyBlank.getCommonAppendix(); + for (String s : vehicleSid) { + baseMapper.updateVehicleBuyBreak(s,solidDate,VehicleState.BuyoutEnum.BUYOUT.getCode(),VehicleState.BuyoutEnum.BUYOUT.getRemarks()); + commonAppendix.setLinkSid(s); + commonAppendix.setAttachType(CommonAttachTypeEnum.VEHBUYBLANK.getAttachType()); + commonAppendixService.save(commonAppendix); + } + 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/busvehicleoffer/BusVehicleOfferService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java index fc7a961685..009dd57d92 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java @@ -68,311 +68,316 @@ import java.util.List; @Service public class BusVehicleOfferService extends MybatisBaseService { - @Autowired - private BusVehicleInquiryService busVehicleInquiryService; - @Autowired - private BaseModelConfigService baseModelConfigService; - @Autowired - private BaseVehicleModelService baseVehicleModelService; - @Autowired - private SysUserFeign sysUserFeign; - @Autowired - private BaseVehmodelOptionService baseVehmodelOptionService; - @Autowired - private BaseVehmodelConfigService baseVehmodelConfigService; + @Autowired + private BusVehicleInquiryService busVehicleInquiryService; + @Autowired + private BaseModelConfigService baseModelConfigService; + @Autowired + private BaseVehicleModelService baseVehicleModelService; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private BaseVehmodelOptionService baseVehmodelOptionService; + @Autowired + private BaseVehmodelConfigService baseVehmodelConfigService; - public PagerVo listPageVo(PagerQuery pq) { - BusVehicleOfferQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("createOrgSid", query.getCreateOrgSid()); - qw.eq("state",0); - if (StringUtils.isNotBlank(query.getBrandSid())) { - qw.eq("brandSid", query.getBrandSid()); - } - if (StringUtils.isNotBlank(query.getVehModelName())) { - qw.like("vehModelName", query.getVehModelName()); - } - String offerStartDate = query.getOfferStartDate(); - String offerEndDate = query.getOfferEndDate(); - qw.apply(StringUtils.isNotBlank(offerStartDate), "date_format (createTime,'%Y-%m-%d') >= date_format('" + offerStartDate + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(offerEndDate), "date_format (createTime,'%Y-%m-%d') <= date_format('" + offerEndDate + "','%Y-%m-%d')" - ); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(BusVehicleOfferDto dto){ - BusVehicleOffer entity = new BusVehicleOffer(); - dto.fillEntity(entity); - this.saveOrUpdate(entity); - } - - public BusVehicleOfferVo fetchByIdVo(String id){ - BusVehicleOffer entity = this.fetchById(id); - BusVehicleOfferVo vo = new BusVehicleOfferVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + public PagerVo listPageVo(PagerQuery pq) { + BusVehicleOfferQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("createOrgSid", query.getCreateOrgSid()); + qw.eq("state", 0); + if (StringUtils.isNotBlank(query.getBrandSid())) { + qw.eq("brandSid", query.getBrandSid()); + } + if (StringUtils.isNotBlank(query.getVehModelName())) { + qw.like("vehModelName", query.getVehModelName()); + } + String offerStartDate = query.getOfferStartDate(); + String offerEndDate = query.getOfferEndDate(); + qw.apply(StringUtils.isNotBlank(offerStartDate), "date_format (createTime,'%Y-%m-%d') >= date_format('" + offerStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(offerEndDate), "date_format (createTime,'%Y-%m-%d') <= date_format('" + offerEndDate + "','%Y-%m-%d')" + ); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } - public ResultBean fetchAll(String sid) { - ResultBean rb = ResultBean.fireFail(); - BusVehicleOfferDetailVo busVehicleOfferDetailVo = new BusVehicleOfferDetailVo(); - BusVehicleInquiry busVehicleInquiry = busVehicleInquiryService.fetchBySid(sid); - if (busVehicleInquiry == null){ - return rb.setMsg("该询价单不存在"); - } - busVehicleOfferDetailVo.setSid(busVehicleInquiry.getSid()); - busVehicleOfferDetailVo.setInquirer(busVehicleInquiry.getInquirer()); - String createBySid = busVehicleInquiry.getCreateBySid(); - ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(createBySid); - SysUserVo sysUserVo = sysUserVoResultBean.getData(); - if (sysUserVo == null){ - return rb.setMsg("该用户不存在"); - } - busVehicleOfferDetailVo.setPhone(sysUserVo.getMobile()); - busVehicleOfferDetailVo.setCreateTime(busVehicleInquiry.getCreateTime()); - busVehicleOfferDetailVo.setVehModelSid(busVehicleInquiry.getVehModelSid()); - busVehicleOfferDetailVo.setVehModel(busVehicleInquiry.getVehModel()); - busVehicleOfferDetailVo.setVehModelConfigSid(busVehicleInquiry.getVehModelConfigSid()); - busVehicleOfferDetailVo.setVehModelConfig(busVehicleInquiry.getVehModelConfig()); - busVehicleOfferDetailVo.setMoreConfig(busVehicleInquiry.getMoreConfig()); - List stringList = baseVehmodelOptionService.selByVehModelSid(busVehicleInquiry.getVehModelSid()); - String repInstr = ""; - for (String s : stringList) { - repInstr += s + ","; - } - if (StringUtils.isNotBlank(repInstr)){ - busVehicleOfferDetailVo.setRepInstr(repInstr.substring(0,repInstr.length()-1)); - } - busVehicleOfferDetailVo.setOtherConfig(busVehicleInquiry.getOtherConfig()); - busVehicleOfferDetailVo.setVehicleAlias(busVehicleInquiry.getVehModel()); - busVehicleOfferDetailVo.setBrandSid(busVehicleInquiry.getBrandSid()); - busVehicleOfferDetailVo.setBrandName(busVehicleInquiry.getBrandName()); - BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(busVehicleInquiry.getVehModelSid()); - if (baseVehicleModel == null){ - return rb.setMsg("该车型不存在"); - } - busVehicleOfferDetailVo.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue()); - busVehicleOfferDetailVo.setProductLineValue(baseVehicleModel.getProductLineValue()); - busVehicleOfferDetailVo.setDriveFormValue(baseVehicleModel.getDriveFormValue()); - busVehicleOfferDetailVo.setPowerValue(baseVehicleModel.getPowerValue()); - busVehicleOfferDetailVo.setVehicleVersionValue(baseVehicleModel.getVehicleVersionValue()); - busVehicleOfferDetailVo.setFuelTypeValue(baseVehicleModel.getFuelTypeValue()); - busVehicleOfferDetailVo.setGearboxTypeValue(baseVehicleModel.getGearboxTypeValue()); - busVehicleOfferDetailVo.setMarketSegmentsValue(baseVehicleModel.getMarketSegmentsValue()); - busVehicleOfferDetailVo.setEngineTypeValue(baseVehicleModel.getEngineTypeValue()); - busVehicleOfferDetailVo.setSpecifications(baseVehicleModel.getSpecifications()); - busVehicleOfferDetailVo.setEmissionStandardValue(baseVehicleModel.getEmissionStandardValue()); - busVehicleOfferDetailVo.setDepartmentValue(baseVehicleModel.getDepartmentValue()); - BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(busVehicleInquiry.getVehModelConfigSid()); - if (baseModelConfig == null){ - return rb.setMsg("该常用配置不存在"); - } - busVehicleOfferDetailVo.setCarColorKey(baseModelConfig.getCarColorKey()); - busVehicleOfferDetailVo.setCarColor(baseModelConfig.getCarColor()); - busVehicleOfferDetailVo.setSpecificationKey(baseModelConfig.getSpecificationKey()); - busVehicleOfferDetailVo.setSpecification(baseModelConfig.getSpecification()); - busVehicleOfferDetailVo.setBaffleModelKey(baseModelConfig.getBaffleModelKey()); - busVehicleOfferDetailVo.setBaffleModel(baseModelConfig.getBaffleModel()); - busVehicleOfferDetailVo.setSaddleKey(baseModelConfig.getSaddleKey()); - busVehicleOfferDetailVo.setSaddle(baseModelConfig.getSaddle()); - busVehicleOfferDetailVo.setIndependentSourcesKey(baseModelConfig.getIndependentSourcesKey()); - busVehicleOfferDetailVo.setIndependentSources(baseModelConfig.getIndependentSources()); - busVehicleOfferDetailVo.setSlowMachineKey(baseModelConfig.getSlowMachineKey()); - busVehicleOfferDetailVo.setSlowMachine(baseModelConfig.getSlowMachine()); - busVehicleOfferDetailVo.setRearAxleRatioKey(baseModelConfig.getRearAxleRatioKey()); - busVehicleOfferDetailVo.setRearAxleRatio(baseModelConfig.getRearAxleRatio()); - busVehicleOfferDetailVo.setSuspensionKey(baseModelConfig.getSuspensionKey()); - busVehicleOfferDetailVo.setSuspension(baseModelConfig.getSuspension()); - busVehicleOfferDetailVo.setWheelbaseKey(baseModelConfig.getWheelbaseKey()); - busVehicleOfferDetailVo.setWheelbase(baseModelConfig.getWheelbase()); - busVehicleOfferDetailVo.setFuelTankKey(baseModelConfig.getFuelTankKey()); - busVehicleOfferDetailVo.setFuelTank(baseModelConfig.getFuelTank()); - busVehicleOfferDetailVo.setRearViewMirrorKey(baseModelConfig.getRearViewMirrorKey()); - busVehicleOfferDetailVo.setRearViewMirror(baseModelConfig.getRearViewMirror()); - busVehicleOfferDetailVo.setAirConditionerKey(baseModelConfig.getAirConditionerKey()); - busVehicleOfferDetailVo.setAirConditioner(baseModelConfig.getAirConditioner()); - busVehicleOfferDetailVo.setSeatKey(baseModelConfig.getSeatKey()); - busVehicleOfferDetailVo.setSeat(baseModelConfig.getSeat()); - busVehicleOfferDetailVo.setBumperKey(baseModelConfig.getBumperKey()); - busVehicleOfferDetailVo.setBumper(baseModelConfig.getBumper()); - busVehicleOfferDetailVo.setMultimediaKey(baseModelConfig.getMultimediaKey()); - busVehicleOfferDetailVo.setMultimedia(baseModelConfig.getMultimedia()); - busVehicleOfferDetailVo.setTireSizeKey(baseModelConfig.getTireSizeKey()); - busVehicleOfferDetailVo.setTireSize(baseModelConfig.getTireSize()); - busVehicleOfferDetailVo.setHubMaterialKey(baseModelConfig.getHubMaterialKey()); - busVehicleOfferDetailVo.setHubMaterial(baseModelConfig.getHubMaterial()); - busVehicleOfferDetailVo.setTireCoverKey(baseModelConfig.getTireCoverKey()); - busVehicleOfferDetailVo.setTireCover(baseModelConfig.getTireCover()); - busVehicleOfferDetailVo.setConfiguringBaoKey(baseModelConfig.getConfiguringBaoKey()); - busVehicleOfferDetailVo.setConfiguringBao(baseModelConfig.getConfiguringBao()); - busVehicleOfferDetailVo.setPackingCaseKey(baseModelConfig.getPackingCaseKey()); - busVehicleOfferDetailVo.setPackingCase(baseModelConfig.getPackingCase()); - BusVehicleOffer busVehicleOfferVo = baseMapper.fetchByMainSid(busVehicleInquiry.getSid()); - if (busVehicleOfferVo != null){ - busVehicleOfferDetailVo.setSpecialInstructions(busVehicleOfferVo.getSpecialInstructions()); - busVehicleOfferDetailVo.setCostPrice(busVehicleOfferVo.getCostPrice()); - busVehicleOfferDetailVo.setSalePrice(busVehicleOfferVo.getSalePrice()); - busVehicleOfferDetailVo.setRemarks(busVehicleOfferVo.getRemarks()); - busVehicleOfferDetailVo.setCreateOrgSid(busVehicleInquiry.getCreateOrgSid()); - } - return rb.success().setData(busVehicleOfferDetailVo); - } + public void saveOrUpdateDto(BusVehicleOfferDto dto) { + BusVehicleOffer entity = new BusVehicleOffer(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } - public ResultBean offerSubmit(BusVehicleOfferDetailVo busVehicleOfferDetailVo) { - ResultBean rb = ResultBean.fireFail(); - BusVehicleOffer busVehicleOffer = new BusVehicleOffer(); - String sid = busVehicleOffer.getSid(); - String configName = ""; - //缓速器 - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSlowMachine()) && "有".equals(busVehicleOfferDetailVo.getSlowMachine())) { - configName += "缓速器/"; - } - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getRearViewMirror())) { - configName += busVehicleOfferDetailVo.getRearViewMirror() + "/"; - } - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getTireSize())) { - configName += busVehicleOfferDetailVo.getTireSize() + "/"; - } - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getRearAxleRatio())) { - configName += busVehicleOfferDetailVo.getRearAxleRatio() + "/"; - } - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getAirConditioner()) && "有".equals(busVehicleOfferDetailVo.getAirConditioner())) { - configName += "空调/"; - } - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getHubMaterial())) { - configName += busVehicleOfferDetailVo.getHubMaterial() + "/"; - } - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getBaffleModel())) { - configName += busVehicleOfferDetailVo.getBaffleModel() + "/"; - } - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSuspension())) { - configName += busVehicleOfferDetailVo.getSuspension() + "/"; - } - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSeat())) { - configName += busVehicleOfferDetailVo.getSeat() + "/"; - } - //护轮罩 - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getTireCover()) && "有".equals(busVehicleOfferDetailVo.getTireCover())) { - configName += "护轮罩/"; - } - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSaddle())) { - configName += busVehicleOfferDetailVo.getSaddle() + "/"; - } - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getWheelbase())) { - configName += busVehicleOfferDetailVo.getWheelbase() + "/"; - } - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getBumper())) { - configName += busVehicleOfferDetailVo.getBumper() + "/"; - } - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getConfiguringBao())) { - configName += busVehicleOfferDetailVo.getConfiguringBao() + "/"; - } - //独立热源 - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getIndependentSources()) && "有".equals(busVehicleOfferDetailVo.getIndependentSources())) { - configName += "独立热源/"; - } - //油罐 - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getFuelTank())) { - configName += busVehicleOfferDetailVo.getFuelTank() + "/"; - } - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getMultimedia()) && "有".equals(busVehicleOfferDetailVo.getMultimedia())) { - configName += "多媒体/"; - } - //颜色 - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getCarColor())) { - configName += busVehicleOfferDetailVo.getCarColor() + "/"; - } - //驾驶室规格 - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSpecification())) { - configName += busVehicleOfferDetailVo.getSpecification() + "/"; - } - if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getPackingCase())) { - configName += busVehicleOfferDetailVo.getPackingCase() + "/"; - } - String moreConfig = busVehicleOfferDetailVo.getMoreConfig(); - String configName1 = configName + moreConfig; - List stringList = baseModelConfigService.fetchConfigName(busVehicleOfferDetailVo.getCreateOrgSid()); - if (stringList.contains(configName1)){ - String costPrice = busVehicleOfferDetailVo.getCostPrice(); - if (StringUtils.isBlank(costPrice)){ - return rb.setMsg("请填写厂家结算价"); - } - String salePrice = busVehicleOfferDetailVo.getSalePrice(); - if (StringUtils.isBlank(salePrice)){ - return rb.setMsg("请填写销售参考价"); - } - BeanUtil.copyProperties(busVehicleOfferDetailVo,busVehicleOffer); - busVehicleOffer.setSid(sid); - busVehicleOffer.setInquirySid(busVehicleOfferDetailVo.getSid()); - save(busVehicleOffer); - }else { - BaseModelConfig baseModelConfig = new BaseModelConfig(); - BeanUtil.copyProperties(busVehicleOfferDetailVo,baseModelConfig); - baseModelConfig.setSid(sid); - baseModelConfig.setConfigName(configName); - baseModelConfigService.save(baseModelConfig); - String costPrice = busVehicleOfferDetailVo.getCostPrice(); - if (StringUtils.isBlank(costPrice)){ - return rb.setMsg("请填写厂家结算价"); - } - String salePrice = busVehicleOfferDetailVo.getSalePrice(); - if (StringUtils.isBlank(salePrice)){ - return rb.setMsg("请填写销售参考价"); - } - BaseVehmodelConfig baseVehmodelConfig = new BaseVehmodelConfig(); - baseVehmodelConfig.setModelSid(busVehicleOfferDetailVo.getVehModelSid()); - baseVehmodelConfig.setConfigurationItemsSid(busVehicleOfferDetailVo.getVehModelConfigSid()); - baseVehmodelConfig.setUseOrgSid(busVehicleOfferDetailVo.getCreateOrgSid()); - baseVehmodelConfigService.save(baseVehmodelConfig); - BeanUtil.copyProperties(busVehicleOfferDetailVo,busVehicleOffer); - busVehicleOffer.setSid(sid); - busVehicleOffer.setInquirySid(busVehicleOfferDetailVo.getSid()); - save(busVehicleOffer); - busVehicleInquiryService.updateConfigBySid(busVehicleOfferDetailVo.getSid()); - } - return rb.success().setMsg("提交成功"); - } + public BusVehicleOfferVo fetchByIdVo(String id) { + BusVehicleOffer entity = this.fetchById(id); + BusVehicleOfferVo vo = new BusVehicleOfferVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } - public ResultBean fetchAllBySid(String sid) { - ResultBean rb = ResultBean.fireFail(); - BusVehicleOffer busVehicleOffer = fetchBySid(sid); - String inquirySid = busVehicleOffer.getInquirySid(); - BusVehicleInquiry busVehicleInquiry = busVehicleInquiryService.fetchBySid(inquirySid); - BusVehicleOfferDetailVos busVehicleOfferDetailVos = new BusVehicleOfferDetailVos(); - BeanUtil.copyProperties(busVehicleInquiry,busVehicleOfferDetailVos); - busVehicleOfferDetailVos.setXvehModelConfigSid(busVehicleInquiry.getVehModelConfigSid()); - busVehicleOfferDetailVos.setXvehModelConfig(busVehicleInquiry.getVehModelConfig()); - busVehicleOfferDetailVos.setXmoreConfig(busVehicleInquiry.getMoreConfig()); - String createBySid = busVehicleInquiry.getCreateBySid(); - ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(createBySid); - SysUserVo sysUserVo = sysUserVoResultBean.getData(); - if (sysUserVo == null){ - return rb.setMsg("该用户不存在"); - } - busVehicleOfferDetailVos.setPhone(sysUserVo.getMobile()); - List stringList = baseVehmodelOptionService.selByVehModelSid(busVehicleInquiry.getVehModelSid()); - String repInstr = ""; - for (String s : stringList) { - repInstr += s + ","; - } - if (StringUtils.isNotBlank(repInstr)){ - busVehicleOfferDetailVos.setRepInstr(repInstr.substring(0,repInstr.length()-1)); - } - String vehModelConfigSid = busVehicleOffer.getVehModelConfigSid(); - BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(vehModelConfigSid); - if (baseModelConfig == null){ - return rb.setMsg("该常用配置不存在"); - } - busVehicleOfferDetailVos.setBvehModelConfigSid(vehModelConfigSid); - busVehicleOfferDetailVos.setBvehModelConfig(baseModelConfig.getConfigName()); - busVehicleOfferDetailVos.setBmoreConfig(baseModelConfig.getOtherConfig()); - busVehicleOfferDetailVos.setSpecialInstructions(busVehicleOffer.getSpecialInstructions()); - busVehicleOfferDetailVos.setCostPrice(busVehicleOffer.getCostPrice()); - busVehicleOfferDetailVos.setSalePrice(busVehicleOffer.getSalePrice()); - busVehicleOfferDetailVos.setRemarks(busVehicleOffer.getRemarks()); - return rb.success().setData(busVehicleOfferDetailVos); - } + public ResultBean fetchAll(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusVehicleOfferDetailVo busVehicleOfferDetailVo = new BusVehicleOfferDetailVo(); + BusVehicleInquiry busVehicleInquiry = busVehicleInquiryService.fetchBySid(sid); + if (busVehicleInquiry == null) { + return rb.setMsg("该询价单不存在"); + } + busVehicleOfferDetailVo.setSid(busVehicleInquiry.getSid()); + busVehicleOfferDetailVo.setInquirer(busVehicleInquiry.getInquirer()); + String createBySid = busVehicleInquiry.getCreateBySid(); + ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(createBySid); + SysUserVo sysUserVo = sysUserVoResultBean.getData(); + if (sysUserVo == null) { + return rb.setMsg("该用户不存在"); + } + busVehicleOfferDetailVo.setPhone(sysUserVo.getMobile()); + busVehicleOfferDetailVo.setCreateTime(busVehicleInquiry.getCreateTime()); + busVehicleOfferDetailVo.setVehModelSid(busVehicleInquiry.getVehModelSid()); + busVehicleOfferDetailVo.setVehModel(busVehicleInquiry.getVehModel()); + busVehicleOfferDetailVo.setVehModelConfigSid(busVehicleInquiry.getVehModelConfigSid()); + busVehicleOfferDetailVo.setVehModelConfig(busVehicleInquiry.getVehModelConfig()); + busVehicleOfferDetailVo.setMoreConfig(busVehicleInquiry.getMoreConfig()); + //List stringList = baseVehmodelOptionService.selByVehModelSid(busVehicleInquiry.getVehModelSid()); + StringBuffer repInstr = new StringBuffer(); + String optionalConfig = busVehicleInquiry.getOptionalConfig(); + String replacementConfig = busVehicleInquiry.getReplacementConfig(); + if (StringUtils.isNotBlank(optionalConfig)) { + repInstr.append(optionalConfig).append(" "); + } + if (StringUtils.isNotBlank(replacementConfig)){ + repInstr.append(replacementConfig); + } + busVehicleOfferDetailVo.setRepInstr(repInstr.toString()); + busVehicleOfferDetailVo.setOtherConfig(busVehicleInquiry.getOtherConfig()); + busVehicleOfferDetailVo.setVehicleAlias(busVehicleInquiry.getVehModel()); + busVehicleOfferDetailVo.setBrandSid(busVehicleInquiry.getBrandSid()); + busVehicleOfferDetailVo.setBrandName(busVehicleInquiry.getBrandName()); + busVehicleOfferDetailVo.setReplacementConfig(busVehicleInquiry.getReplacementConfig()); + busVehicleOfferDetailVo.setOptionalConfig(busVehicleInquiry.getOptionalConfig()); + BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(busVehicleInquiry.getVehModelSid()); + if (baseVehicleModel == null) { + return rb.setMsg("该车型不存在"); + } + busVehicleOfferDetailVo.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue()); + busVehicleOfferDetailVo.setProductLineValue(baseVehicleModel.getProductLineValue()); + busVehicleOfferDetailVo.setDriveFormValue(baseVehicleModel.getDriveFormValue()); + busVehicleOfferDetailVo.setPowerValue(baseVehicleModel.getPowerValue()); + busVehicleOfferDetailVo.setVehicleVersionValue(baseVehicleModel.getVehicleVersionValue()); + busVehicleOfferDetailVo.setFuelTypeValue(baseVehicleModel.getFuelTypeValue()); + busVehicleOfferDetailVo.setGearboxTypeValue(baseVehicleModel.getGearboxTypeValue()); + busVehicleOfferDetailVo.setMarketSegmentsValue(baseVehicleModel.getMarketSegmentsValue()); + busVehicleOfferDetailVo.setEngineTypeValue(baseVehicleModel.getEngineTypeValue()); + busVehicleOfferDetailVo.setSpecifications(baseVehicleModel.getSpecifications()); + busVehicleOfferDetailVo.setEmissionStandardValue(baseVehicleModel.getEmissionStandardValue()); + busVehicleOfferDetailVo.setDepartmentValue(baseVehicleModel.getDepartmentValue()); + BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(busVehicleInquiry.getVehModelConfigSid()); + if (baseModelConfig == null) { + return rb.setMsg("该常用配置不存在"); + } + busVehicleOfferDetailVo.setCarColorKey(baseModelConfig.getCarColorKey()); + busVehicleOfferDetailVo.setCarColor(baseModelConfig.getCarColor()); + busVehicleOfferDetailVo.setSpecificationKey(baseModelConfig.getSpecificationKey()); + busVehicleOfferDetailVo.setSpecification(baseModelConfig.getSpecification()); + busVehicleOfferDetailVo.setBaffleModelKey(baseModelConfig.getBaffleModelKey()); + busVehicleOfferDetailVo.setBaffleModel(baseModelConfig.getBaffleModel()); + busVehicleOfferDetailVo.setSaddleKey(baseModelConfig.getSaddleKey()); + busVehicleOfferDetailVo.setSaddle(baseModelConfig.getSaddle()); + busVehicleOfferDetailVo.setIndependentSourcesKey(baseModelConfig.getIndependentSourcesKey()); + busVehicleOfferDetailVo.setIndependentSources(baseModelConfig.getIndependentSources()); + busVehicleOfferDetailVo.setSlowMachineKey(baseModelConfig.getSlowMachineKey()); + busVehicleOfferDetailVo.setSlowMachine(baseModelConfig.getSlowMachine()); + busVehicleOfferDetailVo.setRearAxleRatioKey(baseModelConfig.getRearAxleRatioKey()); + busVehicleOfferDetailVo.setRearAxleRatio(baseModelConfig.getRearAxleRatio()); + busVehicleOfferDetailVo.setSuspensionKey(baseModelConfig.getSuspensionKey()); + busVehicleOfferDetailVo.setSuspension(baseModelConfig.getSuspension()); + busVehicleOfferDetailVo.setWheelbaseKey(baseModelConfig.getWheelbaseKey()); + busVehicleOfferDetailVo.setWheelbase(baseModelConfig.getWheelbase()); + busVehicleOfferDetailVo.setFuelTankKey(baseModelConfig.getFuelTankKey()); + busVehicleOfferDetailVo.setFuelTank(baseModelConfig.getFuelTank()); + busVehicleOfferDetailVo.setRearViewMirrorKey(baseModelConfig.getRearViewMirrorKey()); + busVehicleOfferDetailVo.setRearViewMirror(baseModelConfig.getRearViewMirror()); + busVehicleOfferDetailVo.setAirConditionerKey(baseModelConfig.getAirConditionerKey()); + busVehicleOfferDetailVo.setAirConditioner(baseModelConfig.getAirConditioner()); + busVehicleOfferDetailVo.setSeatKey(baseModelConfig.getSeatKey()); + busVehicleOfferDetailVo.setSeat(baseModelConfig.getSeat()); + busVehicleOfferDetailVo.setBumperKey(baseModelConfig.getBumperKey()); + busVehicleOfferDetailVo.setBumper(baseModelConfig.getBumper()); + busVehicleOfferDetailVo.setMultimediaKey(baseModelConfig.getMultimediaKey()); + busVehicleOfferDetailVo.setMultimedia(baseModelConfig.getMultimedia()); + busVehicleOfferDetailVo.setTireSizeKey(baseModelConfig.getTireSizeKey()); + busVehicleOfferDetailVo.setTireSize(baseModelConfig.getTireSize()); + busVehicleOfferDetailVo.setHubMaterialKey(baseModelConfig.getHubMaterialKey()); + busVehicleOfferDetailVo.setHubMaterial(baseModelConfig.getHubMaterial()); + busVehicleOfferDetailVo.setTireCoverKey(baseModelConfig.getTireCoverKey()); + busVehicleOfferDetailVo.setTireCover(baseModelConfig.getTireCover()); + busVehicleOfferDetailVo.setConfiguringBaoKey(baseModelConfig.getConfiguringBaoKey()); + busVehicleOfferDetailVo.setConfiguringBao(baseModelConfig.getConfiguringBao()); + busVehicleOfferDetailVo.setPackingCaseKey(baseModelConfig.getPackingCaseKey()); + busVehicleOfferDetailVo.setPackingCase(baseModelConfig.getPackingCase()); + BusVehicleOffer busVehicleOfferVo = baseMapper.fetchByMainSid(busVehicleInquiry.getSid()); + if (busVehicleOfferVo != null) { + busVehicleOfferDetailVo.setSpecialInstructions(busVehicleOfferVo.getSpecialInstructions()); + busVehicleOfferDetailVo.setCostPrice(busVehicleOfferVo.getCostPrice()); + busVehicleOfferDetailVo.setSalePrice(busVehicleOfferVo.getSalePrice()); + busVehicleOfferDetailVo.setRemarks(busVehicleOfferVo.getRemarks()); + busVehicleOfferDetailVo.setCreateOrgSid(busVehicleInquiry.getCreateOrgSid()); + } + return rb.success().setData(busVehicleOfferDetailVo); + } + + public ResultBean offerSubmit(BusVehicleOfferDetailVo busVehicleOfferDetailVo) { + ResultBean rb = ResultBean.fireFail(); + BusVehicleOffer busVehicleOffer = new BusVehicleOffer(); + String sid = busVehicleOffer.getSid(); + String configName = ""; + //缓速器 + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSlowMachine()) && "有".equals(busVehicleOfferDetailVo.getSlowMachine())) { + configName += "缓速器/"; + } + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getRearViewMirror())) { + configName += busVehicleOfferDetailVo.getRearViewMirror() + "/"; + } + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getTireSize())) { + configName += busVehicleOfferDetailVo.getTireSize() + "/"; + } + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getRearAxleRatio())) { + configName += busVehicleOfferDetailVo.getRearAxleRatio() + "/"; + } + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getAirConditioner()) && "有".equals(busVehicleOfferDetailVo.getAirConditioner())) { + configName += "空调/"; + } + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getHubMaterial())) { + configName += busVehicleOfferDetailVo.getHubMaterial() + "/"; + } + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getBaffleModel())) { + configName += busVehicleOfferDetailVo.getBaffleModel() + "/"; + } + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSuspension())) { + configName += busVehicleOfferDetailVo.getSuspension() + "/"; + } + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSeat())) { + configName += busVehicleOfferDetailVo.getSeat() + "/"; + } + //护轮罩 + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getTireCover()) && "有".equals(busVehicleOfferDetailVo.getTireCover())) { + configName += "护轮罩/"; + } + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSaddle())) { + configName += busVehicleOfferDetailVo.getSaddle() + "/"; + } + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getWheelbase())) { + configName += busVehicleOfferDetailVo.getWheelbase() + "/"; + } + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getBumper())) { + configName += busVehicleOfferDetailVo.getBumper() + "/"; + } + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getConfiguringBao())) { + configName += busVehicleOfferDetailVo.getConfiguringBao() + "/"; + } + //独立热源 + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getIndependentSources()) && "有".equals(busVehicleOfferDetailVo.getIndependentSources())) { + configName += "独立热源/"; + } + //油罐 + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getFuelTank())) { + configName += busVehicleOfferDetailVo.getFuelTank() + "/"; + } + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getMultimedia()) && "有".equals(busVehicleOfferDetailVo.getMultimedia())) { + configName += "多媒体/"; + } + //颜色 + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getCarColor())) { + configName += busVehicleOfferDetailVo.getCarColor() + "/"; + } + //驾驶室规格 + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getSpecification())) { + configName += busVehicleOfferDetailVo.getSpecification() + "/"; + } + if (StringUtils.isNotBlank(busVehicleOfferDetailVo.getPackingCase())) { + configName += busVehicleOfferDetailVo.getPackingCase() + "/"; + } + String moreConfig = busVehicleOfferDetailVo.getMoreConfig(); + String configName1 = configName + moreConfig; + List stringList = baseModelConfigService.fetchConfigName(busVehicleOfferDetailVo.getCreateOrgSid()); + if (stringList.contains(configName1)) { + String costPrice = busVehicleOfferDetailVo.getCostPrice(); + if (StringUtils.isBlank(costPrice)) { + return rb.setMsg("请填写厂家结算价"); + } + String salePrice = busVehicleOfferDetailVo.getSalePrice(); + if (StringUtils.isBlank(salePrice)) { + return rb.setMsg("请填写销售参考价"); + } + BeanUtil.copyProperties(busVehicleOfferDetailVo, busVehicleOffer); + busVehicleOffer.setSid(sid); + busVehicleOffer.setInquirySid(busVehicleOfferDetailVo.getSid()); + save(busVehicleOffer); + } else { + BaseModelConfig baseModelConfig = new BaseModelConfig(); + BeanUtil.copyProperties(busVehicleOfferDetailVo, baseModelConfig); + baseModelConfig.setSid(sid); + baseModelConfig.setConfigName(configName); + baseModelConfigService.save(baseModelConfig); + String costPrice = busVehicleOfferDetailVo.getCostPrice(); + if (StringUtils.isBlank(costPrice)) { + return rb.setMsg("请填写厂家结算价"); + } + String salePrice = busVehicleOfferDetailVo.getSalePrice(); + if (StringUtils.isBlank(salePrice)) { + return rb.setMsg("请填写销售参考价"); + } + BaseVehmodelConfig baseVehmodelConfig = new BaseVehmodelConfig(); + baseVehmodelConfig.setModelSid(busVehicleOfferDetailVo.getVehModelSid()); + baseVehmodelConfig.setConfigurationItemsSid(busVehicleOfferDetailVo.getVehModelConfigSid()); + baseVehmodelConfig.setUseOrgSid(busVehicleOfferDetailVo.getCreateOrgSid()); + baseVehmodelConfigService.save(baseVehmodelConfig); + BeanUtil.copyProperties(busVehicleOfferDetailVo, busVehicleOffer); + busVehicleOffer.setSid(sid); + busVehicleOffer.setInquirySid(busVehicleOfferDetailVo.getSid()); + save(busVehicleOffer); + busVehicleInquiryService.updateConfigBySid(busVehicleOfferDetailVo.getSid()); + } + return rb.success().setMsg("提交成功"); + } + + public ResultBean fetchAllBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusVehicleOffer busVehicleOffer = fetchBySid(sid); + String inquirySid = busVehicleOffer.getInquirySid(); + BusVehicleInquiry busVehicleInquiry = busVehicleInquiryService.fetchBySid(inquirySid); + BusVehicleOfferDetailVos busVehicleOfferDetailVos = new BusVehicleOfferDetailVos(); + BeanUtil.copyProperties(busVehicleInquiry, busVehicleOfferDetailVos); + busVehicleOfferDetailVos.setXvehModelConfigSid(busVehicleInquiry.getVehModelConfigSid()); + busVehicleOfferDetailVos.setXvehModelConfig(busVehicleInquiry.getVehModelConfig()); + busVehicleOfferDetailVos.setXmoreConfig(busVehicleInquiry.getMoreConfig()); + String createBySid = busVehicleInquiry.getCreateBySid(); + ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(createBySid); + SysUserVo sysUserVo = sysUserVoResultBean.getData(); + if (sysUserVo == null) { + return rb.setMsg("该用户不存在"); + } + busVehicleOfferDetailVos.setPhone(sysUserVo.getMobile()); + List stringList = baseVehmodelOptionService.selByVehModelSid(busVehicleInquiry.getVehModelSid()); + String repInstr = ""; + for (String s : stringList) { + repInstr += s + ","; + } + if (StringUtils.isNotBlank(repInstr)) { + busVehicleOfferDetailVos.setRepInstr(repInstr.substring(0, repInstr.length() - 1)); + } + String vehModelConfigSid = busVehicleOffer.getVehModelConfigSid(); + BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(vehModelConfigSid); + if (baseModelConfig == null) { + return rb.setMsg("该常用配置不存在"); + } + busVehicleOfferDetailVos.setBvehModelConfigSid(vehModelConfigSid); + busVehicleOfferDetailVos.setBvehModelConfig(baseModelConfig.getConfigName()); + busVehicleOfferDetailVos.setBmoreConfig(baseModelConfig.getOtherConfig()); + busVehicleOfferDetailVos.setSpecialInstructions(busVehicleOffer.getSpecialInstructions()); + busVehicleOfferDetailVos.setCostPrice(busVehicleOffer.getCostPrice()); + busVehicleOfferDetailVos.setSalePrice(busVehicleOffer.getSalePrice()); + busVehicleOfferDetailVos.setRemarks(busVehicleOffer.getRemarks()); + return rb.success().setData(busVehicleOfferDetailVos); + } } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java index 23c2e2dc9d..cbcc0a4fbd 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java @@ -127,6 +127,8 @@ public class CrmCustomerTempDto implements Dto { private String customerClassKey; @ApiModelProperty(value = "备注") private String remarks; + @ApiModelProperty("业务人员sid") + private String staffSid; //运营信息 @ApiModelProperty(value = "运营信息") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java index 4881acb262..76271edb50 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java @@ -29,4 +29,7 @@ public class ScmApplyInboundQuery implements Query { @ApiModelProperty("车型") private String modelName; + + @ApiModelProperty("创建组织sid") + private String createOrgSid; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java index 4e311f32c6..3c545b6df7 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseQuery.java @@ -64,6 +64,6 @@ public class ScmWarehouseQuery implements Query { @ApiModelProperty("负责人及电话") private String warehouseContract; // 负责人及电话 - @ApiModelProperty("分组") - private String warehouseGroup; // 分组 + @ApiModelProperty("分组key") + private String warehouseGroupKey; // 分组key } 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 a4ad4ae404..1d3ff24775 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 @@ -1,24 +1,18 @@ package com.yxt.anrui.scm.biz.scmapplyinbound; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDto; -import com.yxt.anrui.base.api.baseoutsourcingapplication.SubmitBaseOutSourcingApplicationDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; +import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; -import com.yxt.anrui.fin.api.kingdee.appayable.APPayable; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; -import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; -import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; -import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; @@ -27,17 +21,13 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.scmapplyinbound.*; import com.yxt.anrui.scm.api.scmapplyinbound.flow.GetNodeQuery; -import com.yxt.anrui.scm.api.scmapplyinbound.flow.ScmApplyInBoundCompleteDto; import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicle; 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.AppScmVehicleExamineDto; import com.yxt.anrui.scm.api.scmvehicleexamine.ScmEntryVehicleExamineDto; -import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturnDto; import com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemDto; -import com.yxt.anrui.scm.biz.flow.FlowableService; import com.yxt.anrui.scm.biz.scmapplyinboundvehicle.ScmApplyInboundVehicleService; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmvehicleexamine.ScmVehicleExamineService; @@ -115,6 +105,7 @@ public class ScmApplyInboundService extends MybatisBaseService wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); + qw.eq("useOrgSid", query.getCreateOrgSid()); if (StringUtils.isNotBlank(query.getPurchaseOrderNo())) { qw.like("purchaseOrderNo", query.getPurchaseOrderNo()); } @@ -456,16 +447,16 @@ public class ScmApplyInboundService extends MybatisBaseService Date: Fri, 29 Jul 2022 16:06:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=AA=8C=E8=BD=A6=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uploadFile/upload_yanchejianchaTuBiao.vue | 222 ++++++++++++++++++ .../yanchejianchaxiangmu/yanchejianchaAdd.vue | 34 ++- 2 files changed, 250 insertions(+), 6 deletions(-) create mode 100644 anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue diff --git a/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue b/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue new file mode 100644 index 0000000000..b7c1089aa9 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue @@ -0,0 +1,222 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue index fc8218e15c..a01cdc34cd 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue @@ -49,10 +49,16 @@ - + +
图标
+ + + + +
照片说明
- + @@ -138,11 +144,13 @@