Browse Source

出库申请推送销售台账接口开发

zhanglei
God 2 years ago
parent
commit
c720061663
  1. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java
  2. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java
  3. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  4. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  5. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  6. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeignFallback.java
  7. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java
  8. 10
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java

@ -11,10 +11,10 @@ public class AppRovalContractPageQuery implements Query {
@ApiModelProperty("用户sid") @ApiModelProperty("用户sid")
private String userSid; private String userSid;
@ApiModelProperty("车架号 客户名称 合同编号") @ApiModelProperty("车架号 客户名称 合同编号")
private String name; private String name;
@ApiModelProperty("状态") @ApiModelProperty("状态")
private int stateType; private int stateType;
@ApiModelProperty("组织全路径")
private String orgPath;
} }

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java

@ -430,7 +430,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
if (vinLists.size() > 0) { if (vinLists.size() > 0) {
for (AppRovalContractPageVo appRovalContractPageVo : vinLists) { for (AppRovalContractPageVo appRovalContractPageVo : vinLists) {
AdCarListVo adCarListVo = new AdCarListVo(); AdCarListVo adCarListVo = new AdCarListVo();
adCarListVo.setVin(appRovalContractPageVo.getVin()); //adCarListVo.setVin(appRovalContractPageVo.getVin());
CommonContractVo commonContractVo = commonContractFeign.getContractBySalesOrderSid(appRovalContractPageVo.getBusSid()).getData(); CommonContractVo commonContractVo = commonContractFeign.getContractBySalesOrderSid(appRovalContractPageVo.getBusSid()).getData();
if (commonContractVo != null) { if (commonContractVo != null) {
adCarListVo.setPrice(commonContractVo.getPrice()); adCarListVo.setPrice(commonContractVo.getPrice());

6
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@ -502,12 +502,12 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
if (carLists.size() > 0) { if (carLists.size() > 0) {
for (AppRovalContractPageVo appRovalContractPageVo : vinLists) { for (AppRovalContractPageVo appRovalContractPageVo : vinLists) {
AdCarListVo adCarListVo = new AdCarListVo(); AdCarListVo adCarListVo = new AdCarListVo();
adCarListVo.setVin(appRovalContractPageVo.getVin()); //adCarListVo.setVin(appRovalContractPageVo.getVin());
//获取车辆sid //获取车辆sid
BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(appRovalContractPageVo.getVin(), useOrgSid).getData(); /*BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(appRovalContractPageVo.getVin(), useOrgSid).getData();
if (baseVehicle != null) { if (baseVehicle != null) {
adCarListVo.setCarSid(baseVehicle.getSid()); adCarListVo.setCarSid(baseVehicle.getSid());
} }*/
CommonContractVo commonContractVo = commonContractFeign.getContractBySalesOrderSid(appRovalContractPageVo.getBusSid()).getData(); CommonContractVo commonContractVo = commonContractFeign.getContractBySalesOrderSid(appRovalContractPageVo.getBusSid()).getData();
if (commonContractVo != null) { if (commonContractVo != null) {
adCarListVo.setPrice(commonContractVo.getPrice()); adCarListVo.setPrice(commonContractVo.getPrice());

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -5300,9 +5300,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
public IPage<AppRovalContractPageVo> getApprovalContractList(PagerQuery<AppRovalContractPageQuery> pagerQuery) { public IPage<AppRovalContractPageVo> getApprovalContractList(PagerQuery<AppRovalContractPageQuery> pagerQuery) {
AppRovalContractPageQuery params = pagerQuery.getParams(); AppRovalContractPageQuery params = pagerQuery.getParams();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData(); SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData();
String orgPath = params.getOrgPath();
String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1);
if (params.getStateType() == 2){
QueryWrapper<AppRovalContractPageVo> qw = new QueryWrapper<>(); QueryWrapper<AppRovalContractPageVo> qw = new QueryWrapper<>();
qw.eq("staffSid",sysUserVo.getStaffSid()); qw.eq("staffSid",sysUserVo.getStaffSid());
qw.eq("orgSid",sysUserVo.getDepartmentSid()); qw.eq("orgSid",deptSid);
if (StringUtils.isNotBlank(params.getName())){ if (StringUtils.isNotBlank(params.getName())){
qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName())); qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName()));
} }
@ -5317,6 +5320,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
} }
return iPage; return iPage;
} }
return null;
}
public List<AppRovalContractPageVo> selectByContractNo(String contractNo) { public List<AppRovalContractPageVo> selectByContractNo(String contractNo) {
List<AppRovalContractPageVo> list = baseMapper.selectByContractNo(contractNo); List<AppRovalContractPageVo> list = baseMapper.selectByContractNo(contractNo);

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -2059,18 +2059,20 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
String userSid = query.getUserSid(); String userSid = query.getUserSid();
String contractNo = query.getContractNo(); String contractNo = query.getContractNo();
String orgPath = query.getOrgPath(); String orgPath = query.getOrgPath();
String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1);
String deptName = sysOrganizationFeign.fetchBySid(deptSid).getData().getName();
FinBillApplicationDetailsVo finBillApplicationDetailsVo = new FinBillApplicationDetailsVo(); FinBillApplicationDetailsVo finBillApplicationDetailsVo = new FinBillApplicationDetailsVo();
if (StringUtils.isBlank(sid)){ if (StringUtils.isBlank(sid)){
finBillApplicationDetailsVo.setCreateBySid(userSid); finBillApplicationDetailsVo.setCreateBySid(userSid);
SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
finBillApplicationDetailsVo.setCreateByName(sysUserVo.getName()); finBillApplicationDetailsVo.setCreateByName(sysUserVo.getName());
finBillApplicationDetailsVo.setDeptSid(sysUserVo.getDepartmentSid()); finBillApplicationDetailsVo.setDeptSid(deptSid);
finBillApplicationDetailsVo.setDeptName(sysUserVo.getDepartmentName()); finBillApplicationDetailsVo.setDeptName(deptName);
finBillApplicationDetailsVo.setApplyDate(DateUtil.formatDate(new Date())); finBillApplicationDetailsVo.setApplyDate(DateUtil.formatDate(new Date()));
finBillApplicationDetailsVo.setStaffSid(sysUserVo.getStaffSid()); finBillApplicationDetailsVo.setStaffSid(sysUserVo.getStaffSid());
finBillApplicationDetailsVo.setStaffName(sysUserVo.getName()); finBillApplicationDetailsVo.setStaffName(sysUserVo.getName());
finBillApplicationDetailsVo.setSaleDeptSid(sysUserVo.getDepartmentSid()); finBillApplicationDetailsVo.setSaleDeptSid(deptSid);
finBillApplicationDetailsVo.setSaleDeptName(sysUserVo.getDepartmentName()); finBillApplicationDetailsVo.setSaleDeptName(deptName);
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
finBillApplicationDetailsVo.setSaleTypeKey(busSalesOrder.getPayTypeKey()); finBillApplicationDetailsVo.setSaleTypeKey(busSalesOrder.getPayTypeKey());
finBillApplicationDetailsVo.setSaleTypeValue(busSalesOrder.getPayType()); finBillApplicationDetailsVo.setSaleTypeValue(busSalesOrder.getPayType());

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/AppRovalFeignFallback.java

@ -26,4 +26,9 @@ public class AppRovalFeignFallback implements AppRovalFeign {
public ResultBean<PagerVo<RovalContractPageVo>> getApprovalContractList(PagerQuery<RovalContractPageQuery> pagerQuery) { public ResultBean<PagerVo<RovalContractPageVo>> getApprovalContractList(PagerQuery<RovalContractPageQuery> pagerQuery) {
return null; return null;
} }
@Override
public ResultBean<PagerVo<AppVehicleQKKPVo>> getVehicleQKKPList(PagerQuery<AppVehicleQKKPQuery> pagerQuery) {
return null;
}
} }

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java

@ -14,4 +14,6 @@ public class RovalContractPageQuery implements Query {
private String name; private String name;
@ApiModelProperty("状态") @ApiModelProperty("状态")
private int stateType; private int stateType;
@ApiModelProperty("组织全路径")
private String orgPath;
} }

10
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@ -167,6 +167,7 @@ public class AppBusAdvanceGinvoiceapplyService {
//车辆信息 //车辆信息
List<AppCarListVo> vinListVos = new ArrayList<>(); List<AppCarListVo> vinListVos = new ArrayList<>();
List<FinBillVehicleVo> finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles(); List<FinBillVehicleVo> finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles();
if (finBillVehicles != null){
for (FinBillVehicleVo finBillVehicle : finBillVehicles) { for (FinBillVehicleVo finBillVehicle : finBillVehicles) {
AppCarListVo vinListVo = new AppCarListVo(); AppCarListVo vinListVo = new AppCarListVo();
vinListVo.setVin(finBillVehicle.getVinNo()); vinListVo.setVin(finBillVehicle.getVinNo());
@ -178,6 +179,7 @@ public class AppBusAdvanceGinvoiceapplyService {
vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks()); vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
vinListVos.add(vinListVo); vinListVos.add(vinListVo);
} }
}
vo.setVinList(vinListVos); vo.setVinList(vinListVos);
//挂车信息 //挂车信息
List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo> finBillTrailers = finBillApplicationDetailsVo.getFinBillTrailers(); List<com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo> finBillTrailers = finBillApplicationDetailsVo.getFinBillTrailers();
@ -203,22 +205,22 @@ public class AppBusAdvanceGinvoiceapplyService {
List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
List<String> registerContractImages = new ArrayList<>();//车辆登记合同 List<String> registerContractImages = new ArrayList<>();//车辆登记合同
List<String> idCardImages = new ArrayList<>(); List<String> idCardImages = new ArrayList<>();
if (zjApplicationAppendxs.size() > 0){ if (zjApplicationAppendxs != null){
for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
idCardImages.add(zjApplicationAppendx.getFileUrl()); idCardImages.add(zjApplicationAppendx.getFileUrl());
} }
} }
if (khkpsqsApplicationAppendxs.size() > 0){ if (khkpsqsApplicationAppendxs != null){
for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl()); customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl());
} }
} }
if (kpxxqrsApplicationAppendxs.size() > 0){ if (kpxxqrsApplicationAppendxs != null){
for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) { for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) {
invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl()); invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl());
} }
} }
if (cldjhtApplicationAppendxs.size() > 0){ if (cldjhtApplicationAppendxs != null){
for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) { for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) {
registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
} }

Loading…
Cancel
Save