diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java index f490e6e7e..4f69131b0 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java @@ -96,6 +96,9 @@ public class EmisWaybillController extends EmisBaseController @Autowired private IEmisWaybillChangeToService emisWaybillChangeToService; + @Autowired + private IEmisSettleSubBillService emisSettleSubBillService; + @Autowired RedissonService redissonService; @@ -368,14 +371,12 @@ public class EmisWaybillController extends EmisBaseController /** * 导出客户账单模版 * @param response - * @param orderSn */ @Log(title = "导出客户账单模版", businessType = BusinessType.EXPORT) @RequestMapping("/exportCustBillTpl") - public void exportCustBillTpl(HttpServletResponse response,String orderSn,String fileType) { - + public void exportCustBillTpl(HttpServletResponse response,String billCode,String fileType) { try{ - emisWaybillService.genWarehouseInTplFile(response,orderSn,fileType); + emisSettleSubBillService.genCustBillTplFile(response,billCode,"pdf","1"); } catch(EmisBizError ex){ ex.printStackTrace(); @@ -390,9 +391,8 @@ public class EmisWaybillController extends EmisBaseController @Log(title = "导出客户税金账单模版", businessType = BusinessType.EXPORT) @RequestMapping("/exportCustTaxBillTpl") public void exportCustTaxBillTpl(HttpServletResponse response,String billCode,String fileType) { - try{ - emisWaybillService.genWarehouseInTplFile(response,billCode,fileType); + emisSettleSubBillService.genCustBillTplFile(response,billCode,"pdf","2"); } catch(EmisBizError ex){ ex.printStackTrace();