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

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

master
God 2 years ago
parent
9f8d374341
commit
c720061663
8 changed files with 56 additions and 40 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. 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. 37
      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. 30
      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
View File

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

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

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

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

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

37
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -5300,22 +5300,27 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
public IPage<AppRovalContractPageVo> getApprovalContractList(PagerQuery<AppRovalContractPageQuery> pagerQuery) {
AppRovalContractPageQuery params = pagerQuery.getParams();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData();
QueryWrapper<AppRovalContractPageVo> qw = new QueryWrapper<>();
qw.eq("staffSid",sysUserVo.getStaffSid());
qw.eq("orgSid",sysUserVo.getDepartmentSid());
if (StringUtils.isNotBlank(params.getName())){
qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName()));
}
qw.orderByDesc("createDate");
IPage<AppRovalContractPageVo> page = PagerUtil.queryToPage(pagerQuery);
IPage<AppRovalContractPageVo> iPage = baseMapper.selectByStaffSid(page, qw);
for (AppRovalContractPageVo record : iPage.getRecords()) {
String createDate = record.getCreateDate();
DateTime dateTime = DateUtil.parse(createDate, "yyyy-MM-dd");
createDate = DateUtil.formatDate(dateTime);
record.setCreateDate(createDate);
}
return iPage;
String orgPath = params.getOrgPath();
String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1);
if (params.getStateType() == 2){
QueryWrapper<AppRovalContractPageVo> qw = new QueryWrapper<>();
qw.eq("staffSid",sysUserVo.getStaffSid());
qw.eq("orgSid",deptSid);
if (StringUtils.isNotBlank(params.getName())){
qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName()));
}
qw.orderByDesc("createDate");
IPage<AppRovalContractPageVo> page = PagerUtil.queryToPage(pagerQuery);
IPage<AppRovalContractPageVo> iPage = baseMapper.selectByStaffSid(page, qw);
for (AppRovalContractPageVo record : iPage.getRecords()) {
String createDate = record.getCreateDate();
DateTime dateTime = DateUtil.parse(createDate, "yyyy-MM-dd");
createDate = DateUtil.formatDate(dateTime);
record.setCreateDate(createDate);
}
return iPage;
}
return null;
}
public List<AppRovalContractPageVo> selectByContractNo(String contractNo) {

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

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

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

@ -26,4 +26,9 @@ public class AppRovalFeignFallback implements AppRovalFeign {
public ResultBean<PagerVo<RovalContractPageVo>> getApprovalContractList(PagerQuery<RovalContractPageQuery> pagerQuery) {
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
View File

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

30
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
View File

@ -167,16 +167,18 @@ public class AppBusAdvanceGinvoiceapplyService {
//车辆信息
List<AppCarListVo> vinListVos = new ArrayList<>();
List<FinBillVehicleVo> finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles();
for (FinBillVehicleVo finBillVehicle : finBillVehicles) {
AppCarListVo vinListVo = new AppCarListVo();
vinListVo.setVin(finBillVehicle.getVinNo());
vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey());
vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue());
vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey());
vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue());
vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
vinListVos.add(vinListVo);
if (finBillVehicles != null){
for (FinBillVehicleVo finBillVehicle : finBillVehicles) {
AppCarListVo vinListVo = new AppCarListVo();
vinListVo.setVin(finBillVehicle.getVinNo());
vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey());
vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue());
vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey());
vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue());
vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
vinListVos.add(vinListVo);
}
}
vo.setVinList(vinListVos);
//挂车信息
@ -203,22 +205,22 @@ public class AppBusAdvanceGinvoiceapplyService {
List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
List<String> registerContractImages = new ArrayList<>();//车辆登记合同
List<String> idCardImages = new ArrayList<>();
if (zjApplicationAppendxs.size() > 0){
if (zjApplicationAppendxs != null){
for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
idCardImages.add(zjApplicationAppendx.getFileUrl());
}
}
if (khkpsqsApplicationAppendxs.size() > 0){
if (khkpsqsApplicationAppendxs != null){
for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl());
}
}
if (kpxxqrsApplicationAppendxs.size() > 0){
if (kpxxqrsApplicationAppendxs != null){
for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) {
invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl());
}
}
if (cldjhtApplicationAppendxs.size() > 0){
if (cldjhtApplicationAppendxs != null){
for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) {
registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
}

Write Preview
Loading…
Cancel
Save