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/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-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-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 orderVoResultBean = crmVehicledemandFeign.getInfo(intentionSid); + if (!orderVoResultBean.getSuccess()) { + CrmVehicleDemandOrderVo crmVehicleDemandOrderVo = orderVoResultBean.getData(); + BusSalesOrderModel busSalesOrderModel = new BusSalesOrderModel(); + busSalesOrderModel.setSalesOrderSid(sid); + busSalesOrderModel.setBrandSid(crmVehicleDemandOrderVo.getBrandSid()); + busSalesOrderModel.setBrandName(crmVehicleDemandOrderVo.getBrandName()); + busSalesOrderModel.setModelSid(crmVehicleDemandOrderVo.getModelSid()); + busSalesOrderModel.setModelConfigSid(crmVehicleDemandOrderVo.getComonConfigSid()); + busSalesOrderModel.setModelConfig(crmVehicleDemandOrderVo.getSketChconfiguration()); + busSalesOrderModel.setGuildPrice(new BigDecimal(crmVehicleDemandOrderVo.getSaleReferencePrice())); + busSalesOrderModel.setMoreConfig(crmVehicleDemandOrderVo.getOtherConfig()); + busSalesOrderModel.setSpecialConfig(crmVehicleDemandOrderVo.getChangeOptions()); + busSalesOrderModelService.insert(busSalesOrderModel); + BusSalesOrderPrice busSalesOrderPrice = new BusSalesOrderPrice(); + busSalesOrderPrice.setQuantity(crmVehicleDemandOrderVo.getNumber()); + busSalesOrderModel.setGuildPrice(new BigDecimal(crmVehicleDemandOrderVo.getSaleReferencePrice())); + busSalesOrderPriceService.insert(busSalesOrderPrice); + } + } } else { + //修改销售订单 BusSalesOrder busSalesOrder = fetchBySid(dto.getSid()); if (busSalesOrder == null) { return rb.setMsg("该销售订单不存在"); 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-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicleDemandOrderVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicleDemandOrderVo.java new file mode 100644 index 0000000000..499ada1b6e --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicleDemandOrderVo.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.crm.api.crmvehicledemand; + +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; + +/** + * @Author dimengzhe + * @Date 2022/7/29 13:39 + * @Description + */ +@Data +public class CrmVehicleDemandOrderVo implements Vo { + private static final long serialVersionUID = -3596812906988379555L; + + //品牌sid、品牌、车型sid、配置sid、车型名称、车型配置、其他配置说明、数量、换选装内容为特殊配置说明、销售参考价 + @ApiModelProperty(value = "品牌sid") + private String brandSid; + @ApiModelProperty(value = "品牌") + private String brandName; + @ApiModelProperty(value = "车型sid") + private String modelSid; + @ApiModelProperty(value = "车型配置sid") + private String comonConfigSid; + @ApiModelProperty(value = "车型名称") + private String modelName; + @ApiModelProperty(value = "车型配置") + private String sketChconfiguration; + + @ApiModelProperty(value = "其他配置说明") + private String otherConfig; + + @ApiModelProperty(value = "数量") + private Integer number; + + @ApiModelProperty(value = "换选装内容") + private String changeOptions; + + @ApiModelProperty(value = "销售指导价") + @JsonSerialize(using = ToStringSerializer.class) + private String saleReferencePrice; +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java index ef5c21d9c4..d4ff388a35 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeign.java @@ -150,4 +150,8 @@ public interface CrmVehicledemandFeign { @PostMapping("/init/wantCarList") ResultBean> getWantCarList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("根据意向车型sid") + @GetMapping("/getInfo/{intentionSid}") + ResultBean getInfo(@PathVariable("intentionSid") String intentionSid); + } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java index a3f10d8866..bf56a6dfa8 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandFeignFallback.java @@ -94,6 +94,11 @@ public class CrmVehicledemandFeignFallback implements CrmVehicledemandFeign { return null; } + @Override + public ResultBean getInfo(String intentionSid) { + return null; + } + //app diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java index 283fd8ad0d..0c4d4bf783 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.java @@ -110,4 +110,6 @@ public interface CrmVehicledemandMapper extends BaseMapper { void updateByPrice(@Param("sid") String sid); CrmVehicledemand selectOneBySid(String vehicSid); + + CrmVehicleDemandOrderVo getInfo(String intentionSid); } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml index 4934a90ecf..7aed51f2a5 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandMapper.xml @@ -32,15 +32,15 @@ cvcd.modelName, cvcd.modelSid, cvcd.comonConfigSid, - convert(cvcd.saleReferencePrice/10000,decimal(10,2)) AS guidancePrice, - DATE_FORMAT(cvcd.createTime, '%Y-%m-%d') as createTime, - cvcd.purchaseMethodValue AS purchaseType, - cvcd.purchaseMethod as purchaseKey, - cvcd.financePlan as payTypeUpKey, - cvcd.financePlanValue as payTypeUpValue, - cct.sid as customerSid, - cct.name as customerName, - cct.mobile as customerMobile + convert(cvcd.saleReferencePrice / 10000, decimal(10, 2)) AS guidancePrice, + DATE_FORMAT(cvcd.createTime, '%Y-%m-%d') as createTime, + cvcd.purchaseMethodValue AS purchaseType, + cvcd.purchaseMethod as purchaseKey, + cvcd.financePlan as payTypeUpKey, + cvcd.financePlanValue as payTypeUpValue, + cct.sid as customerSid, + cct.name as customerName, + cct.mobile as customerMobile FROM crm_vehicledemand cvcd left join crm_customer_temp cct on cvcd.customerSid = cct.sid WHERE cvcd.customerSid = #{customerSid} @@ -80,8 +80,8 @@ cvcd.modelName, cvcd.brandName, cvcd.createTime, - convert(cvcd.saleReferencePrice/10000,decimal(10,2)) AS guidancePrice, - cvcd.purchaseMethodValue AS purchaseType + convert(cvcd.saleReferencePrice / 10000, decimal(10, 2)) AS guidancePrice, + cvcd.purchaseMethodValue AS purchaseType FROM crm_visit cv LEFT JOIN crm_visit_demand cvd ON cv.sid = cvd.visitSid LEFT JOIN crm_vehicledemand cvcd ON cvcd.sid = cvd.demandSid @@ -99,7 +99,7 @@ cv.modelName AS model, cv.brandSid, cv.brandName AS brand, - cv.saleReferencePrice AS guidancePrice, + convert(cv.saleReferencePrice/10000,decimal(10,2)) AS guidancePrice, cv.vehicleModelOffer AS price, cv.comonConfigSid AS configSid, cv.remarks, @@ -116,16 +116,16 @@ @@ -168,4 +168,19 @@ where sid = #{vehicSid} and length(financePlan) > 0 + + \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java index e348ba3457..2b927663be 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandRest.java @@ -192,4 +192,9 @@ public class CrmVehicledemandRest implements CrmVehicledemandFeign { PagerVo pv = crmVehicledemandService.getWantCarList(pagerQuery); return rb.success().setData(pv); } + + @Override + public ResultBean getInfo(String intentionSid) { + return crmVehicledemandService.getInfo(intentionSid); + } } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java index 955830bdbc..9c4e2eca99 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java @@ -354,7 +354,7 @@ public class CrmVehicledemandService extends MybatisBaseService getInfo(String intentionSid) { + ResultBean rb = ResultBean.fireFail(); + CrmVehicleDemandOrderVo crmVehicleDemandOrderVo = baseMapper.getInfo(intentionSid); + if (crmVehicleDemandOrderVo == null) { + return rb.setData(new CrmVehicleDemandOrderVo()); + } + return rb.success().setData(crmVehicleDemandOrderVo); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/pom.xml b/anrui-fin/anrui-fin-biz/pom.xml index 3a98e6d0a4..bda69a75f8 100644 --- a/anrui-fin/anrui-fin-biz/pom.xml +++ b/anrui-fin/anrui-fin-biz/pom.xml @@ -121,6 +121,7 @@ src/main/java **/*Mapper.xml + **/*.json diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java index 0d85350c88..5e004966fa 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignService.java @@ -1,7 +1,11 @@ package com.yxt.anrui.fin.biz.kingdee; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.io.FileUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.parser.Feature; import com.yxt.anrui.fin.api.kingdee.KingDeeBillId; import com.yxt.anrui.fin.api.kingdee.appayable.APPayable; import com.yxt.anrui.fin.api.kingdee.kingdeedata.Data; @@ -26,8 +30,15 @@ public class FinKingDeeFeignService { public String readJsonFile(String filename) { //#传文件的路径 String jsonStr = ""; try { - File file = new File(filename) ; - String content = FileUtils.readFileToString(file,"UTF-8"); + BufferedReader br=FileUtil.getUtf8Reader(filename); + StringBuffer sb = new StringBuffer(); + String data = null; + while((data = br.readLine()) != null) { + sb.append((String) data); + } + log.info(sb.toString()); + /*File file = new File(filename) ; + String content = FileUtils.readFileToString(file,"UTF-8");*/ /* File file = ResourceUtils.getFile("classpath:"+Filename); FileInputStream fis = new FileInputStream(file); InputStreamReader isr = new InputStreamReader(fis); @@ -41,7 +52,7 @@ public class FinKingDeeFeignService { br.close(); isr.close(); fis.close();*/ - return content; + return sb.toString(); } catch (IOException e) { e.printStackTrace(); return null; @@ -54,14 +65,27 @@ public class FinKingDeeFeignService { */ public ResultBean draftEntryBill(APPayable aPPayable) { ResultBean rb=ResultBean.fireFail(); - String readJsonFile = readJsonFile("src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata.json"); - String fEntityDetail_ = readJsonFile("src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail.json"); - String fEntityPlan_ = readJsonFile("src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityPlan.json"); + String readJsonFile = readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata2.json"); + String fEntityData_ = readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_data.json"); + String fEntityModel_ = readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_model.json"); + String fEntityDetail_ = readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail2.json"); + // String fEntityPlan_ = readJsonFile("com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityPlan.json"); Map map=new HashMap<>(); map.put("@KD_FDATE",aPPayable.getApplicationDate()); - APPayable.cloneKingDeeParams(map,readJsonFile,fEntityDetail_,fEntityPlan_); + JSONObject jsonObj= JSONObject.parseObject(readJsonFile, Feature.OrderedField); + JSONObject jsonFEntityData_= JSONObject.parseObject(fEntityData_,Feature.OrderedField); + JSONObject jsonFEntityModel_= JSONObject.parseObject(fEntityModel_,Feature.OrderedField); + JSONArray jsonfEntityDetail_= JSONArray.parseArray(fEntityDetail_); + jsonFEntityModel_.put("FEntityDetail",jsonfEntityDetail_); + jsonFEntityData_.put("Model",jsonFEntityModel_); + // JSONObject fEntityData_= JSONObject.parseObject(fEntityData_); + jsonObj.put("data",jsonFEntityData_.toJSONString()); + // readJsonFile= readJsonFile.replace("@KD_data",fEntityData_); + //readJsonFile= readJsonFile.replace("@KD_FEntityDetail",fEntityDetail_); + String j= jsonObj.toString(); + // readJsonFile=APPayable.cloneKingDeeParams(map,readJsonFile,fEntityDetail_,fEntityPlan_); try { - return saveBill(KingDeeBillId.AP_PAYABLE.getID(),readJsonFile); + return saveBill(KingDeeBillId.AP_PAYABLE.getID(),j); } catch (Exception e) { e.printStackTrace(); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeSaveSKD.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeSaveSKD.java index 0ee9e70770..7ae9af3acb 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeSaveSKD.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/KingDeeSaveSKD.java @@ -130,14 +130,10 @@ public class KingDeeSaveSKD { URI save_uri = new URI(Save_URL); HttpPost method = new HttpPost(save_uri); //采购入库单保存参数 - + //String ff="{\"formId\":\"AP_Payable\",\"data\":\"{ \\\"Creator\\\": \\\"zs\\\", \\\"NeedUpDateFields\\\": [], \\\"NeedReturnFields\\\": [], \\\"IsDeleteEntry\\\": \\\"True\\\", \\\"SubSystemId\\\": \\\"\\\", \\\"IsVerifyBaseDataField\\\": \\\"false\\\", \\\"IsEntryBatchFill\\\": \\\"True\\\", \\\"ValidateFlag\\\": \\\"True\\\", \\\"NumberSearch\\\": \\\"True\\\", \\\"InterationFlags\\\": \\\"\\\", \\\"Model\\\": { \\\"FID\\\": 0, \\\"FBillTypeID\\\": { \\\"FNUMBER\\\": \\\"YFD01_SYS\\\" }, \\\"FBillNo\\\": \\\"121a11221aa3123\\\", \\\"FISINIT\\\": false, \\\"FDATE\\\": \\\"2022-07-29 00:00:00\\\", \\\"FENDDATE_H\\\": \\\"2022-07-29 00:00:00\\\", \\\"FDOCUMENTSTATUS\\\": \\\"Z\\\", \\\"FSUPPLIERID\\\": { \\\"FNumber\\\": \\\"010001\\\" }, \\\"FCURRENCYID\\\": { \\\"FNumber\\\": \\\"PRE001\\\" }, \\\"FPayConditon\\\": { \\\"FNumber\\\": \\\"FKTJ01_SYS\\\" }, \\\"FISPRICEEXCLUDETAX\\\": true, \\\"FBUSINESSTYPE\\\": \\\"CG\\\", \\\"FISTAX\\\": true, \\\"FSETTLEORGID\\\": { \\\"FNumber\\\": \\\"101\\\" }, \\\"FPAYORGID\\\": { \\\"FNumber\\\": \\\"101\\\" }, \\\"FSetAccountType\\\": \\\"2\\\", \\\"FISTAXINCOST\\\": false, \\\"FAP_Remark\\\": \\\"1231\\\", \\\"FISHookMatch\\\": false, \\\"FPURCHASEDEPTID\\\": { \\\"FNumber\\\": \\\"01\\\" }, \\\"FCancelStatus\\\": \\\"A\\\", \\\"FISBYIV\\\": false, \\\"FISGENHSADJ\\\": false, \\\"FISINVOICEARLIER\\\": false, \\\"F_PAEZ_Text\\\": \\\"231231231231\\\", \\\"F_PMZC_Assistant1\\\": { \\\"FNumber\\\": \\\"00\\\" }, \\\"FsubHeadSuppiler\\\": { \\\"FORDERID\\\": { \\\"FNumber\\\": \\\"010001\\\" }, \\\"FTRANSFERID\\\": { \\\"FNumber\\\": \\\"010001\\\" }, \\\"FChargeId\\\": { \\\"FNumber\\\": \\\"010001\\\" } }, \\\"FsubHeadFinc\\\": { \\\"FACCNTTIMEJUDGETIME\\\": \\\"2022-07-29 00:00:00\\\", \\\"FMAINBOOKSTDCURRID\\\": { \\\"FNumber\\\": \\\"PRE001\\\" }, \\\"FEXCHANGETYPE\\\": { \\\"FNumber\\\": \\\"HLTX01_SYS\\\" }, \\\"FExchangeRate\\\": 1.0, \\\"FTaxAmountFor\\\": 0.98, \\\"FNoTaxAmountFor\\\": 98.02 }, \\\"FEntityDetail\\\": [ { \\\"FMATERIALID\\\": { \\\"FNumber\\\": \\\"&12\\\" }, \\\"FMaterialDesc\\\": \\\"@KD_FMaterialDesc\\\", \\\"FPRICEUNITID\\\": { \\\"FNumber\\\": \\\"ba\\\" }, \\\"FPrice\\\": 99.01, \\\"FPriceQty\\\": 1.0, \\\"FTaxPrice\\\": 100.0, \\\"FPriceWithTax\\\": 99.0, \\\"FEntryTaxRate\\\": 1.0, \\\"F_PMZC_Assistant\\\": { \\\"FNumber\\\": \\\"1904110789\\\" }, \\\"F_PMZC_Base\\\": { \\\"FNUMBER\\\": \\\"0001F\\\" }, \\\"F_PMZC_Base1\\\": { \\\"FNUMBER\\\": \\\"01.001\\\" }, \\\"FEntryDiscountRate\\\": 1.0, \\\"FDISCOUNTAMOUNTFOR\\\": 1.0, \\\"FNoTaxAmountFor_D\\\": 98.02, \\\"FTAXAMOUNTFOR_D\\\": 0.98, \\\"FALLAMOUNTFOR_D\\\": 99.0, \\\"FINCLUDECOST\\\": false, \\\"FISOUTSTOCK\\\": false, \\\"FIsFree\\\": false, \\\"FStockUnitId\\\": { \\\"FNumber\\\": \\\"ba\\\" }, \\\"FStockQty\\\": 1.0, \\\"FStockBaseQty\\\": 1.0, \\\"FPriceBaseDen\\\": 1.0, \\\"FStockBaseNum\\\": 1.0 } ], \\\"FEntityPlan\\\": [ { \\\"FENDDATE\\\": \\\"2022-07-29 00:00:00\\\", \\\"FPAYAMOUNTFOR\\\": 99.0, \\\"FPAYRATE\\\": 100.0 } ] }}\"}"; System.out.println(jsonParam.getData()); - // String ss = "{\"formid\":\"SAL_OUTSTOCK\", \"data\":\"{\\\"Creator\\\":\\\"\\\",\\\"NeedUpDateFields\\\":[],\\\"NeedReturnFields\\\":[],\\\"IsDeleteEntry\\\":\\\"True\\\",\\\"SubSystemId\\\":\\\"\\\",\\\"IsVerifyBaseDataField\\\":\\\"false\\\",\\\"IsEntryBatchFill\\\":\\\"True\\\",\\\"ValidateFlag\\\":\\\"True\\\",\\\"NumberSearch\\\":\\\"True\\\",\\\"InterationFlags\\\":\\\"\\\",\\\"Model\\\":{\\\"FID\\\":0,\\\"FBillTypeID\\\":{\\\"FNUMBER\\\":\\\"XSCKD01_SYS\\\"},\\\"FDate\\\":\\\"2021-12-31 00:00:00\\\",\\\"FSaleOrgId\\\":{\\\"FNumber\\\":\\\"100\\\"},\\\"FCustomerID\\\":{\\\"FNumber\\\":\\\" 田拥涛\\\"},\\\"FSaleDeptID\\\":{\\\"FNumber\\\":\\\"03\\\"},\\\"FStockOrgId\\\":{\\\"FNumber\\\":\\\"100\\\"},\\\"FReceiverID\\\":{\\\"FNumber\\\":\\\" 田拥涛\\\"},\\\"FSettleID\\\":{\\\"FNumber\\\":\\\" 田拥涛\\\"},\\\"FPayerID\\\":{\\\"FNumber\\\":\\\" 田拥涛\\\"},\\\"FOwnerTypeIdHead\\\":\\\"BD_OwnerOrg\\\",\\\"FIsTotalServiceOrCost\\\":false,\\\"F_PAEZ_Assistant\\\":{\\\"FNumber\\\":\\\"00\\\"},\\\"SubHeadEntity\\\":{\\\"FSettleCurrID\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FSettleOrgID\\\":{\\\"FNumber\\\":\\\"100\\\"},\\\"FIsIncludedTax\\\":true,\\\"FLocalCurrID\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FExchangeTypeID\\\":{\\\"FNumber\\\":\\\"HLTX01_SYS\\\"},\\\"FExchangeRate\\\":1.0,\\\"FIsPriceExcludeTax\\\":true},\\\"FEntity\\\":[{\\\"FRowType\\\":\\\"Standard\\\",\\\"FMaterialID\\\":{\\\"FNumber\\\":\\\" JX064673\\\"},\\\"Flot\\\":{\\\"FNumber\\\":\\\"11111djz\\\"},\\\"FUnitID\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FRealQty\\\":1.0,\\\"FIsFree\\\":false,\\\"FOwnerTypeID\\\":\\\"BD_OwnerOrg\\\",\\\"FOwnerID\\\":{\\\"FNumber\\\":\\\"100\\\"},\\\"FStockID\\\":{\\\"FNumber\\\":\\\"CK002\\\"},\\\"FStockStatusID\\\":{\\\"FNumber\\\":\\\"KCZT01_SYS\\\"},\\\"FSalUnitID\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FSALUNITQTY\\\":1.0,\\\"FSALBASEQTY\\\":1.0,\\\"FPRICEBASEQTY\\\":1.0,\\\"FOUTCONTROL\\\":false,\\\"FIsOverLegalOrg\\\":false,\\\"FARNOTJOINQTY\\\":1.0}],\\\"FOutStockTrace\\\":[{\\\"FLogComId\\\":{\\\"FCODE\\\":\\\"a2u\\\"},\\\"FDelTime\\\":\\\"2021-12-31 00:00:00\\\",\\\"FCarryBillNo\\\":\\\"2121122112\\\"}]}}\\n\"}"; - // String ff= "{\"formid\":\"AR_receivable\",\"data\":\"{\\\"Creator\\\":\\\"\\\",\\\"NeedUpDateFields\\\":[],\\\"NeedReturnFields\\\":[],\\\"IsDeleteEntry\\\":\\\"True\\\",\\\"SubSystemId\\\":\\\"\\\",\\\"IsVerifyBaseDataField\\\":\\\"false\\\",\\\"IsEntryBatchFill\\\":\\\"True\\\",\\\"ValidateFlag\\\":\\\"True\\\",\\\"NumberSearch\\\":\\\"True\\\",\\\"InterationFlags\\\":\\\"\\\",\\\"Model\\\":{\\\"FID\\\":0,\\\"FBillTypeID\\\":{\\\"FNUMBER\\\":\\\"YSD01_SYS\\\"},\\\"FDATE\\\":\\\"2022-01-07 00:00:00\\\",\\\"FISINIT\\\":false,\\\"FENDDATE_H\\\":\\\"2022-01-07 00:00:00\\\",\\\"FCUSTOMERID\\\":{\\\"FNumber\\\":\\\" JXYXB\\\"},\\\"FCURRENCYID\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FISPRICEEXCLUDETAX\\\":true,\\\"FSETTLEORGID\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FPAYORGID\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FSALEORGID\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FISTAX\\\":true,\\\"FCancelStatus\\\":\\\"A\\\",\\\"FBUSINESSTYPE\\\":\\\"BZ\\\",\\\"FSetAccountType\\\":\\\"1\\\",\\\"FISHookMatch\\\":false,\\\"FISINVOICEARLIER\\\":false,\\\"F_PMZC_Assistant2\\\":{\\\"FNumber\\\":\\\"01\\\"},\\\"FsubHeadSuppiler\\\":{\\\"FORDERID\\\":{\\\"fNumber\\\":\\\" JXYXB\\\"},\\\"FTRANSFERID\\\":{\\\"fNumber\\\":\\\" JXYXB\\\"},\\\"FChargeId\\\":{\\\"fNumber\\\":\\\" JXYXB\\\"}},\\\"FsubHeadFinc\\\":{\\\"FACCNTTIMEJUDGETIME\\\":\\\"2022-01-07 00:00:00\\\",\\\"FMAINBOOKSTDCURRID\\\":{\\\"fNumber\\\":\\\"PRE001\\\"},\\\"FEXCHANGETYPE\\\":{\\\"fNumber\\\":\\\"HLTX01_SYS\\\"},\\\"FExchangeRate\\\":1.0},\\\"FEntityDetail\\\":[{\\\"FMATERIALID\\\":{\\\"FNumber\\\":\\\" JX091054\\\"},\\\"FMaterialDesc\\\":\\\"X牵引6*4-550超\\\",\\\"FPRICEUNITID\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FDeliveryControl\\\":false,\\\"FStockUnitId\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FIsFree\\\":false,\\\"FSalUnitId\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FPriceBaseDen\\\":1.0,\\\"FSalBaseNum\\\":1.0,\\\"FStockBaseNum\\\":1.0}]}}\"}"; - // String s = "{\"data\":\"\"{\\\"Creator\\\":\\\"\\\",\\\"InterationFlags\\\":\\\"\\\",\\\"IsDeleteEntry\\\":true,\\\"IsEntryBatchFill\\\":true,\\\"IsVerifyBaseDataField\\\":false,\\\"Model\\\":{\\\"FBillTypeID\\\":{\\\"FNUMBER\\\":\\\"XSCKD01_SYS\\\"},\\\"FDate\\\":\\\"2021-12-30 00:00:00\\\",\\\"FDeliveryDeptID\\\":{\\\"FNumber\\\":\\\"\\\"},\\\"FEntity\\\":[{\\\"FARNOTJOINQTY\\\":1,\\\"FEntrynote\\\":\\\"\\\",\\\"FIsFree\\\":false,\\\"FIsOverLegalOrg\\\":false,\\\"FMaterialID\\\":{\\\"FNumber\\\":\\\" JX064673\\\"},\\\"FOUTCONTROL\\\":false,\\\"FOwnerID\\\":{\\\"FNumber\\\":\\\"100\\\"},\\\"FOwnerTypeID\\\":\\\"BD_OwnerOrg\\\",\\\"FPRICEBASEQTY\\\":1,\\\"FPrice\\\":0,\\\"FRealQty\\\":1,\\\"FRowType\\\":\\\"Standard\\\",\\\"FSALBASEQTY\\\":1,\\\"FSALUNITQTY\\\":1,\\\"FSalUnitID\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"FStockID\\\":{\\\"FNumber\\\":\\\"CK002\\\"},\\\"FStockStatusID\\\":{\\\"FNumber\\\":\\\"KCZT01_SYS\\\"},\\\"FTaxPrice\\\":0,\\\"FUnitID\\\":{\\\"FNumber\\\":\\\"liang\\\"},\\\"F_PAEZ_Decimal\\\":0,\\\"F_PAEZ_Decimal3\\\":0,\\\"F_PAEZ_Decimal4\\\":0,\\\"Flot\\\":{\\\"FNumber\\\":\\\"111\\\"}}],\\\"FID\\\":0,\\\"FIsTotalServiceOrCost\\\":false,\\\"FOutStockTrace\\\":[{\\\"FCarryBillNo\\\":\\\"1111111\\\",\\\"FDelTime\\\":1640933876112,\\\"FLogComId\\\":{\\\"FCODE\\\":\\\"a2u\\\"}}],\\\"FOwnerTypeIdHead\\\":\\\"BD_OwnerOrg\\\",\\\"FPayerID\\\":{\\\"FNumber\\\":\\\" 田拥涛\\\"},\\\"FReceiverID\\\":{\\\"FNumber\\\":\\\" 田拥涛\\\"},\\\"FSaleOrgId\\\":{\\\"FNumber\\\":\\\"100\\\"},\\\"FSettleID\\\":{\\\"FNumber\\\":\\\" 田拥涛\\\"},\\\"FStockOrgId\\\":{\\\"FNumber\\\":\\\"100\\\"},\\\"F_PAEZ_Assistant\\\":{\\\"FNumber\\\":\\\"00\\\"},\\\"F_PAEZ_Base\\\":{},\\\"F_PAEZ_Base1\\\":{},\\\"F_PAEZ_Date\\\":1640933876112,\\\"F_PAEZ_Decimal1\\\":0,\\\"F_PAEZ_Decimal2\\\":1,\\\"F_PAEZ_Text\\\":\\\"\\\",\\\"SubHeadEntity\\\":{\\\"FExchangeRate\\\":1,\\\"FExchangeTypeID\\\":{\\\"FNumber\\\":\\\"HLTX01_SYS\\\"},\\\"FIsIncludedTax\\\":true,\\\"FIsPriceExcludeTax\\\":true,\\\"FLocalCurrID\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FSettleCurrID\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FSettleOrgID\\\":{\\\"FNumber\\\":\\\"100\\\"}}},\\\"NeedReturnFields\\\":[],\\\"NeedUpDateFields\\\":[],\\\"NumberSearch\\\":true,\\\"SubSystemId\\\":\\\"\\\",\\\"ValidateFlag\\\":true}\"\",\"formid\":\"SAL_OUTSTOCK\"}"; - // System.out.println(ss); - // System.out.println(ff); - String ss="{\"formId\":\"AP_Payable\",\"data\":\"{ \\\"Creator\\\":\\\"zs\\\", \\\"NeedUpDateFields\\\":[], \\\"NeedReturnFields\\\":[], \\\"IsDeleteEntry\\\":\\\"True\\\", \\\"SubSystemId\\\":\\\"\\\", \\\"IsVerifyBaseDataField\\\":\\\"false\\\", \\\"IsEntryBatchFill\\\":\\\"True\\\", \\\"ValidateFlag\\\":\\\"True\\\", \\\"NumberSearch\\\":\\\"True\\\", \\\"InterationFlags\\\":\\\"\\\", \\\"Model\\\":{ \\\"FID\\\":0, \\\"FBillTypeID\\\":{ \\\"FNUMBER\\\":\\\"YFD01_SYS\\\" }, \\\"FBillNo\\\":\\\"123123\\\", \\\"FISINIT\\\":false, \\\"FDATE\\\":\\\"2022-07-22 00:00:00\\\", \\\"FENDDATE_H\\\":\\\"2022-07-22 00:00:00\\\", \\\"FDOCUMENTSTATUS\\\":\\\"Z\\\", \\\"FSUPPLIERID\\\":{ \\\"FNumber\\\":\\\"010001\\\" }, \\\"FCURRENCYID\\\":{ \\\"FNumber\\\":\\\"PRE001\\\" }, \\\"FPayConditon\\\":{ \\\"FNumber\\\":\\\"FKTJ01_SYS\\\" }, \\\"FISPRICEEXCLUDETAX\\\":true, \\\"FBUSINESSTYPE\\\":\\\"CG\\\", \\\"FISTAX\\\":true, \\\"FSETTLEORGID\\\":{ \\\"FNumber\\\":\\\"101\\\" }, \\\"FPAYORGID\\\":{ \\\"FNumber\\\":\\\"101\\\" }, \\\"FSetAccountType\\\":\\\"2\\\", \\\"FISTAXINCOST\\\":false, \\\"FAP_Remark\\\":\\\"1231\\\", \\\"FISHookMatch\\\":false, \\\"FPURCHASEDEPTID\\\":{ \\\"FNumber\\\":\\\"01\\\" }, \\\"FCancelStatus\\\":\\\"A\\\", \\\"FISBYIV\\\":false, \\\"FISGENHSADJ\\\":false, \\\"FISINVOICEARLIER\\\":false, \\\"F_PAEZ_Text\\\":\\\"231231231231\\\", \\\"F_PMZC_Assistant1\\\":{ \\\"FNumber\\\":\\\"00\\\" }, \\\"FsubHeadSuppiler\\\":{ \\\"FORDERID\\\":{ \\\"FNumber\\\":\\\"010001\\\" }, \\\"FTRANSFERID\\\":{ \\\"FNumber\\\":\\\"010001\\\" }, \\\"FChargeId\\\":{ \\\"FNumber\\\":\\\"010001\\\" } }, \\\"FsubHeadFinc\\\":{ \\\"FACCNTTIMEJUDGETIME\\\":\\\"2022-07-22 00:00:00\\\", \\\"FMAINBOOKSTDCURRID\\\":{ \\\"FNumber\\\":\\\"PRE001\\\" }, \\\"FEXCHANGETYPE\\\":{ \\\"FNumber\\\":\\\"HLTX01_SYS\\\" }, \\\"FExchangeRate\\\":1.0, \\\"FTaxAmountFor\\\":0.98, \\\"FNoTaxAmountFor\\\":98.02 }, \\\"FEntityDetail\\\":[ { \\\"FMATERIALID\\\":{ \\\"FNumber\\\":\\\"&12\\\" }, \\\"FMaterialDesc\\\":\\\"@KD_FMaterialDesc\\\", \\\"FPRICEUNITID\\\":{ \\\"FNumber\\\":\\\"ba\\\" }, \\\"FPrice\\\":99.01, \\\"FPriceQty\\\":1.0, \\\"FTaxPrice\\\":100.0, \\\"FPriceWithTax\\\":99.0, \\\"FEntryTaxRate\\\":1.0, \\\"F_PMZC_Assistant\\\":{ \\\"FNumber\\\":\\\"1904110789\\\" }, \\\"F_PMZC_Base\\\":{ \\\"FNUMBER\\\":\\\"0001F\\\" }, \\\"F_PMZC_Base1\\\":{ \\\"FNUMBER\\\":\\\"01.001\\\" }, \\\"FEntryDiscountRate\\\":1.0, \\\"FDISCOUNTAMOUNTFOR\\\":1.0, \\\"FNoTaxAmountFor_D\\\":98.02, \\\"FTAXAMOUNTFOR_D\\\":0.98, \\\"FALLAMOUNTFOR_D\\\":99.0, \\\"FINCLUDECOST\\\":false, \\\"FISOUTSTOCK\\\":false, \\\"FIsFree\\\":false, \\\"FStockUnitId\\\":{ \\\"FNumber\\\":\\\"ba\\\" }, \\\"FStockQty\\\":1.0, \\\"FStockBaseQty\\\":1.0, \\\"FPriceBaseDen\\\":1.0, \\\"FStockBaseNum\\\":1.0 } ], \\\"FEntityPlan\\\":[ { \\\"FENDDATE\\\":\\\"2022-07-22 00:00:00\\\", \\\"FPAYAMOUNTFOR\\\":99.0, \\\"FPAYRATE\\\":100.0 } ] }}}"; + //String dd="{\"formId\":\"AP_Payable\",\"data\":\"{\\\"Creator\\\":\\\"\\\",\\\"NeedUpDateFields\\\":[],\\\"NeedReturnFields\\\":[],\\\"IsDeleteEntry\\\":\\\"True\\\",\\\"SubSystemId\\\":\\\"\\\",\\\"IsVerifyBaseDataField\\\":\\\"false\\\",\\\"IsEntryBatchFill\\\":\\\"True\\\",\\\"ValidateFlag\\\":\\\"True\\\",\\\"NumberSearch\\\":\\\"True\\\",\\\"InterationFlags\\\":\\\"\\\",\\\"Model\\\":{\\\"FID\\\":0,\\\"FBillTypeID\\\":{\\\"FNUMBER\\\":\\\"YFD01_SYS\\\"},\\\"FBillNo\\\":\\\"222124564322123\\\",\\\"FISINIT\\\":false,\\\"FDATE\\\":\\\"2022-07-29 00:00:00\\\",\\\"FENDDATE_H\\\":\\\"2022-07-29 00:00:00\\\",\\\"FDOCUMENTSTATUS\\\":\\\"Z\\\",\\\"FSUPPLIERID\\\":{\\\"FNumber\\\":\\\"010001\\\"},\\\"FCURRENCYID\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FISPRICEEXCLUDETAX\\\":true,\\\"FBUSINESSTYPE\\\":\\\"CG\\\",\\\"FISTAX\\\":true,\\\"FSETTLEORGID\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FPAYORGID\\\":{\\\"FNumber\\\":\\\"101\\\"},\\\"FSetAccountType\\\":\\\"2\\\",\\\"FISTAXINCOST\\\":false,\\\"FISHookMatch\\\":false,\\\"FPURCHASEDEPTID\\\":{\\\"FNumber\\\":\\\"01\\\"},\\\"FCancelStatus\\\":\\\"A\\\", \\\"FISBYIV\\\":false,\\\"FISGENHSADJ\\\":false,\\\"FISINVOICEARLIER\\\":false,\\\"FEntityDetail\\\":[{\\\"FMaterialDesc\\\":\\\"@KD_FMaterialDesc\\\",\\\"FNoTaxAmountFor_D\\\":98.02,\\\"FIsFree\\\":false,\\\"FALLAMOUNTFOR_D\\\":99.0,\\\"FEntryTaxRate\\\":1.0,\\\"FDISCOUNTAMOUNTFOR\\\":1.0,\\\"FStockUnitId\\\":{\\\"FNumber\\\":\\\"ba\\\"},\\\"FMATERIALID\\\":{\\\"FNumber\\\":\\\"&12\\\"},\\\"FPRICEUNITID\\\":{\\\"FNumber\\\":\\\"ba\\\"},\\\"FEntryDiscountRate\\\":1.0,\\\"FStockBaseQty\\\":1.0,\\\"FPrice\\\":99.01,\\\"FTAXAMOUNTFOR_D\\\":0.98,\\\"FISOUTSTOCK\\\":false,\\\"F_PMZC_Base1\\\":{\\\"FNUMBER\\\":\\\"01.001\\\"},\\\"FTaxPrice\\\":100.0,\\\"F_PMZC_Base\\\":{\\\"FNUMBER\\\":\\\"0001F\\\"},\\\"FPriceWithTax\\\":99.0,\\\"FPriceBaseDen\\\":1.0,\\\"FPriceQty\\\":1.0,\\\"FStockBaseNum\\\":1.0,\\\"FINCLUDECOST\\\":false,\\\"F_PMZC_Assistant\\\":{\\\"FNumber\\\":\\\"1904110789\\\"},\\\"FStockQty\\\":1.0}],\\\"FsubHeadSuppiler\\\":{},\\\"FsubHeadFinc\\\":{\\\"FMAINBOOKSTDCURRID\\\":{\\\"FNumber\\\":\\\"PRE001\\\"},\\\"FACCNTTIMEJUDGETIME\\\":\\\"2022-07-29 00:00:00\\\",\\\"FEXCHANGETYPE\\\":{\\\"FNumber\\\":\\\"HLTX01_SYS\\\"},\\\"FExchangeRate\\\":1.0}}}\"}"; + //String ss="{\"formId\":\"AP_Payable\",\"data\":\"{\\\"Creator\\\":\\\"zs\\\", \\\"NeedUpDateFields\\\":[], \\\"NeedReturnFields\\\":[], \\\"IsDeleteEntry\\\":\\\"True\\\", \\\"SubSystemId\\\":\\\"\\\", \\\"IsVerifyBaseDataField\\\":\\\"false\\\", \\\"IsEntryBatchFill\\\":\\\"True\\\", \\\"ValidateFlag\\\":\\\"True\\\", \\\"NumberSearch\\\":\\\"True\\\", \\\"InterationFlags\\\":\\\"\\\", \\\"Model\\\":{ \\\"FID\\\":0, \\\"FBillTypeID\\\":{ \\\"FNUMBER\\\":\\\"YFD01_SYS\\\" }, \\\"FBillNo\\\":\\\"2221211223123\\\", \\\"FISINIT\\\":false, \\\"FDATE\\\":\\\"2022-07-29 00:00:00\\\", \\\"FENDDATE_H\\\":\\\"2022-07-29 00:00:00\\\", \\\"FDOCUMENTSTATUS\\\":\\\"Z\\\", \\\"FSUPPLIERID\\\":{ \\\"FNumber\\\":\\\"010001\\\" }, \\\"FCURRENCYID\\\":{ \\\"FNumber\\\":\\\"PRE001\\\" }, \\\"FPayConditon\\\":{ \\\"FNumber\\\":\\\"FKTJ01_SYS\\\" }, \\\"FISPRICEEXCLUDETAX\\\":true, \\\"FBUSINESSTYPE\\\":\\\"CG\\\", \\\"FISTAX\\\":true, \\\"FSETTLEORGID\\\":{ \\\"FNumber\\\":\\\"101\\\" }, \\\"FPAYORGID\\\":{ \\\"FNumber\\\":\\\"101\\\" }, \\\"FSetAccountType\\\":\\\"2\\\", \\\"FISTAXINCOST\\\":false, \\\"FAP_Remark\\\":\\\"1231\\\", \\\"FISHookMatch\\\":false, \\\"FPURCHASEDEPTID\\\":{ \\\"FNumber\\\":\\\"01\\\" }, \\\"FCancelStatus\\\":\\\"A\\\", \\\"FISBYIV\\\":false, \\\"FISGENHSADJ\\\":false, \\\"FISINVOICEARLIER\\\":false, \\\"F_PAEZ_Text\\\":\\\"231231231231\\\", \\\"F_PMZC_Assistant1\\\":{ \\\"FNumber\\\":\\\"00\\\" }, \\\"FsubHeadSuppiler\\\":{ \\\"FORDERID\\\":{ \\\"FNumber\\\":\\\"010001\\\" }, \\\"FTRANSFERID\\\":{ \\\"FNumber\\\":\\\"010001\\\" }, \\\"FChargeId\\\":{ \\\"FNumber\\\":\\\"010001\\\" } }, \\\"FsubHeadFinc\\\":{ \\\"FACCNTTIMEJUDGETIME\\\":\\\"2022-07-29 00:00:00\\\", \\\"FMAINBOOKSTDCURRID\\\":{ \\\"FNumber\\\":\\\"PRE001\\\" }, \\\"FEXCHANGETYPE\\\":{ \\\"FNumber\\\":\\\"HLTX01_SYS\\\" }, \\\"FExchangeRate\\\":1.0, \\\"FTaxAmountFor\\\":0.98, \\\"FNoTaxAmountFor\\\":98.02 }, \\\"FEntityDetail\\\":[ { \\\"FMATERIALID\\\":{ \\\"FNumber\\\":\\\"&12\\\" }, \\\"FMaterialDesc\\\":\\\"@KD_FMaterialDesc\\\", \\\"FPRICEUNITID\\\":{ \\\"FNumber\\\":\\\"ba\\\" }, \\\"FPrice\\\":99.01, \\\"FPriceQty\\\":1.0, \\\"FTaxPrice\\\":100.0, \\\"FPriceWithTax\\\":99.0, \\\"FEntryTaxRate\\\":1.0, \\\"F_PMZC_Assistant\\\":{ \\\"FNumber\\\":\\\"1904110789\\\" }, \\\"F_PMZC_Base\\\":{ \\\"FNUMBER\\\":\\\"0001F\\\" }, \\\"F_PMZC_Base1\\\":{ \\\"FNUMBER\\\":\\\"01.001\\\" }, \\\"FEntryDiscountRate\\\":1.0, \\\"FDISCOUNTAMOUNTFOR\\\":1.0, \\\"FNoTaxAmountFor_D\\\":98.02, \\\"FTAXAMOUNTFOR_D\\\":0.98, \\\"FALLAMOUNTFOR_D\\\":99.0, \\\"FINCLUDECOST\\\":false, \\\"FISOUTSTOCK\\\":false, \\\"FIsFree\\\":false, \\\"FStockUnitId\\\":{ \\\"FNumber\\\":\\\"ba\\\" }, \\\"FStockQty\\\":1.0, \\\"FStockBaseQty\\\":1.0, \\\"FPriceBaseDen\\\":1.0, \\\"FStockBaseNum\\\":1.0 } ], \\\"FEntityPlan\\\":[ { \\\"FENDDATE\\\":\\\"2022-07-29 00:00:00\\\", \\\"FPAYAMOUNTFOR\\\":99.0, \\\"FPAYRATE\\\":100.0 } ] }}\"}"; StringEntity entity = new StringEntity(jsonParam.getData(), "utf-8"); //StringEntity entity = new StringEntity(JSON.toJSONString( jsonParam), "utf-8"); System.out.println(JSON.toJSON(entity)); @@ -166,7 +162,6 @@ public class KingDeeSaveSKD { } catch (Exception e) { System.out.println("post请求提交失败:" + e); } - return null; /********** 保存采购入库单End************************/ } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata2.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata2.json new file mode 100644 index 0000000000..4015621acb --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata2.json @@ -0,0 +1,4 @@ +{ + "formId": "AP_Payable", + "data": "@KD_data" +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail2.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail2.json new file mode 100644 index 0000000000..e42185b3de --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_FEntityDetail2.json @@ -0,0 +1,38 @@ +[{ + "FMATERIALID": { + "FNumber": "&12" + }, + "FMaterialDesc": "@KD_FMaterialDesc", + "FPRICEUNITID": { + "FNumber": "ba" + }, + "FPrice": 99.01, + "FPriceQty": 1.0, + "FTaxPrice": 100.0, + "FPriceWithTax": 99.0, + "FEntryTaxRate": 1.0, + "F_PMZC_Assistant": { + "FNumber": "1904110789" + }, + "F_PMZC_Base": { + "FNUMBER": "0001F" + }, + "F_PMZC_Base1": { + "FNUMBER": "01.001" + }, + "FEntryDiscountRate": 1.0, + "FDISCOUNTAMOUNTFOR": 1.0, + "FNoTaxAmountFor_D": 98.02, + "FTAXAMOUNTFOR_D": 0.98, + "FALLAMOUNTFOR_D": 99.0, + "FINCLUDECOST": false, + "FISOUTSTOCK": false, + "FIsFree": false, + "FStockUnitId": { + "FNumber": "ba" + }, + "FStockQty": 1.0, + "FStockBaseQty": 1.0, + "FPriceBaseDen": 1.0, + "FStockBaseNum": 1.0 +}] \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_data.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_data.json new file mode 100644 index 0000000000..f8b9dc071d --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_data.json @@ -0,0 +1,13 @@ +{ + "Creator": "", + "NeedUpDateFields": [], + "NeedReturnFields": [], + "IsDeleteEntry": "True", + "SubSystemId": "", + "IsVerifyBaseDataField": "false", + "IsEntryBatchFill": "True", + "ValidateFlag": "True", + "NumberSearch": "True", + "InterationFlags": "", + "Model": {} +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_model.json new file mode 100644 index 0000000000..65ecd5eda8 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/entrybill/entrybilldata_model.json @@ -0,0 +1,48 @@ +{ + "FID": 0, + "FBillTypeID": { + "FNUMBER": "YFD01_SYS" + }, + "FBillNo": "22996688aassddff", + "FISINIT": false, + "FDATE": "2022-07-29 00:00:00", + "FENDDATE_H": "2022-07-29 00:00:00", + "FDOCUMENTSTATUS": "Z", + "FSUPPLIERID": { + "FNumber": "010001" + }, + "FCURRENCYID": { + "FNumber": "PRE001" + }, + "FISPRICEEXCLUDETAX": true, + "FBUSINESSTYPE": "CG", + "FISTAX": true, + "FSETTLEORGID": { + "FNumber": "101" + }, + "FPAYORGID": { + "FNumber": "101" + }, + "FSetAccountType": "2", + "FISTAXINCOST": false, + "FISHookMatch": false, + "FPURCHASEDEPTID":{ + "FNumber":"01" + }, + "FCancelStatus": "A", + "FISBYIV": false, + "FISGENHSADJ": false, + "FISINVOICEARLIER": false, + "FsubHeadSuppiler": {}, + "FsubHeadFinc": { + "FACCNTTIMEJUDGETIME": "2022-07-29 00:00:00", + "FMAINBOOKSTDCURRID": { + "FNumber": "PRE001" + }, + "FEXCHANGETYPE": { + "FNumber": "HLTX01_SYS" + }, + "FExchangeRate": 1.0 + }, + "FEntityDetail": [] +} \ No newline at end of file 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/scmvehicleexamine/AppScmVehicleExaminePageVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageVo.java index c0987a09aa..cb6f3bdacf 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/AppScmVehicleExaminePageVo.java @@ -36,5 +36,8 @@ public class AppScmVehicleExaminePageVo implements Vo { @ApiModelProperty("是否验车 未验车 1 以验车2") private String inspectedType; + @ApiModelProperty("保存状态（默认为0 未操作 1 已保存）") + private int saveStatus; + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java index b7187368c8..985542bca1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamine.java @@ -94,5 +94,7 @@ public class ScmVehicleExamine extends BaseEntity { private String modelDifferenceExplain; // 车型配置差异说明 @ApiModelProperty("保修卡卡号") private String guaranteeCardNo; // 保修卡卡号 + @ApiModelProperty("保存状态（默认为0 未操作 1 已保存）") + private int saveStatus; } 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/flow/FlowableMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableMapper.java deleted file mode 100644 index de95f23617..0000000000 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yxt.anrui.scm.biz.flow; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yxt.anrui.buscenter.api.flow.Flowable; -import org.apache.ibatis.annotations.Mapper; - -import java.util.Map; - -@Mapper -public interface FlowableMapper extends BaseMapper { - -} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableMapper.xml deleted file mode 100644 index 0dc22fb778..0000000000 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableService.java deleted file mode 100644 index ae1efef97e..0000000000 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/flow/FlowableService.java +++ /dev/null @@ -1,97 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.anrui.scm.biz.flow; - -import cn.hutool.core.bean.BeanUtil; -import com.alibaba.fastjson.JSONObject; -import com.yxt.anrui.buscenter.api.flow.*; -import com.yxt.anrui.flowable.api.flowdefinition.FlowDefinitionFeign; -import com.yxt.anrui.flowable.api.flowtask.FlowTask; -import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; -import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; -import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; -import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; -import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskParam; -import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskQuery; -import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; -import com.yxt.anrui.flowable.sqloperationsymbol.SQLOperationSymbol; -import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.DateUtils; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import io.swagger.annotations.ApiParam; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.*; - -/** - * Project: anrui-parent
- * File: FlowableService.java
- * Class: com.yxt.anrui.scm.biz.flow.FlowableService
- * Description: <描述类的功能>.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021/10/23 上午11:14
- * - * @author popo - * @version 1.0 - * @since 1.0 - */ -@Service -public class FlowableService extends MybatisBaseService { - @Autowired - private FlowDefinitionFeign flowDefinitionFeign; - @Autowired - private FlowTaskFeign flowTaskFeign; - - public ResultBean businessStart(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId, - @ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, - @ApiParam(value = "变量集合,json对象") @RequestBody Map variables) { - - variables.put("procDefId",procDefId); - variables.put("userSid",userSid); - BusinessVariables bv= BusinessVariables.builder().build(); - bv.setFormVariables(variables); - ResultBean rb = flowDefinitionFeign.businessStart(bv); - if (!rb.getSuccess()) { - return rb; - } - String procId = rb.getData().getProcInsId(); - List list = flowTaskFeign.getLatestTasks(procId).getData(); - String nodeState = list.get(0).getName_(); - String task_def_key_ = list.get(0).getTask_def_key_(); - Map map = new HashMap<>(); - map.put("sid", variables.get("businessSid").toString()); - map.put("nodeState", nodeState); - map.put("procInsId", rb.getData().getProcInsId()); - map.put("taskDefKey", task_def_key_); - return new ResultBean().success().setData(map); - } -} 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 ${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 +
+ + + + + 点击上传 + +
+ + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue index 6ae29fcf9b..ff9a11a02e 100644 --- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue +++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue @@ -35,8 +35,8 @@
- 查询 - 重置 + 查询 + 重置
@@ -173,9 +173,9 @@ export default { }, created() { // this.loadList() + this.getType() this.getUseOrg() this.getListOrgAll() - this.getType() }, mounted() { this.$refs['btnbar'].setButtonList(this.btnList) @@ -343,8 +343,8 @@ export default { diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue index c182e97f1f..2d1b62241b 100644 --- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue @@ -17,8 +17,8 @@
+
存放地点
-
存放地点
@@ -29,7 +29,7 @@ *使用组织 - + @@ -37,7 +37,7 @@ *名称 - + @@ -47,7 +47,7 @@ *负责人及电话 - + @@ -55,7 +55,7 @@ *分组 - + @@ -69,7 +69,7 @@ *详细地址 - + @@ -323,7 +323,8 @@ export default { _this.formobj.warehouseAttribute = vdata.warehouseAttribute // 存放地点属性 _this.formobj.warehouseContract = vdata.warehouseContract // 存放地点负责人 _this.formobj.warehouseContractSid = vdata.warehouseContractSid // 存放地点负责人sid - _this.formobj.warehouseGroup = vdata.warehouseGroup // 分组 + _this.formobj.warehouseGroupKey = vdata.warehouseGroupKey // 分组 + _this.formobj.warehouseGroupValue = vdata.warehouseGroupValue // 分组 }) .catch(e => { this.formobj = row @@ -377,51 +378,22 @@ export default { diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue index 8f78da3c39..b23fae750a 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue @@ -72,7 +72,7 @@ /> - + + + +
验车相关照片
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue index 0e59ec3253..1c66a0ffe1 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue @@ -43,11 +43,16 @@ {{ temp.guaranteeCardNo }} - + {{ temp.price }} + + + + +
验车相关照片
diff --git a/anrui-system-ui/src/views/Home/Home.vue b/anrui-system-ui/src/views/Home/Home.vue index 04584fe80b..271bef4f0c 100644 --- a/anrui-system-ui/src/views/Home/Home.vue +++ b/anrui-system-ui/src/views/Home/Home.vue @@ -264,8 +264,8 @@ } else if (index == '8') { let myPopup = window.open('http://120.46.131.15/message/#/' + '?token=' + getStorage(), '_blank') } else if (index == '1') { - let myPopup = window.open('http://120.46.131.15/scm/#/' + '?token=' + getStorage(), '_blank') - // let myPopup = window.open('http://127.0.0.1:9531/scm/#/' + '?token=' + getStorage(), '_blank') + //let myPopup = window.open('http://120.46.131.15/scm/#/' + '?token=' + getStorage(), '_blank') + let myPopup = window.open('http://127.0.0.1:9531/scm/#/' + '?token=' + getStorage(), '_blank') } else if (index == '4') { let myPopup = window.open('http://120.46.131.15/fin/#/' + '?token=' + getStorage(), '_blank') } else if (index == '5') { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageVo.java index eb805e0e44..320828f047 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageVo.java @@ -33,4 +33,7 @@ public class AppExaminePageVo implements Vo { @ApiModelProperty("是否验车 key 未验车 1 以验车2") private String inspectedType; + @ApiModelProperty("保存状态（默认为0 未操作 1 已保存）") + private int saveStatus; + }