|
|
|
@ -686,6 +686,44 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
}else{ |
|
|
|
//生成新车空白合同
|
|
|
|
filemap.put("totalPrice", ""); |
|
|
|
filemap.put("priceRemarks", ""); |
|
|
|
filemap.put("depositTotal", ""); |
|
|
|
String remarks = ""; |
|
|
|
String date = DateUtil.today(); |
|
|
|
List<String> dateString = Arrays.asList(date.split("-")); |
|
|
|
String year = dateString.get(0); |
|
|
|
String month = dateString.get(1); |
|
|
|
String day = dateString.get(2); |
|
|
|
filemap.put("year", year); |
|
|
|
filemap.put("month", month); |
|
|
|
filemap.put("day", day); |
|
|
|
if (finCompanyInvoicingDetailsVo != null) { |
|
|
|
filemap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
|
|
|
|
filemap.put("customerName", finCompanyInvoicingDetailsVo.getName());//开票名称
|
|
|
|
filemap.put("invoiceNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号
|
|
|
|
filemap.put("idNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号
|
|
|
|
filemap.put("adds", finCompanyInvoicingDetailsVo.getAddress());//户籍地址
|
|
|
|
}else{ |
|
|
|
CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(dto.getOpenTickSid()); |
|
|
|
if (crmCustomerTemp != null) { |
|
|
|
filemap.put("invoiceName", crmCustomerTemp.getName());//开票名称
|
|
|
|
filemap.put("customerName", crmCustomerTemp.getName());//开票名称
|
|
|
|
filemap.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号
|
|
|
|
filemap.put("idNo", crmCustomerTemp.getIDNumber());//纳税人识别号
|
|
|
|
filemap.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址
|
|
|
|
} |
|
|
|
} |
|
|
|
filemap.put("invoiceType", dto.getOpenTickTypeValue());//开票类型
|
|
|
|
filemap.put("createOrgName", ""); |
|
|
|
remarks = "数量" + finBillVehicles.size() + "台，单台成交价： 元。"; |
|
|
|
filemap.put("remarks", remarks); |
|
|
|
filemap.put("busSid",busSalesOrder.getSid()); |
|
|
|
filemap.put("contractNo",busSalesOrder.getContractNo()); |
|
|
|
ResultBean<Map<String,Object>> mapResultBean = commonContractFeign.getModelMap(filemap); |
|
|
|
checkMap = mapResultBean.getData(); |
|
|
|
} |
|
|
|
try { |
|
|
|
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() |
|
|
|
|
dimengzhe
1 year ago