|
|
@ -2217,6 +2217,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp |
|
|
|
File xsddspFile = new File(docPdfComponent.getUploadTemplateUrl() + xsddspUrl); |
|
|
|
filesList.add(xsddspFile); |
|
|
|
//生成金融报价单
|
|
|
|
if ("002".equals(baseVehicleOut1.getTypeKey()) && "001".equals(baseVehicleOut1.getMaterialTypeKey())){ |
|
|
|
String ckSid = busDeliveredApplyDetailsFeign.fetchByVehSid(baseVehicleOut1.getVinSid()).getData(); |
|
|
|
if (StringUtils.isNotBlank(ckSid)) { |
|
|
|
String jrbjdUrl = createjrbjdPdfHB(ckSid, baseVehicleOut1.getVinSid()); |
|
|
@ -2225,6 +2226,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp |
|
|
|
filesList.add(jrbjdFile); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
String hbName = "销售出库单_金融报价单_销售订单审批" + ".pdf"; |
|
|
|
try { |
|
|
|
File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + dateStr + "/" + hbName); |
|
|
|