|
@ -1688,11 +1688,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp |
|
|
finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz); |
|
|
finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz); |
|
|
} |
|
|
} |
|
|
//推送其他应收单
|
|
|
//推送其他应收单
|
|
|
|
|
|
int z = 1; |
|
|
for (BaseVehicleZSOutDto zcDto : zcDtos) { |
|
|
for (BaseVehicleZSOutDto zcDto : zcDtos) { |
|
|
|
|
|
String otherNum = String.format("%02d", z); |
|
|
zcDto.setCwCustomerNo(salOutStock.getFCustomerID()); |
|
|
zcDto.setCwCustomerNo(salOutStock.getFCustomerID()); |
|
|
OtherReceivable otherReceivable = createZSOtherReceivableQKC(baseVehicleOutApply, zcDto); |
|
|
OtherReceivable otherReceivable = createZSOtherReceivableQKC(baseVehicleOutApply, zcDto, otherNum); |
|
|
if (otherReceivable != null) { |
|
|
if (otherReceivable != null) { |
|
|
finKingDeeFeign.draftOtherReceivableBill(otherReceivable); |
|
|
finKingDeeFeign.draftOtherReceivableBill(otherReceivable); |
|
|
|
|
|
z = z + 1; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -1759,9 +1762,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp |
|
|
return rb.success(); |
|
|
return rb.success(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private OtherReceivable createZSOtherReceivableQKC(BaseVehicleOutApply baseVehicleOutApply, BaseVehicleZSOutDto zcDto) { |
|
|
private OtherReceivable createZSOtherReceivableQKC(BaseVehicleOutApply baseVehicleOutApply, BaseVehicleZSOutDto zcDto,String otherNum) { |
|
|
OtherReceivable otherReceivableOne = new OtherReceivable(); |
|
|
OtherReceivable otherReceivableOne = new OtherReceivable(); |
|
|
otherReceivableOne.setBillNo(baseVehicleOutApply.getBillNo()); |
|
|
otherReceivableOne.setBillNo(baseVehicleOutApply.getBillNo() + "-" + otherNum); |
|
|
otherReceivableOne.setCommUnit(zcDto.getCwCustomerNo()); |
|
|
otherReceivableOne.setCommUnit(zcDto.getCwCustomerNo()); |
|
|
SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(baseVehicleOutApply.getCreateOrgSid()).getData(); |
|
|
SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(baseVehicleOutApply.getCreateOrgSid()).getData(); |
|
|
otherReceivableOne.setCollectionOrg(sysOrganizationVo1.getOrgCode()); |
|
|
otherReceivableOne.setCollectionOrg(sysOrganizationVo1.getOrgCode()); |
|
@ -1771,7 +1774,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp |
|
|
OtherReceivable.CollectionDetailDto collectionDetailDtoTwo = new OtherReceivable.CollectionDetailDto(); |
|
|
OtherReceivable.CollectionDetailDto collectionDetailDtoTwo = new OtherReceivable.CollectionDetailDto(); |
|
|
SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(baseVehicleOutApply.getOrgSid()).getData(); |
|
|
SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(baseVehicleOutApply.getOrgSid()).getData(); |
|
|
collectionDetailDtoOne.setDearDept(sysOrganizationVo2.getOrgCode()); |
|
|
collectionDetailDtoOne.setDearDept(sysOrganizationVo2.getOrgCode()); |
|
|
|
|
|
collectionDetailDtoOne.setMaterialNo(zcDto.getVinNo().substring(zcDto.getVinNo().length() - 8)); |
|
|
collectionDetailDtoTwo.setDearDept(sysOrganizationVo2.getOrgCode()); |
|
|
collectionDetailDtoTwo.setDearDept(sysOrganizationVo2.getOrgCode()); |
|
|
|
|
|
collectionDetailDtoTwo.setMaterialNo(zcDto.getVinNo().substring(zcDto.getVinNo().length() - 8)); |
|
|
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(baseVehicleOutApply.getContractNo()).getData(); |
|
|
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(baseVehicleOutApply.getContractNo()).getData(); |
|
|
if ("2".equals(busSalesOrder.getFinancePlan()) && "1".equals(busSalesOrder.getPayTypeKey())) { |
|
|
if ("2".equals(busSalesOrder.getFinancePlan()) && "1".equals(busSalesOrder.getPayTypeKey())) { |
|
|
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), zcDto.getVinSid()).getData(); |
|
|
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), zcDto.getVinSid()).getData(); |
|
@ -2277,10 +2282,13 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp |
|
|
finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz); |
|
|
finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz); |
|
|
} |
|
|
} |
|
|
//推送其他应收单
|
|
|
//推送其他应收单
|
|
|
|
|
|
int z = 1; |
|
|
for (BaseVehicleZSOutDto zcDto : zcDtos) { |
|
|
for (BaseVehicleZSOutDto zcDto : zcDtos) { |
|
|
OtherReceivable otherReceivable = createZSOtherReceivableQKC(baseVehicleOutApply, zcDto); |
|
|
String otherNum = String.format("%02d", z); |
|
|
|
|
|
OtherReceivable otherReceivable = createZSOtherReceivableQKC(baseVehicleOutApply, zcDto, otherNum); |
|
|
if (otherReceivable != null) { |
|
|
if (otherReceivable != null) { |
|
|
finKingDeeFeign.draftOtherReceivableBill(otherReceivable); |
|
|
finKingDeeFeign.draftOtherReceivableBill(otherReceivable); |
|
|
|
|
|
z = z + 1; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} else {//贷款
|
|
|
} else {//贷款
|
|
|