|
|
@ -1316,35 +1316,58 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa |
|
|
|
settleDto.setSourceBillSid(dto.getSid()); |
|
|
|
settleDto.setSourceBillNo(asBusrepairBill.getBillNo()); |
|
|
|
fmsReceivesettleFeign.save(settleDto); |
|
|
|
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); |
|
|
|
finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName()); |
|
|
|
finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid()); |
|
|
|
finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid()); |
|
|
|
finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName()); |
|
|
|
AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid()); |
|
|
|
if (null != billVech) { |
|
|
|
if (StringUtils.isNotBlank(billVech.getVinNo())) { |
|
|
|
finUncollectedReceivablesDetailedDto.setVIN(billVech.getVinNo()); |
|
|
|
if (null != asBusrepairBill.getHourAmount()) { |
|
|
|
if (asBusrepairBill.getHourAmount().compareTo(BigDecimal.ZERO) > 0) { |
|
|
|
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); |
|
|
|
finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName()); |
|
|
|
finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid()); |
|
|
|
finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid()); |
|
|
|
finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName()); |
|
|
|
finUncollectedReceivablesDetailedDto.setContractSid(asBusrepairBill.getSid()); |
|
|
|
AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid()); |
|
|
|
if (null != billVech) { |
|
|
|
if (StringUtils.isNotBlank(billVech.getVinNo())) { |
|
|
|
finUncollectedReceivablesDetailedDto.setVIN(billVech.getVinNo()); |
|
|
|
finUncollectedReceivablesDetailedDto.setBusVinSid(billVech.getSid()); |
|
|
|
} |
|
|
|
} |
|
|
|
finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile()); |
|
|
|
finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid()); |
|
|
|
finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath()); |
|
|
|
finUncollectedReceivablesDetailedDto.setReceivablesName("工时费"); |
|
|
|
finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney((asBusrepairBill.getHourAmount()).toString()); |
|
|
|
finUncollectedReceivablesDetailedDto.setReveivableMoney((asBusrepairBill.getHourAmount()).toString()); |
|
|
|
finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName()); |
|
|
|
finUncollectedReceivablesDetailedDto.setKxState("01"); |
|
|
|
finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto); |
|
|
|
} |
|
|
|
} |
|
|
|
finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile()); |
|
|
|
finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid()); |
|
|
|
finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath()); |
|
|
|
finUncollectedReceivablesDetailedDto.setReceivablesName("工时费、材料费"); |
|
|
|
BigDecimal settleAmount = new BigDecimal("0"); |
|
|
|
BigDecimal otherSettleAmount = new BigDecimal("0"); |
|
|
|
if (StringUtils.isNotBlank(settleVo.getSettleAmount())) { |
|
|
|
settleAmount = new BigDecimal(settleVo.getSettleAmount()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(settleVo.getOtherSettleAmount())) { |
|
|
|
otherSettleAmount = new BigDecimal(settleVo.getOtherSettleAmount()); |
|
|
|
if (null != asBusrepairBill.getGoodsAmount()) { |
|
|
|
if (asBusrepairBill.getGoodsAmount().compareTo(BigDecimal.ZERO) > 0) { |
|
|
|
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); |
|
|
|
finUncollectedReceivablesDetailedDto.setCreateByName(asBusrepairBill.getCreateByName()); |
|
|
|
finUncollectedReceivablesDetailedDto.setCreateBySid(asBusrepairBill.getCreateBySid()); |
|
|
|
finUncollectedReceivablesDetailedDto.setCustomerSid(asBusrepairBill.getCustomerSid()); |
|
|
|
finUncollectedReceivablesDetailedDto.setCustomerName(asBusrepairBill.getCustomerName()); |
|
|
|
finUncollectedReceivablesDetailedDto.setContractSid(asBusrepairBill.getSid()); |
|
|
|
AsBusrepairBillVech billVech = asBusrepairBillVechService.fetchByBillSid(asBusrepairBill.getSid()); |
|
|
|
if (null != billVech) { |
|
|
|
if (StringUtils.isNotBlank(billVech.getVinNo())) { |
|
|
|
finUncollectedReceivablesDetailedDto.setVIN(billVech.getVinNo()); |
|
|
|
finUncollectedReceivablesDetailedDto.setBusVinSid(billVech.getSid()); |
|
|
|
} |
|
|
|
} |
|
|
|
finUncollectedReceivablesDetailedDto.setCustomerPhone(asBusrepairBill.getMobile()); |
|
|
|
finUncollectedReceivablesDetailedDto.setUseOrgSid(asBusrepairBill.getUseOrgSid()); |
|
|
|
finUncollectedReceivablesDetailedDto.setOrgSidPath(asBusrepairBill.getOrgSidPath()); |
|
|
|
finUncollectedReceivablesDetailedDto.setReceivablesName("材料费"); |
|
|
|
finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney((asBusrepairBill.getGoodsAmount()).toString()); |
|
|
|
finUncollectedReceivablesDetailedDto.setReveivableMoney((asBusrepairBill.getGoodsAmount()).toString()); |
|
|
|
finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName()); |
|
|
|
finUncollectedReceivablesDetailedDto.setKxState("01"); |
|
|
|
finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto); |
|
|
|
} |
|
|
|
} |
|
|
|
finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney((settleAmount.add(otherSettleAmount)).toString()); |
|
|
|
finUncollectedReceivablesDetailedDto.setReveivableMoney((settleAmount.add(otherSettleAmount)).toString()); |
|
|
|
finUncollectedReceivablesDetailedDto.setUseOrgName(asBusrepairBill.getUseOrgName()); |
|
|
|
finUncollectedReceivablesDetailedDto.setKxState("01"); |
|
|
|
finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto); |
|
|
|
|
|
|
|
} |
|
|
|
asBusrepairBill.setNodeCode(6); |
|
|
|
asBusrepairBill.setNodeName("已结算"); |
|
|
|