This commit is contained in:
linfso 2025-03-13 16:53:51 +08:00
parent 226dfe1ebf
commit cb89088c1d

View File

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