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

款项结转问题优化 

车辆台账管理优化
master
God 2 years ago
parent
06441ddacf
commit
2b29c6104b
7 changed files with 345 additions and 141 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/basevehicle/BaseVehicle.java
  2. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
  3. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java
  4. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java
  5. 117
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  6. 350
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  7. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java
View File

@ -183,4 +183,6 @@ public class BaseVehicle extends BaseEntity {
private String vehMark;
@ApiModelProperty(value = "公司入库日期")
private String orgPriceDate;
@ApiModelProperty(value = "组织全路径")
private String orgSidPath;
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
View File

@ -161,4 +161,7 @@ public class BaseVehicleDto implements Dto {
@ApiModelProperty("调出分公司sid")
private String callOutOrgSid; // 调出分公司sid
@ApiModelProperty(value = "组织全路径")
private String orgSidPath;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQuery.java
View File

@ -24,6 +24,8 @@ import lombok.Data;
public class BaseVehicleQuery implements Query {
private static final long serialVersionUID = -2859517555985858222L;
@ApiModelProperty(value = "创建人sid")
private String userSid;
@ApiModelProperty(value = "分公司sid")
private String orgSid;
@ApiModelProperty(value = "创建组织sid")
@ -64,6 +66,8 @@ public class BaseVehicleQuery implements Query {
@ApiModelProperty(value = "排产订单编号")
private String orderingNo;
private String menuUrl;
private String menuSid;
/***************车型查询**********************/

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java
View File

@ -156,4 +156,6 @@ public class BaseVehicleSelectVo implements Vo {
private String orgCode;
@ApiModelProperty(value = "公司入库日期")
private String orgPriceDate;
@ApiModelProperty(value = "组织全路径")
private String orgSidPath;
}

117
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
View File

@ -45,6 +45,7 @@ import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
import com.yxt.anrui.base.common.enums.CertificState;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.enums.OperVehicleState;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
@ -145,123 +146,13 @@ public class BaseVehicleRest implements BaseVehicleFeign {
@Autowired
private ScmWarehouseFeign scmWarehouseFeign;
@Autowired
private BaseTrailerService baseTrailerService;
@Autowired
private BaseVehinstallService baseVehinstallService;
@Autowired
private BaseTrailerModelService baseTrailerModelService;
@Autowired
private BaseVehinstallmodelService baseVehinstallmodelService;
@Autowired
private BasePurchaseSystemService basePurchaseSystemService;
@Override
public ResultBean<PagerVo<BaseVehicleVo>> pagerList(@RequestBody PagerQuery<BaseVehicleQuery> pagerQuery) {
ResultBean<PagerVo<BaseVehicleVo>> rb = ResultBean.fireFail();
IPage<BaseVehicleVo> page = baseVehicleService.pagerList(pagerQuery);
List<BaseVehicleVo> records = page.getRecords();
for (BaseVehicleVo record : records) {
String manPurOrderTypeValue = record.getManPurOrderTypeValue();
if (("外采").equals(manPurOrderTypeValue)) {
record.setLibraryAge(Long.parseLong("0"));
} else {
//厂家库龄
if (record.getPriceDate() != null) {
//厂家入库日期
Date priceDate = record.getPriceDate();
//买断日期
Date solidDate = record.getSolidDate();
if (solidDate != null) {
int i = priceDate.compareTo(solidDate);
long betweenDay = DateUtil.between(priceDate, solidDate, DateUnit.DAY);
record.setLibraryAge(betweenDay * i * -1);
} else {
String today = DateUtil.today();
DateTime currentDate = DateUtil.parse(today);
int i = priceDate.compareTo(currentDate);
long betweenDay = DateUtil.between(priceDate, currentDate, DateUnit.DAY);
record.setLibraryAge(betweenDay * i * -1);
}
}
}
//公司库龄
if (record.getDepartureDate() != null) {
//发车日期
Date departureDate = record.getDepartureDate();
//销售日期
Date salesDate = record.getSalesDate();
if (salesDate != null) {
int i = departureDate.compareTo(salesDate);
long betweenDay = DateUtil.between(departureDate, salesDate, DateUnit.DAY);
record.setOrgLibraryAge(betweenDay * i * -1);
} else {
String today = DateUtil.today();
DateTime currentDate = DateUtil.parse(today);
int i = departureDate.compareTo(currentDate);
long betweenDay = DateUtil.between(departureDate, currentDate, DateUnit.DAY);
record.setOrgLibraryAge(betweenDay * i * -1);
}
}
//买断库龄
if (record.getSolidDate() != null) {
//买断日期
Date solidDate = record.getSolidDate();
//销售日期
Date salesDate = record.getSalesDate();
if (salesDate != null) {
int i = solidDate.compareTo(salesDate);
long betweenDay = DateUtil.between(solidDate, salesDate, DateUnit.DAY);
record.setSettlementLibraryAge(betweenDay * i * -1);
} else {
String today = DateUtil.today();
DateTime currentDate = DateUtil.parse(today);
int i = solidDate.compareTo(currentDate);
long betweenDay = DateUtil.between(solidDate, currentDate, DateUnit.DAY);
record.setSettlementLibraryAge(betweenDay * i * -1);
}
}
String vinNo = record.getVinNo();
if (StringUtils.isNotBlank(vinNo)) {
record.setLastVinNo(vinNo.substring(vinNo.length() - 8));
}
String modelSid = record.getModelSid();
String modelConfigSid = record.getModelConfigSid();
String createOrgSid = record.getCreateOrgSid();
BaseVehmodelVo data = baseVehmodelConfigService.selectOne(modelSid, modelConfigSid, createOrgSid).getData();
record.setManufactorSettlementPrice(data.getManufactorSettlementPrice());
String sid = record.getSid();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerService.fetchByVehSid(sid);
BaseVehinstallDetailsVo baseVehinstallDetailsVo = baseVehinstallService.fetchByVinNoAndOrgSid(vinNo, createOrgSid);
if (baseTrailerDetailsVo != null) {
BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(baseTrailerDetailsVo.getTrailerModelSid());
String appearanceSizeLong = baseTrailerModel.getAppearanceSizeLong();
String appearanceSizeWide = baseTrailerModel.getAppearanceSizeWide();
String appearanceSizeHigh = baseTrailerModel.getAppearanceSizeHigh();
String appearanceSizeTotalHigh = baseTrailerModel.getAppearanceSizeTotalHigh();
String trailerTypeValue = baseTrailerModel.getTrailerTypeValue();
StringBuilder trailerModel = new StringBuilder();
trailerModel.append(trailerTypeValue).append("(").append("长").append(appearanceSizeLong).append("mm，").append("宽").append(appearanceSizeWide).append("mm，").append("高").append(appearanceSizeHigh).append("mm，").append("总高").append(appearanceSizeTotalHigh).append("mm").append(")");
record.setSzOrGCSid(baseTrailerDetailsVo.getSid());
record.setSzOrGC("挂车");
record.setTrailerOrInstall(trailerModel.toString());
record.setTrailerOrInstallDealPrice(baseTrailerModel.getSaleGuidancePrice());
} else if (baseVehinstallDetailsVo != null) {
BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(baseVehinstallDetailsVo.getMainSid());
String wk_long = baseVehinstallmodel.getWk_long();
String wk_wide = baseVehinstallmodel.getWk_wide();
String wk_high = baseVehinstallmodel.getWk_high();
String installName = baseVehinstallmodel.getInstallNameValue();
StringBuilder vehinstallmodel = new StringBuilder();
vehinstallmodel.append(installName).append("(").append("长").append(wk_long).append("mm，").append("宽").append(wk_wide).append("mm，").append("高").append(wk_high).append("mm").append(")");
record.setSzOrGCSid(baseVehinstallDetailsVo.getSid());
record.setSzOrGC("上装");
record.setTrailerOrInstall(vehinstallmodel.toString());
record.setTrailerOrInstallDealPrice(baseVehinstallDetailsVo.getGuidePrice());
}
}
PagerVo<BaseVehicleVo> pv = new PagerVo<>();
PagerVo<BaseVehicleVo> pv1 = PagerUtil.pageToVo(page, pv);
return rb.success().setData(pv1);
ResultBean rb = ResultBean.fireFail();
PagerVo<BaseVehicleVo> pv = baseVehicleService.listPageVo(pagerQuery);
return rb.success().setData(pv);
}
@Override

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

@ -16,6 +16,7 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
import com.yxt.anrui.base.api.basetrailer.TrailerVo;
import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModel;
import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
import com.yxt.anrui.base.api.basevehicle.app.GetVinQuery;
@ -24,17 +25,21 @@ import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
import com.yxt.anrui.base.api.basevehinstallmodel.BaseVehinstallmodel;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
import com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelService;
import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
import com.yxt.anrui.base.biz.basevehicletempstate.BaseVehicleTempstateService;
import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService;
import com.yxt.anrui.base.biz.basevehinstallmodel.BaseVehinstallmodelService;
import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.base.common.enums.CertificState;
@ -44,6 +49,7 @@ import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVe
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
@ -51,14 +57,19 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationQuery;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo;
@ -144,18 +155,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
@Autowired
private BusArrearsCarryVehicleApplyFeign busArrearsCarryVehicleApplyFeign;
/**
* 车辆信息分页列表
*
* @param pagerQuery 查询条件
* @return
*/
public IPage<BaseVehicleVo> pagerList(PagerQuery<BaseVehicleQuery> pagerQuery) {
IPage<BaseVehicleQuery> page = PagerUtil.queryToPage(pagerQuery);
QueryWrapper<BaseVehicleVo> qw = buildQueryWrapper(pagerQuery.getParams());
return baseMapper.pagerList(page, qw);
}
@Autowired
private BaseTrailerModelService baseTrailerModelService;
@Autowired
private BaseVehinstallmodelService baseVehinstallmodelService;
public IPage<BaseVehicleVo> pagerListByOrgSidPath(PagerQuery<BaseVehicleQuery> pq) {
IPage<BaseVehicleQuery> page = PagerUtil.queryToPage(pq);
@ -763,7 +766,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
* @param pagerQuery
* @return
*/
public IPage<AppCurrentCarModelByPageListVo> getAppCurrentCarByPageList(PagerQuery<AppCurrentCarByPageListQuery> pagerQuery) {
public IPage<AppCurrentCarModelByPageListVo> getAppCurrentCarByPageList
(PagerQuery<AppCurrentCarByPageListQuery> pagerQuery) {
IPage<AppCurrentCarByPageListQuery> page = PagerUtil.queryToPage(pagerQuery);
QueryWrapper<AppCurrentCarModelByPageListVo> qw = CurrentCarQueryWrapper(pagerQuery.getParams());
IPage<AppCurrentCarModelByPageListVo> iPage = baseMapper.getAppCurrentCarByPageList(page, qw);
@ -793,7 +797,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
* @param pagerQuery 查询条件
* @return
*/
private QueryWrapper<AppCurrentCarModelByPageListVo> CurrentCarQueryWrapper(AppCurrentCarByPageListQuery pagerQuery) {
private QueryWrapper<AppCurrentCarModelByPageListVo> CurrentCarQueryWrapper(AppCurrentCarByPageListQuery
pagerQuery) {
QueryWrapper<AppCurrentCarModelByPageListVo> qw = new QueryWrapper<>();
if (pagerQuery != null) {
qw.eq("bv.vehicleState", "0002");
@ -992,7 +997,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
* @param configSid
* @return
*/
public AppCurrentCarDetailConfigVo getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid, String useOrgSid, String orgPath) {
public AppCurrentCarDetailConfigVo getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String
userSid, String useOrgSid, String orgPath) {
String useOrg = "";
if (StringUtils.isNotBlank(useOrgSid)) {
useOrg = useOrgSid;
@ -1293,7 +1299,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
* @param configSid
* @return
*/
public List<AppVinsDetailsVo> getVins(String modelSid, String configSid, String userSid, String orgPath, String name) {
public List<AppVinsDetailsVo> getVins(String modelSid, String configSid, String userSid, String orgPath, String
name) {
if (StringUtils.isBlank(orgPath)) {
orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
} else {
@ -1339,7 +1346,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
* @param pagerQuery
* @return
*/
public IPage<BaseExistingCarListPageVo> selExistingCarPageList(PagerQuery<BaseExistingCarPageQuery> pagerQuery) {
public IPage<BaseExistingCarListPageVo> selExistingCarPageList
(PagerQuery<BaseExistingCarPageQuery> pagerQuery) {
String userSid = pagerQuery.getParams().getUserSid();
SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
if (data != null) {
@ -2244,7 +2252,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
return rb.success().setData(orderVoList);
}
public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid, List<String> list) {
public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String
orgSid, List<String> list) {
ResultBean<List<AppBaseVehicleOrderVo>> rb = ResultBean.fireFail();
List<AppBaseVehicleOrderVo> orderVoList = new ArrayList<>();
orderVoList = baseMapper.selectAppListOne(modelSid, configSid, orgSid, VehicleState.LockEnum.LOCK.getCode(), list);
@ -2306,7 +2315,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
return rb.success().setData(list);
}
public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(AppScmInventoryRecordsQuery appScmInventoryRecordsQuery) {
public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(AppScmInventoryRecordsQuery
appScmInventoryRecordsQuery) {
ResultBean rb = ResultBean.fireFail();
// String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
String orgPath = appScmInventoryRecordsQuery.getOrgPath();
@ -2317,7 +2327,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
return rb.success().setData(list);
}
public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(AppScmInventoryRecordsQuery appScmInventoryRecordsQuery) {
public ResultBean<List<AppScmInventoryRecordsVo>> selectPatrolinspections(AppScmInventoryRecordsQuery
appScmInventoryRecordsQuery) {
ResultBean rb = ResultBean.fireFail();
// String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
//条件：本分公司、非删除、库存或采购退库中或调入或调出中
@ -2473,7 +2484,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
return rb.success().setData(vo);
}
public IPage<AppScmWarehouseVinVo> getPcVinByWarehouseSid(PagerQuery<VinByWarehouseQuery> pagerQuery, List<String> vinList) {
public IPage<AppScmWarehouseVinVo> getPcVinByWarehouseSid
(PagerQuery<VinByWarehouseQuery> pagerQuery, List<String> vinList) {
IPage<VinByWarehouseQuery> page = PagerUtil.queryToPage(pagerQuery);
QueryWrapper<AppScmWarehouseVinVo> qw = new QueryWrapper();
VinByWarehouseQuery params = pagerQuery.getParams();
@ -3188,14 +3200,16 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
return baseMapper.vehicleRebatePageList(page, qw);
}
public PagerVo<BaseSpecialRebateDisGetVehVo> specialRebateDisGetVeh(PagerQuery<BaseSpecialRebateDisGetVehQuery> pq) {
public PagerVo<BaseSpecialRebateDisGetVehVo> specialRebateDisGetVeh
(PagerQuery<BaseSpecialRebateDisGetVehQuery> pq) {
IPage<BaseSpecialRebateDisGetVehVo> page = specialRebateDisGetVehPageList(pq);
PagerVo<BaseSpecialRebateDisGetVehVo> pv = new PagerVo<>();
PagerVo<BaseSpecialRebateDisGetVehVo> pv1 = PagerUtil.pageToVo(page, pv);
return pv1;
}
private IPage<BaseSpecialRebateDisGetVehVo> specialRebateDisGetVehPageList(PagerQuery<BaseSpecialRebateDisGetVehQuery> pq) {
private IPage<BaseSpecialRebateDisGetVehVo> specialRebateDisGetVehPageList
(PagerQuery<BaseSpecialRebateDisGetVehQuery> pq) {
IPage<BaseSpecialRebateDisGetVehVo> page = PagerUtil.queryToPage(pq);
QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
BaseSpecialRebateDisGetVehQuery params = pq.getParams();
@ -3495,7 +3509,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
baseMapper.updateConAndCostPrice(witPinMoney, vinNo, callInOrgSid);
}
public PagerVo<BaseDiscountpackageGetVehVo> baseDisCountPackageGetVeh(PagerQuery<BaseDiscountpackageGetVehQuery> pq) {
public PagerVo<BaseDiscountpackageGetVehVo> baseDisCountPackageGetVeh
(PagerQuery<BaseDiscountpackageGetVehQuery> pq) {
IPage<BaseVehicle> page = PagerUtil.queryToPage(pq);
BaseDiscountpackageGetVehQuery params = pq.getParams();
QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
@ -3966,4 +3981,291 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
}
return baseMapper.vehicleQKKPPageList(page, qw);
}
public PagerVo<BaseVehicleVo> listPageVo(PagerQuery<BaseVehicleQuery> pq) {
BaseVehicleQuery pagerQuery = pq.getParams();
QueryWrapper<BaseVehicleVo> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(pagerQuery.getMenuUrl()) || StringUtils.isNotBlank(pagerQuery.getMenuSid())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(pagerQuery.getOrgSidPath());
privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
privilegeQuery.setMenuSid(pagerQuery.getMenuSid());
privilegeQuery.setUserSid(pagerQuery.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = pagerQuery.getOrgSidPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("bv.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("bv.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("bv.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("bv.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("bv.createBySid", pagerQuery.getUserSid());
} else {
PagerVo<BaseVehicleVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<BaseVehicleVo> p = new PagerVo<>();
return p;
}
}
qw.eq("bv.isDelete", "0");
if (StringUtils.isNotBlank(pagerQuery.getOrgSid())) {
qw.eq("bv.createOrgSid", pagerQuery.getOrgSid());
}
if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {//车架号
qw.like("bv.vinNo", pagerQuery.getVinNo());
}
if (StringUtils.isNotBlank(pagerQuery.getModelName())) {//车型名称
qw.like("bv.modelName", pagerQuery.getModelName());
}
if (StringUtils.isNotBlank(pagerQuery.getLocation())) {//存放地点
qw.like("bv.location", pagerQuery.getLocation());
}
if (StringUtils.isNotBlank(pagerQuery.getVehicleState())) {//库存状态
qw.eq("bv.vehicleState", pagerQuery.getVehicleState());
}
if (StringUtils.isNotBlank(pagerQuery.getCertificateStateValue())) {//合格证状态value
qw.eq("bvcf.certificateStateValue", pagerQuery.getCertificateStateValue());
}
if (StringUtils.isNotBlank(pagerQuery.getInsideCode())) {//内部编码
qw.like("bv.insideCode", pagerQuery.getInsideCode());
}
if (StringUtils.isNotBlank(pagerQuery.getManPurOrderTypeKey())) {//采购类型
qw.eq("bv.manPurOrderTypeKey", pagerQuery.getManPurOrderTypeKey());
}
if (StringUtils.isNotBlank(pagerQuery.getPriceDate())) {//厂家入库日期
qw.eq("bv.priceDate", pagerQuery.getPriceDate());
}
if (StringUtils.isNotBlank(pagerQuery.getSettlementStatus())) {//买断状态
qw.eq("bv.settlementStatus", pagerQuery.getSettlementStatus());
}
//车型字段
if (StringUtils.isNotBlank(pagerQuery.getCarBrand())) {//品牌
qw.eq("bvm.carBrand", pagerQuery.getCarBrand());
}
if (StringUtils.isNotBlank(pagerQuery.getVehicleType())) {//功能
qw.eq("bvm.vehicleType", pagerQuery.getVehicleType());
}
if (StringUtils.isNotBlank(pagerQuery.getProductLine())) {//系列
qw.eq("bvm.productLine", pagerQuery.getProductLine());
}
if (StringUtils.isNotBlank(pagerQuery.getDriveForm())) {//驱动
qw.eq("bvm.driveForm", pagerQuery.getDriveForm());
}
if (StringUtils.isNotBlank(pagerQuery.getPower())) {//马力
qw.eq("bvm.power", pagerQuery.getPower());
}
if (StringUtils.isNotBlank(pagerQuery.getVehicleVersion())) {//版本
qw.eq("bvm.vehicleVersion", pagerQuery.getVehicleVersion());
}
if (StringUtils.isNotBlank(pagerQuery.getFuelType())) {//燃料
qw.eq("bvm.fuelType", pagerQuery.getFuelType());
}
if (StringUtils.isNotBlank(pagerQuery.getVehicleTypeCode())) {//车型编码
qw.like("bvm.vehicleTypeCode", pagerQuery.getVehicleTypeCode());
}
if (StringUtils.isNotBlank(pagerQuery.getTranCaseTypeKey())) {//变速箱类型
qw.eq("bvm.tranCaseTypeKey", pagerQuery.getTranCaseTypeKey());
}
if (StringUtils.isNotBlank(pagerQuery.getGearboxType())) {//变速箱
qw.eq("bvm.gearboxType", pagerQuery.getGearboxType());
}
if (StringUtils.isNotBlank(pagerQuery.getEmissionStandard())) {//排放标准
qw.eq("bvm.emissionStandard", pagerQuery.getEmissionStandard());
}
if (StringUtils.isNotBlank(pagerQuery.getEngineType())) {//发动机型号
qw.eq("bvm.engineType", pagerQuery.getEngineType());
}
if (StringUtils.isNotBlank(pagerQuery.getMarketSegments())) {//细分市场
qw.eq("bvm.marketSegments", pagerQuery.getMarketSegments());
}
if (StringUtils.isNotBlank(pagerQuery.getSpecifications())) {//规格型号
qw.like("bvm.specifications", pagerQuery.getSpecifications());
}
//车型配置字段
if (StringUtils.isNotBlank(pagerQuery.getCarColorKey())) {//颜色
qw.eq("bmc.carColorKey", pagerQuery.getCarColorKey());
}
if (StringUtils.isNotBlank(pagerQuery.getSlowMachineKey())) {//缓速器
qw.eq("bmc.slowMachineKey", pagerQuery.getSlowMachineKey());
}
if (StringUtils.isNotBlank(pagerQuery.getRearViewMirrorKey())) {//后视镜
qw.eq("bmc.rearViewMirrorKey", pagerQuery.getRearViewMirrorKey());
}
if (StringUtils.isNotBlank(pagerQuery.getSpecificationKey())) {//驾驶室
qw.eq("bmc.specificationKey", pagerQuery.getSpecificationKey());
}
if (StringUtils.isNotBlank(pagerQuery.getRearAxleKey())) {//后桥
qw.eq("bmc.rearAxleKey", pagerQuery.getRearAxleKey());
}
if (StringUtils.isNotBlank(pagerQuery.getRearAxleRatioKey())) {//速比
qw.eq("bmc.rearAxleRatioKey", pagerQuery.getRearAxleRatioKey());
}
if (StringUtils.isNotBlank(pagerQuery.getAirConditionerKey())) {//空调
qw.eq("bmc.airConditionerKey", pagerQuery.getAirConditionerKey());
}
if (StringUtils.isNotBlank(pagerQuery.getHubMaterialKey())) {//轮毂材质
qw.eq("bmc.hubMaterialKey", pagerQuery.getHubMaterialKey());
}
if (StringUtils.isNotBlank(pagerQuery.getBaffleModelKey())) {//导流罩
qw.eq("bmc.baffleModelKey", pagerQuery.getBaffleModelKey());
}
if (StringUtils.isNotBlank(pagerQuery.getSuspensionKey())) {//悬架
qw.eq("bmc.suspensionKey", pagerQuery.getSuspensionKey());
}
if (StringUtils.isNotBlank(pagerQuery.getSeatKey())) {//座椅
qw.eq("bmc.seatKey", pagerQuery.getSeatKey());
}
if (StringUtils.isNotBlank(pagerQuery.getTireCoverKey())) {//护轮罩
qw.eq("bmc.tireCoverKey", pagerQuery.getTireCoverKey());
}
if (StringUtils.isNotBlank(pagerQuery.getSaddleKey())) {//鞍座
qw.eq("bmc.saddleKey", pagerQuery.getSaddleKey());
}
if (StringUtils.isNotBlank(pagerQuery.getWheelbaseKey())) {//轴距
qw.eq("bmc.wheelbaseKey", pagerQuery.getWheelbaseKey());
}
if (StringUtils.isNotBlank(pagerQuery.getBumperKey())) {//保险杠
qw.eq("bmc.bumperKey", pagerQuery.getBumperKey());
}
if (StringUtils.isNotBlank(pagerQuery.getConfiguringBaoKey())) {//配置包
qw.eq("bmc.configuringBaoKey", pagerQuery.getConfiguringBaoKey());
}
if (StringUtils.isNotBlank(pagerQuery.getIndependentSourcesKey())) {//独立热源
qw.eq("bmc.independentSourcesKey", pagerQuery.getIndependentSourcesKey());
}
if (StringUtils.isNotBlank(pagerQuery.getFuelTankKey())) {//燃料箱
qw.eq("bmc.fuelTankKey", pagerQuery.getFuelTankKey());
}
if (StringUtils.isNotBlank(pagerQuery.getMultimediaKey())) {//多媒体
qw.eq("bmc.multimediaKey", pagerQuery.getMultimediaKey());
}
if (StringUtils.isNotBlank(pagerQuery.getConfigName())) {//常用配置名称
qw.eq("bmc.configName", pagerQuery.getConfigName());
}
qw.orderByDesc("bv.createOrgSid");
qw.orderByDesc("bv.priceDate");
IPage<BaseVehicleQuery> page = PagerUtil.queryToPage(pq);
IPage<BaseVehicleVo> pagging = baseMapper.pagerList(page, qw);
List<BaseVehicleVo> records = pagging.getRecords();
for (BaseVehicleVo record : records) {
String manPurOrderTypeValue = record.getManPurOrderTypeValue();
if (("外采").equals(manPurOrderTypeValue)) {
record.setLibraryAge(Long.parseLong("0"));
} else {
//厂家库龄
if (record.getPriceDate() != null) {
//厂家入库日期
Date priceDate = record.getPriceDate();
//买断日期
Date solidDate = record.getSolidDate();
if (solidDate != null) {
int i = priceDate.compareTo(solidDate);
long betweenDay = DateUtil.between(priceDate, solidDate, DateUnit.DAY);
record.setLibraryAge(betweenDay * i * -1);
} else {
String today = DateUtil.today();
DateTime currentDate = DateUtil.parse(today);
int i = priceDate.compareTo(currentDate);
long betweenDay = DateUtil.between(priceDate, currentDate, DateUnit.DAY);
record.setLibraryAge(betweenDay * i * -1);
}
}
}
//公司库龄
if (record.getDepartureDate() != null) {
//发车日期
Date departureDate = record.getDepartureDate();
//销售日期
Date salesDate = record.getSalesDate();
if (salesDate != null) {
int i = departureDate.compareTo(salesDate);
long betweenDay = DateUtil.between(departureDate, salesDate, DateUnit.DAY);
record.setOrgLibraryAge(betweenDay * i * -1);
} else {
String today = DateUtil.today();
DateTime currentDate = DateUtil.parse(today);
int i = departureDate.compareTo(currentDate);
long betweenDay = DateUtil.between(departureDate, currentDate, DateUnit.DAY);
record.setOrgLibraryAge(betweenDay * i * -1);
}
}
//买断库龄
if (record.getSolidDate() != null) {
//买断日期
Date solidDate = record.getSolidDate();
//销售日期
Date salesDate = record.getSalesDate();
if (salesDate != null) {
int i = solidDate.compareTo(salesDate);
long betweenDay = DateUtil.between(solidDate, salesDate, DateUnit.DAY);
record.setSettlementLibraryAge(betweenDay * i * -1);
} else {
String today = DateUtil.today();
DateTime currentDate = DateUtil.parse(today);
int i = solidDate.compareTo(currentDate);
long betweenDay = DateUtil.between(solidDate, currentDate, DateUnit.DAY);
record.setSettlementLibraryAge(betweenDay * i * -1);
}
}
String vinNo = record.getVinNo();
if (StringUtils.isNotBlank(vinNo)) {
record.setLastVinNo(vinNo.substring(vinNo.length() - 8));
}
String modelSid = record.getModelSid();
String modelConfigSid = record.getModelConfigSid();
String createOrgSid = record.getCreateOrgSid();
BaseVehmodelVo data = baseVehmodelConfigService.selectOne(modelSid, modelConfigSid, createOrgSid).getData();
record.setManufactorSettlementPrice(data.getManufactorSettlementPrice());
String sid = record.getSid();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerService.fetchByVehSid(sid);
BaseVehinstallDetailsVo baseVehinstallDetailsVo = baseVehinstallService.fetchByVinNoAndOrgSid(vinNo, createOrgSid);
if (baseTrailerDetailsVo != null) {
BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(baseTrailerDetailsVo.getTrailerModelSid());
String appearanceSizeLong = baseTrailerModel.getAppearanceSizeLong();
String appearanceSizeWide = baseTrailerModel.getAppearanceSizeWide();
String appearanceSizeHigh = baseTrailerModel.getAppearanceSizeHigh();
String appearanceSizeTotalHigh = baseTrailerModel.getAppearanceSizeTotalHigh();
String trailerTypeValue = baseTrailerModel.getTrailerTypeValue();
StringBuilder trailerModel = new StringBuilder();
trailerModel.append(trailerTypeValue).append("(").append("长").append(appearanceSizeLong).append("mm，").append("宽").append(appearanceSizeWide).append("mm，").append("高").append(appearanceSizeHigh).append("mm，").append("总高").append(appearanceSizeTotalHigh).append("mm").append(")");
record.setSzOrGCSid(baseTrailerDetailsVo.getSid());
record.setSzOrGC("挂车");
record.setTrailerOrInstall(trailerModel.toString());
record.setTrailerOrInstallDealPrice(baseTrailerModel.getSaleGuidancePrice());
} else if (baseVehinstallDetailsVo != null) {
BaseVehinstallmodel baseVehinstallmodel = baseVehinstallmodelService.fetchBySid(baseVehinstallDetailsVo.getMainSid());
String wk_long = baseVehinstallmodel.getWk_long();
String wk_wide = baseVehinstallmodel.getWk_wide();
String wk_high = baseVehinstallmodel.getWk_high();
String installName = baseVehinstallmodel.getInstallNameValue();
StringBuilder vehinstallmodel = new StringBuilder();
vehinstallmodel.append(installName).append("(").append("长").append(wk_long).append("mm，").append("宽").append(wk_wide).append("mm，").append("高").append(wk_high).append("mm").append(")");
record.setSzOrGCSid(baseVehinstallDetailsVo.getSid());
record.setSzOrGC("上装");
record.setTrailerOrInstall(vehinstallmodel.toString());
record.setTrailerOrInstallDealPrice(baseVehinstallDetailsVo.getGuidePrice());
}
}
PagerVo<BaseVehicleVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

8
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
View File

@ -574,8 +574,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
dto.setIsOneSale(true);
String sid = saveOrUpdateAll(dto).getData();
finFundsCarriedForwardApply = fetchBySid(sid);
String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
baseMapper.updatePathBySid(pdfPath, sid);
//String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
//baseMapper.updatePathBySid(pdfPath, sid);
tsqtysd(sid);
return rb.success();
}
@ -1113,8 +1113,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
String pdfPath = createPdf(finFundsCarriedForwardApply.getSid(), finFundsCarriedForwardApply.getCreateByName()).getData();
baseMapper.updatePathBySid(pdfPath, businessSid);
//String pdfPath = createPdf(finFundsCarriedForwardApply.getSid(), finFundsCarriedForwardApply.getCreateByName()).getData();
//baseMapper.updatePathBySid(pdfPath, businessSid);
List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
for (AppFinFundsCarriedForwardYXYSKXVo appFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
finSelectedReceivablesDetailedService.updateAuditStateBySid(3, appFinFundsCarriedForwardYXYSKXVo.getSid());

Write Preview
Loading…
Cancel
Save