yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

问题修改

master
God 3 years ago
parent
9799c422c2
commit
cdf23d1bb4
25 changed files with 216 additions and 111 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java
  2. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java
  3. 9
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleVo.java
  4. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java
  5. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java
  6. 21
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
  7. 12
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
  8. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
  9. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  10. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  11. 85
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  12. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
  13. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  14. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java
  15. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java
  16. 27
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java
  17. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeign.java
  18. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeignFallback.java
  19. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java
  20. 9
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java
  21. 54
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml
  22. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithRest.java
  23. 22
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java
  24. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java
  25. 25
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/flow/BaseInterNalPurchaseCompleteDto.java
View File

@ -40,4 +40,6 @@ public class BaseInterNalPurchaseCompleteDto implements Dto {
private Map<String, Object> formVariables;
private String orgPath;
private String id;
}

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java
View File

@ -23,10 +23,8 @@ import lombok.Data;
@Data
public class BaseModelConfigQuery implements Query {
/* @ApiModelProperty("车型sid(陕汽必须的字段)")
private String vehicleSid;*/
/* @ApiModelProperty("车型配置代码(陕汽必须的字段)")
private String vehicleCode;*/
@ApiModelProperty("所属归属")
private String orgSid;
@ApiModelProperty("车身颜色key")
private String carColorKey;
@ApiModelProperty("缓速器key")

9
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseChoiceVehicleVo.java
View File

@ -1,9 +1,12 @@
package com.yxt.anrui.base.api.basevehicle;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author dimengzhe
* @Date 2022/4/12 11:26
@ -29,7 +32,9 @@ public class BaseChoiceVehicleVo implements Vo {
@ApiModelProperty(value = "车型sid")
private String carModelSid;
@ApiModelProperty(value = "入库日期")
private String priceDate;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date priceDate;
@ApiModelProperty(value = "销售日期")
private String salesDate;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date salesDate;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java
View File

@ -27,6 +27,8 @@ public class BaseVehicleModelQuery implements Query {
private String configSid;
@ApiModelProperty(value = "分公司sid")
private String createOrgSId;
@ApiModelProperty("所属归属")
private String orgSid;
@ApiModelProperty(value = "车型sid")
private String modelSid;
@ApiModelProperty(value = "品牌sid")

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java
View File

@ -114,7 +114,7 @@ public class BaseInternalPurchaseRest implements BaseInternalPurchaseFeign {
BusinessVariables bv=new BusinessVariables();
BeanUtil.copyProperties(bvd,bv);
bv.setModelId(ProcDefEnum.BASEINTERNALPURCHASE.getProDefId());
return baseInternalPurchaseService.InitiatorToAnswer(bv);
return baseInternalPurchaseService.InitiatorToAnswer(bv,bvd.getId());
}
@Override

21
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
View File

@ -580,7 +580,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
}
}
public ResultBean InitiatorToAnswer(BusinessVariables bv) {
public ResultBean InitiatorToAnswer(BusinessVariables bv,String id) {
ResultBean rb = ResultBean.fireFail();
BaseInternalPurchase baseInternalPurchase = fetchBySid(bv.getBusinessSid());
String shuntingTypeValue = baseInternalPurchase.getShuntingTypeValue();
@ -614,8 +614,23 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
List<String> candidateGroups = voList.get(0).getCandidateGroups();
UserRoleQuery userRoleQuery = new UserRoleQuery();
userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(callInOrgSid);
if (StringUtils.isNotBlank(id)){
if (id.equals("Activity_08r04ow")){
String sellerOrgSid = baseInternalPurchase.getSellerOrgSid();
userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(sellerOrgSid);
}else if (id.equals("Activity_02xqz9n")){
String buyerOrgSid = baseInternalPurchase.getBuyerOrgSid();
userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(buyerOrgSid);
}else {
userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(callInOrgSid);
}
}else {
userRoleQuery.setRoleSid(candidateGroups.get(0));
userRoleQuery.setOrgSid(callInOrgSid);
}
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {

12
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
View File

@ -11,6 +11,7 @@ import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinance;
import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceDto;
import com.yxt.anrui.base.api.basemanufacturerfinance.BaseManufacturerFinanceVo;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService;
import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
@ -706,7 +707,16 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
} else if (manPurOrderTypeKey.equals("005")) {
maps = baseMapper.selectOrgSidAndSupplierType(orgSid, "0002");
} else if (manPurOrderTypeKey.equals("003")) {
maps = baseMapper.selectOrgSidAndSupplierType(orgSid, "0005");
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.fetchBySid(carBrandSid);
String useOrg = baseVehicleBrand.getUseOrg();
String[] split = useOrg.split(",");
for (String s : split) {
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(s).getData();
Map<String, String> map = new HashMap<>();
map.put("sid",s);
map.put("manufacturerName",sysOrganizationVo.getName());
maps.add(map);
}
}
return rb.success().setData(maps);
}

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
View File

@ -73,12 +73,9 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
QueryWrapper<BaseModelConfigVo> qw = new QueryWrapper<>();
if (pagerQuery != null) {
qw.eq("bmc.isDelete", "0");
/*if (StringUtils.isNotBlank(pagerQuery.getVehicleCode())) {//整车编码
qw.like("bmc.vehicleCode", pagerQuery.getVehicleCode());
if (StringUtils.isNotBlank(pagerQuery.getOrgSid())) {
qw.eq("bmc.createOrgSId", pagerQuery.getOrgSid());
}
if (StringUtils.isNotBlank(pagerQuery.getVehicleSid())) {//车型sid
qw.eq("bmc.vehicleSid", pagerQuery.getVehicleSid());
}*/
if (StringUtils.isNotBlank(pagerQuery.getCarColorKey())) {//车身颜色
qw.like("bmc.carColorKey", pagerQuery.getCarColorKey());
}
@ -149,6 +146,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
qw.ne("bmc.sid", sid);
}
}
qw.orderByDesc("bmc.createTime");
}
return qw;
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
View File

@ -476,5 +476,5 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
IPage<BaseDiscountpackageGetVehVo> baseDisCountPackageGetVeh(IPage<BaseVehicle> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
IPage<BaseChoiceVehicleVo> vehicleCollectionPageList(IPage<BaseChoiceVehicleVo> page, QueryWrapper<BaseVehicle> qw);
IPage<BaseChoiceVehicleVo> vehicleCollectionPageList(IPage<BaseChoiceVehicleVo> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
View File

@ -1353,7 +1353,7 @@
bv.vinNo,
bmc.carColor color,
bv.locationName location,
bv.costPrice as priced,
bv.costPrice as guidedPrice,
bv.priceDate,
bv.salesDate
FROM base_vehicle bv

85
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
View File

@ -143,7 +143,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
qw.eq("bv.createOrgSid", pagerQuery.getCreateOrgSid());
}
qw.eq("bv.isDelete", "0");
if (StringUtils.isNotBlank(pagerQuery.getOrgSid())){
if (StringUtils.isNotBlank(pagerQuery.getOrgSid())) {
qw.eq("bv.createOrgSid", pagerQuery.getOrgSid());
}
if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {//车架号
@ -1466,24 +1466,24 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
qw.eq("bv.createOrgSid", params.getCreateOrgSid());
}
qw.eq("bv.isDelete", "0");
qw.and(wrapper -> wrapper.eq("bv.vehicleState",VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().eq("bv.vehicleState",VehicleState.StockEnum.DR_STOCK.getCode()));
if (StringUtils.isNotBlank(params.getVehicleState())){
qw.eq("bv.vehicleState",params.getVehicleState());
qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
if (StringUtils.isNotBlank(params.getVehicleState())) {
qw.eq("bv.vehicleState", params.getVehicleState());
}
if (StringUtils.isNotBlank(params.getVehicleAlias())){
qw.like("bv.modelName",params.getVehicleAlias());
if (StringUtils.isNotBlank(params.getVehicleAlias())) {
qw.like("bv.modelName", params.getVehicleAlias());
}
if (StringUtils.isNotBlank(params.getConfigName())){
qw.like("bv.configName",params.getConfigName());
if (StringUtils.isNotBlank(params.getConfigName())) {
qw.like("bv.configName", params.getConfigName());
}
if (StringUtils.isNotBlank(params.getVinNo())){
qw.like("bv.vinNo",params.getVinNo());
if (StringUtils.isNotBlank(params.getVinNo())) {
qw.like("bv.vinNo", params.getVinNo());
}
if (StringUtils.isNotBlank(params.getCarColorKey())){
qw.eq("bmc.carColorKey",params.getCarColorKey());
if (StringUtils.isNotBlank(params.getCarColorKey())) {
qw.eq("bmc.carColorKey", params.getCarColorKey());
}
if (StringUtils.isNotBlank(params.getLocation())){
qw.like("bv.locationName",params.getLocation());
if (StringUtils.isNotBlank(params.getLocation())) {
qw.like("bv.locationName", params.getLocation());
}
return baseMapper.vehicleCrmPageList(page, qw);
}
@ -1516,16 +1516,16 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
qw.and(wrapper -> wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode()));
}
// 车架号
if (StringUtils.isNotBlank(params.getVinNo())){
qw.like("bv.vinNo",params.getVinNo());
if (StringUtils.isNotBlank(params.getVinNo())) {
qw.like("bv.vinNo", params.getVinNo());
}
// 颜色
if (StringUtils.isNotBlank(params.getCarColorKey())){
qw.eq("bmc.carColorKey",params.getCarColorKey());
if (StringUtils.isNotBlank(params.getCarColorKey())) {
qw.eq("bmc.carColorKey", params.getCarColorKey());
}
// 存放地点
if (StringUtils.isNotBlank(params.getLocation())){
qw.eq("bv.location",params.getLocation());
if (StringUtils.isNotBlank(params.getLocation())) {
qw.eq("bv.location", params.getLocation());
}
if (params.getVinNoList().size() > 0) {
qw.notIn("bv.vinNo", params.getVinNoList());
@ -1688,16 +1688,16 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
qw.and(wrapper -> wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode()));
}
// 车架号
if (StringUtils.isNotBlank(params.getVinNo())){
qw.like("bv.vinNo",params.getVinNo());
if (StringUtils.isNotBlank(params.getVinNo())) {
qw.like("bv.vinNo", params.getVinNo());
}
// 颜色
if (StringUtils.isNotBlank(params.getCarColorKey())){
qw.eq("bmc.carColorKey",params.getCarColorKey());
if (StringUtils.isNotBlank(params.getCarColorKey())) {
qw.eq("bmc.carColorKey", params.getCarColorKey());
}
// 存放地点
if (StringUtils.isNotBlank(params.getLocation())){
qw.eq("bv.location",params.getLocation());
if (StringUtils.isNotBlank(params.getLocation())) {
qw.eq("bv.location", params.getLocation());
}
if (params.getVinNoList().size() > 0) {
qw.notIn("bv.vinNo", params.getVinNoList());
@ -1748,16 +1748,16 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
qw.and(wrapper -> wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode()));
}
// 车架号
if (StringUtils.isNotBlank(params.getVinNo())){
qw.like("bv.vinNo",params.getVinNo());
if (StringUtils.isNotBlank(params.getVinNo())) {
qw.like("bv.vinNo", params.getVinNo());
}
// 颜色
if (StringUtils.isNotBlank(params.getCarColorKey())){
qw.eq("bmc.carColorKey",params.getCarColorKey());
if (StringUtils.isNotBlank(params.getCarColorKey())) {
qw.eq("bmc.carColorKey", params.getCarColorKey());
}
// 存放地点
if (StringUtils.isNotBlank(params.getLocation())){
qw.eq("bv.location",params.getLocation());
if (StringUtils.isNotBlank(params.getLocation())) {
qw.eq("bv.location", params.getLocation());
}
if (params.getVinNoList().size() > 0) {
qw.notIn("bv.vinNo", params.getVinNoList());
@ -1988,6 +1988,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
}
return rb.success().setData(orderVoList);
}
public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid) {
ResultBean<List<AppBaseVehicleOrderVo>> rb = ResultBean.fireFail();
List<AppBaseVehicleOrderVo> orderVoList = new ArrayList<>();
@ -2295,6 +2296,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
baseVehicle.setVehicleStateValue(VehicleState.StockEnum.ING_STOCK.getRemarks());
if (save(baseVehicle)) {
BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
baseVehicleCertificate.setCarModel(baseVehicle.getVehMark());
baseVehicleCertificate.setVinNo(baseVehicle.getVinNo());
baseVehicleCertificate.setCertificateState(CertificState.CertificateState.CERSTATE_XN.getCode());
baseVehicleCertificate.setCertificateStateValue(CertificState.CertificateState.CERSTATE_XN.getRemarks());
@ -2337,6 +2339,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (save(baseVehicle)) {
BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
baseVehicleCertificate.setCarModel(baseVehicle.getVehMark());
baseVehicleCertificate.setVinNo(baseVehicle.getVinNo());
baseVehicleCertificate.setCertificateState(CertificState.CertificateState.CERSTATE_DZ.getCode());
baseVehicleCertificate.setCertificateStateValue(CertificState.CertificateState.CERSTATE_DZ.getRemarks());
@ -2392,7 +2395,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
new_baseVehicle.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.NG_ORDER.getRemarks());
if (save(new_baseVehicle)) {
BaseVehicleCertificate baseVehicleCertificate = new BaseVehicleCertificate();
baseVehicleCertificate.setCarModel(baseVehicle.getVehMark());
baseVehicleCertificate.setVinNo(new_baseVehicle.getVinNo());
baseVehicleCertificate.setCertificateState(CertificState.CertificateState.CERSTATE_XN.getCode());
baseVehicleCertificate.setCertificateStateValue(CertificState.CertificateState.CERSTATE_XN.getRemarks());
@ -3219,7 +3222,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
List<BaseChoiceVehicleVo> newRecords = new ArrayList<>();
for (BaseChoiceVehicleVo record : records) {
ScmCollectionRebateVehDetailsVo scmCollectionRebateVehDetailsVo = scmCollectionRebateVehFeign.fetchByVehSid(record.getVinNo());
if (scmCollectionRebateVehDetailsVo == null){
if (scmCollectionRebateVehDetailsVo == null) {
newRecords.add(record);
}
}
@ -3249,22 +3252,22 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
qw.and(wrapper -> wrapper.like("bvm.modelName", params.getModelNameAndCode()).or().like("bvm.vehicleTypeCode", params.getModelNameAndCode()));
}
// 车架号
if (StringUtils.isNotBlank(params.getVinNo())){
qw.like("bv.vinNo",params.getVinNo());
if (StringUtils.isNotBlank(params.getVinNo())) {
qw.like("bv.vinNo", params.getVinNo());
}
// 颜色
if (StringUtils.isNotBlank(params.getCarColorKey())){
qw.eq("bmc.carColorKey",params.getCarColorKey());
if (StringUtils.isNotBlank(params.getCarColorKey())) {
qw.eq("bmc.carColorKey", params.getCarColorKey());
}
// 存放地点
if (StringUtils.isNotBlank(params.getLocation())){
qw.eq("bv.location",params.getLocation());
if (StringUtils.isNotBlank(params.getLocation())) {
qw.eq("bv.location", params.getLocation());
}
if (params.getVinNoList().size() > 0) {
qw.notIn("bv.vinNo", params.getVinNoList());
}
qw.eq("bv.isDelete", 0);
qw.eq("bv.vehicleState",VehicleState.StockEnum.OUT_STOCK.getCode());
qw.eq("bv.vehicleState", VehicleState.StockEnum.OUT_STOCK.getCode());
}
return baseMapper.vehicleCollectionPageList(page, qw);
}

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
View File

@ -85,6 +85,9 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
if (pagerQuery != null) {
qw.eq("bvm.isDelete", "0");
qw.like("bvb.useOrg", pagerQuery.getCreateOrgSId());
if (StringUtils.isNotBlank(pagerQuery.getOrgSid())) {
qw.eq("bvm.createOrg", pagerQuery.getOrgSid());
}
if (StringUtils.isNotBlank(pagerQuery.getModelSid())) {//车型sid
qw.eq("bvm.sid", pagerQuery.getModelSid());
}

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
View File

@ -40,7 +40,7 @@ public enum ProcDefEnum {
SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"),
BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:5:867504"),//测试外采流程定义id
BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:867520"),//测试车型调价流程定义id
BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:867512"),//测试调车流程定义id
BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:4:892504"),//测试调车流程定义id
//SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO
//FINCOSTAPPLY("费用申请", "process_u0pahv0s:5:457512"),
//FINPAYAPPLY("付款申请", "process_gin2tntb:3:457508"),

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java
View File

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmcollectionrebate;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
@ -90,6 +91,4 @@ public interface ScmCollectionRebateFeign {
@PostMapping("/checkApplyGetAlreadyUploadCollectionRebate")
@ResponseBody
public ResultBean<PagerVo<ScmCollectionRebateVo>> checkApplyGetAlreadyUploadCollectionRebate(@RequestBody PagerQuery<ScmCollectionRebateQuery> pq);
}

8
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatedistribution/ScmCollectionRebateDistributionQuery.java
View File

@ -51,12 +51,12 @@ public class ScmCollectionRebateDistributionQuery implements Query {
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("预提开始标题")
private String withholdingStartApply; // 预提开始标题
@ApiModelProperty("预提结束标题")
private String withholdingEndApply; // 预提结束标题
@ApiModelProperty("预提标题")
private String withholdingApply; // 预提标题
@ApiModelProperty("创建开始日期")
private String createStartTime; // 创建开始日期
@ApiModelProperty("创建结束日期")
private String createEndTime; // 创建结束日期
@ApiModelProperty("创建分公司sid")
private String createOrgSid;
}

27
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java
View File

@ -53,21 +53,22 @@ public class ScmCollectionRebateWithDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("预提返利")
private String withRebate; // 预提返利
@ApiModelProperty("台数")
private String num; // 台数
@ApiModelProperty("回款返利sid")
private List<String> collectionRebateSids; // 回款返利sid
@ApiModelProperty("回款返利sid")
private String collectionRebateSid; // 回款返利sid
@ApiModelProperty("回款返利预提申请sid")
private String mainSid; // 回款返利预提申请sid
@ApiModelProperty("回款方式key")
private String collectionTypeKey; // 回款方式key
@ApiModelProperty("回款方式value")
private String collectionTypeValue; // 回款方式value
@ApiModelProperty("回款返利预提申请sid")
private String mainSid; // 回款返利预提申请sid
@ApiModelProperty("回款金额")
private String collectionMoney; // 回款金额
@ApiModelProperty("运费")
private String freight; // 运费
@ApiModelProperty("计算标准")
private String calculationStandard; // 计算标准
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("回款返利sid")
private List<String> collectionRebateSids; // 回款返利sid
@ApiModelProperty("回款返利sid")
private String collectionRebateSid; // 回款返利sid
}

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeign.java
View File

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmcollectionrebatewith;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
@ -75,4 +76,9 @@ public interface ScmCollectionRebateWithFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<ScmCollectionRebateWithDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("回款返利预提查看详情")
@GetMapping("/collectionRebateWithDetails/{sid}")
@ResponseBody
public ResultBean<List<ScmCollectionRebateDetailsVo>> collectionRebateWithDetails(@PathVariable("sid") String sid);
}

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithFeignFallback.java
View File

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmcollectionrebatewith;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -69,4 +70,9 @@ public class ScmCollectionRebateWithFeignFallback implements ScmCollectionRebate
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatewith/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<List<ScmCollectionRebateDetailsVo>> collectionRebateWithDetails(String sid) {
return null;
}
}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java
View File

@ -31,6 +31,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
import com.yxt.anrui.scm.biz.scmcollectionrebateveh.ScmCollectionRebateVehService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@ -48,6 +50,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

9
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java
View File

@ -78,6 +78,7 @@ public class ScmCollectionRebateDistributionService extends MybatisBaseService<S
public PagerVo<ScmCollectionRebateDistributionVo> listPageVo(PagerQuery<ScmCollectionRebateDistributionQuery> pq) {
ScmCollectionRebateDistributionQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebateDistribution> qw = new QueryWrapper<>();
qw.eq("createOrgSid",query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getBrandSid())){
qw.eq("brandSid",query.getBrandSid());
}
@ -86,11 +87,9 @@ public class ScmCollectionRebateDistributionService extends MybatisBaseService<S
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
String withholdingStartApply = query.getWithholdingStartApply();
String withholdingEndApply = query.getWithholdingEndApply();
qw.apply(StringUtils.isNotBlank(withholdingStartApply), "date_format (withholdingApply,'%Y年%m月份') >= date_format('" + withholdingStartApply + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(withholdingEndApply), "date_format (withholdingApply,'%Y年%m月份') <= date_format('" + withholdingEndApply + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(query.getWithholdingApply())){
qw.like("withholdingApply",query.getWithholdingApply());
}
IPage<ScmCollectionRebateDistribution> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateDistributionVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmCollectionRebateDistributionVo> p = PagerUtil.pageToVo(pagging, null);

54
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml
View File

@ -1,27 +1,37 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo">
SELECT * FROM scm_collection_rebate_with <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo">
SELECT * FROM scm_collection_rebate_with <where> ${ew.sqlSegment} </where>
</select>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo">
SELECT * FROM scm_collection_rebate_with
<where>
${ew.sqlSegment}
</where>
</select>
<select id="fetchByMainSid"
resultType="com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo">
SELECT scr.collectionTypeKey,
scr.`collectionTypeValue`,
SUM(scr.`estimateRebate`) withRebate,
COUNT(*) num,
GROUP_CONCAT(scrw.`specialRebateSid`) specialRebateSid
FROM scm_special_rebate_with scrw
LEFT JOIN scm_special_rebate scr
ON scr.`sid` = scrw.`specialRebateSid`
WHERE scrw.`mainSid` = #{sid}
GROUP BY scr.`calculationModeKey`
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo">
SELECT * FROM scm_collection_rebate_with
<where>
${ew.sqlSegment}
</where>
</select>
<select id="fetchByMainSid"
resultType="com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo">
SELECT scrw.sid,
scr.collectionTypeKey,
scr.`collectionTypeValue`,
scrw.`mainSid`,
scr.`collectionMoney`,
scr.`freight`,
scr.`calculationStandard`,
SUM(scr.`estimateRebate`) estimateRebate,
GROUP_CONCAT(scrw.`collectionRebateSid`) collectionRebateSid
FROM scm_collection_rebate_with scrw
LEFT JOIN scm_collection_rebate scr
ON scr.`sid` = scrw.`collectionRebateSid`
WHERE scrw.`mainSid` = #{sid}
GROUP BY scr.`collectionTypeKey`
</select>
</mapper>

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithRest.java
View File

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.scm.biz.scmcollectionrebatewith;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -97,4 +98,9 @@ public class ScmCollectionRebateWithRest implements ScmCollectionRebateWithFeign
ScmCollectionRebateWithDetailsVo vo = scmCollectionRebateWithService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<List<ScmCollectionRebateDetailsVo>> collectionRebateWithDetails(String sid) {
return scmCollectionRebateWithService.collectionRebateWithDetails(sid);
}
}

22
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java
View File

@ -28,6 +28,9 @@ package com.yxt.anrui.scm.biz.scmcollectionrebatewith;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDetailsVo;
import com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -41,8 +44,10 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDeta
import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto;
import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
@ -60,6 +65,10 @@ import java.util.List;
*/
@Service
public class ScmCollectionRebateWithService extends MybatisBaseService<ScmCollectionRebateWithMapper, ScmCollectionRebateWith> {
@Autowired
private ScmCollectionRebateService scmCollectionRebateService;
private QueryWrapper<ScmCollectionRebateWith> createQueryWrapper(ScmCollectionRebateWithQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -123,4 +132,17 @@ public class ScmCollectionRebateWithService extends MybatisBaseService<ScmCollec
public List<String> fetchCollectionReBateSidByMainSid(String businessSid) {
return baseMapper.fetchCollectionReBateSidByMainSid(businessSid);
}
public ResultBean<List<ScmCollectionRebateDetailsVo>> collectionRebateWithDetails(String sid) {
ResultBean rb = ResultBean.fireFail();
List<ScmCollectionRebateDetailsVo> scmCollectionRebateDetailsVos = new ArrayList<>();
String[] sids = sid.split(",");
for (String s : sids) {
ScmCollectionRebate scmCollectionRebate = scmCollectionRebateService.fetchBySid(s);
ScmCollectionRebateDetailsVo scmCollectionRebateDetailsVo = new ScmCollectionRebateDetailsVo();
BeanUtil.copyProperties(scmCollectionRebate,scmCollectionRebateDetailsVo);
scmCollectionRebateDetailsVos.add(scmCollectionRebateDetailsVo);
}
return rb.success().setData(scmCollectionRebateDetailsVos);
}
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java
View File

@ -89,7 +89,7 @@ public class ScmCollectionRebateWithApplyRest implements ScmCollectionRebateWith
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids) {
return scmCollectionRebateWithApplyService.delAll(sids);
}

25
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
View File

@ -39,6 +39,9 @@ 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.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate;
import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.ScmCollectionRebateDistribution;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWith;
import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto;
@ -46,6 +49,8 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.SubmitScmCollectionRebateWithApplyDto;
import com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateService;
import com.yxt.anrui.scm.biz.scmcollectionrebatedistribution.ScmCollectionRebateDistributionService;
import com.yxt.anrui.scm.biz.scmcollectionrebateveh.ScmCollectionRebateVehService;
import com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@ -87,6 +92,10 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
@Autowired
private ScmCollectionRebateService scmCollectionRebateService;
@Autowired
private ScmCollectionRebateVehService scmCollectionRebateVehService;
@Autowired
private ScmCollectionRebateDistributionService scmCollectionRebateDistributionService;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private FlowableFeign flowableFeign;
@ -212,9 +221,6 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
for (ScmCollectionRebateWithDetailsVo scmCollectionRebateWithDetailsVo : scmCollectionRebateWithDetailsVos) {
String[] collectionRebateSids = scmCollectionRebateWithDetailsVo.getCollectionRebateSid().split(",");
scmCollectionRebateWithDetailsVo.setCollectionRebateSids(Arrays.asList(collectionRebateSids));
String withRebate = scmCollectionRebateWithDetailsVo.getWithRebate();
withRebate = withRebate.substring(0, withRebate.lastIndexOf("."));
scmCollectionRebateWithDetailsVo.setWithRebate(withRebate);
}
scmCollectionRebateWithApplyDetailsVo.setScmCollectionRebateWiths(scmCollectionRebateWithDetailsVos);
return rb.success().setData(scmCollectionRebateWithApplyDetailsVo);
@ -279,7 +285,6 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
return voResultBean;
}
if (r == 2) {
@ -341,7 +346,19 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
for (String collectionRebateSid : collectionRebateSids) {
scmCollectionRebateService.updateState(collectionRebateSid);
List<ScmCollectionRebateVehDetailsVo> scmCollectionRebateVehDetailsVos = scmCollectionRebateVehService.fetchByMainSid(collectionRebateSid);
if (scmCollectionRebateVehDetailsVos.isEmpty()){
ScmCollectionRebate scmCollectionRebate = scmCollectionRebateService.fetchBySid(collectionRebateSid);
ScmCollectionRebateDistribution scmCollectionRebateDistribution = new ScmCollectionRebateDistribution();
String sid = scmCollectionRebateDistribution.getSid();
BeanUtil.copyProperties(scmCollectionRebate,scmCollectionRebateDistribution);
scmCollectionRebateDistribution.setSid(sid);
scmCollectionRebateDistribution.setDistributionState("未分配");
scmCollectionRebateDistribution.setWithholdingApply(scmCollectionRebateDistribution.getWithholdingApply());
scmCollectionRebateDistributionService.save(scmCollectionRebateDistribution);
}
}
}
return rb.success().setData(resultBean.getData());
} else {

Write Preview
Loading…
Cancel
Save