This commit is contained in:
linfso 2024-05-09 17:59:19 +08:00
parent cf30ce25d7
commit 127a8deb64

View File

@ -31,6 +31,7 @@ import com.xdadan.erp.emis.service.print.IXddTplPrint;
import com.xdadan.erp.emis.service.print.tanex.TanexTplPrintImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@ -382,8 +383,8 @@ public class EmisWaybillController extends BaseController
Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType);
if(order!=null) {
response.setCharacterEncoding("UTF-8");
response.setContentType("application/pdf");
response.setHeader("Content-Disposition", "filename=" + billCodeItem+".pdf");
response.setContentType(MediaType.IMAGE_PNG_VALUE);
response.setHeader("Content-Disposition", "filename=" + billCodeItem+".png");
OutputStream os=response.getOutputStream();
IXddTplPrint tplPrint = new TanexTplPrintImpl();
tplPrint.genPNG(order, os);