aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-28 18:09:56 +08:00
parent ec862a0667
commit f5c9476262
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -232,7 +232,7 @@ public class EmisCommonController extends BaseController
@RequestMapping("/getPrintDataByPrinter") @RequestMapping("/getPrintDataByPrinter")
public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response, String billCode, String billCodeRange, String lang, String printType) public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response, String billCode, String billCodeRange,String tplCode, String lang, String printType)
{ {
if(StringUtils.isEmpty(billCode)){ if(StringUtils.isEmpty(billCode)){
@ -242,7 +242,7 @@ public class EmisCommonController extends BaseController
if(!StringUtils.isEmpty(billCode)){ if(!StringUtils.isEmpty(billCode)){
try { try {
Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, tplCode,lang, printType);
JSONObject printItem = new JSONObject(); JSONObject printItem = new JSONObject();
printItem.put("billCode",billCode); printItem.put("billCode",billCode);

20
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -415,7 +415,7 @@ public class EmisWaybillController extends BaseController
} }
@RequestMapping("/realGetWaybillPrintData") @RequestMapping("/realGetWaybillPrintData")
public AjaxResult realGetWaybillPrintData(String billCode, String billCodeRange, String lang, String printType,String isNeedPdf) public AjaxResult realGetWaybillPrintData(String billCode, String billCodeRange, String lang,String tplCode, String printType,String isNeedPdf)
{ {
/* /*
, HttpServletRequest request, HttpServletResponse response , HttpServletRequest request, HttpServletResponse response
@ -439,7 +439,7 @@ public class EmisWaybillController extends BaseController
String[] billCodeArr = billCode.split(","); String[] billCodeArr = billCode.split(",");
for(String billCodeItem:billCodeArr) { for(String billCodeItem:billCodeArr) {
Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, tplCode,lang, printType);
JSONObject printItem = new JSONObject(); JSONObject printItem = new JSONObject();
printItem.put("billCode",billCodeItem); printItem.put("billCode",billCodeItem);
printItem.put("billDetail",Base64.getEncoder().encodeToString(JSONObject.toJSONString(order).getBytes(Charset.forName("UTF-8")))); printItem.put("billDetail",Base64.getEncoder().encodeToString(JSONObject.toJSONString(order).getBytes(Charset.forName("UTF-8"))));
@ -482,7 +482,7 @@ public class EmisWaybillController extends BaseController
} }
@RequestMapping("/realGetPrintList") @RequestMapping("/realGetPrintList")
public AjaxResult realGetPrintList(String billCode, String billCodeRange, String lang, String printType) public AjaxResult realGetPrintList(String billCode, String billCodeRange,String tplCode, String lang, String printType)
{ {
/* /*
, HttpServletRequest request, HttpServletResponse response , HttpServletRequest request, HttpServletResponse response
@ -502,7 +502,7 @@ public class EmisWaybillController extends BaseController
String[] billCodeArr = billCode.split(","); String[] billCodeArr = billCode.split(",");
for(String billCodeItem:billCodeArr) { for(String billCodeItem:billCodeArr) {
Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange,tplCode,lang, printType);
JSONObject printItem = new JSONObject(); JSONObject printItem = new JSONObject();
printItem.put("billCode",billCodeItem); printItem.put("billCode",billCodeItem);
if(order!=null) { if(order!=null) {
@ -564,7 +564,7 @@ public class EmisWaybillController extends BaseController
@RequestMapping("/realGetWaybillPdf") @RequestMapping("/realGetWaybillPdf")
public AjaxResult realGetWaybillPdf(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang, String printType,String isNeedPdf) public AjaxResult realGetWaybillPdf(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType,String isNeedPdf)
{ {
if(StringUtils.isEmpty(billCode)){ if(StringUtils.isEmpty(billCode)){
return AjaxResult.error("参数错误"); return AjaxResult.error("参数错误");
@ -576,7 +576,7 @@ public class EmisWaybillController extends BaseController
response.setHeader("Content-Disposition", "filename=" + billCode+".pdf"); response.setHeader("Content-Disposition", "filename=" + billCode+".pdf");
OutputStream os=response.getOutputStream(); OutputStream os=response.getOutputStream();
Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, tplCode,lang, printType);
if(order!=null) { if(order!=null) {
IXddTplPrint tplPrint = new TanexTplPrintImpl(); IXddTplPrint tplPrint = new TanexTplPrintImpl();
tplPrint.genPDF(order, os); tplPrint.genPDF(order, os);
@ -593,7 +593,7 @@ public class EmisWaybillController extends BaseController
} }
@RequestMapping("/realGetWaybillPng") @RequestMapping("/realGetWaybillPng")
public AjaxResult realGetWaybillPng(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang, String printType,String isNeedPdf) public AjaxResult realGetWaybillPng(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang,String tplCode, String printType,String isNeedPdf)
{ {
if(StringUtils.isEmpty(billCode)){ if(StringUtils.isEmpty(billCode)){
@ -606,7 +606,7 @@ public class EmisWaybillController extends BaseController
response.setHeader("Content-Disposition", "filename=" + billCode+".png"); response.setHeader("Content-Disposition", "filename=" + billCode+".png");
OutputStream os=response.getOutputStream(); OutputStream os=response.getOutputStream();
Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange,tplCode, lang, printType);
if(order!=null) { if(order!=null) {
IXddTplPrint tplPrint = new TanexTplPrintImpl(); IXddTplPrint tplPrint = new TanexTplPrintImpl();
tplPrint.genPNG(order, os); tplPrint.genPNG(order, os);
@ -651,7 +651,7 @@ public class EmisWaybillController extends BaseController
} }
@RequestMapping("/getPrintDataByPrinter") @RequestMapping("/getPrintDataByPrinter")
public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang, String printType) public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange,String tplCode, String lang, String printType)
{ {
if(StringUtils.isEmpty(billCode)){ if(StringUtils.isEmpty(billCode)){
@ -661,7 +661,7 @@ public class EmisWaybillController extends BaseController
if(!StringUtils.isEmpty(billCode)){ if(!StringUtils.isEmpty(billCode)){
try { try {
Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType); Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange,tplCode, lang, printType);
JSONObject printItem = new JSONObject(); JSONObject printItem = new JSONObject();
printItem.put("billCode",billCode); printItem.put("billCode",billCode);

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -375,7 +375,7 @@ public class EmisBaseService {
* @param printType * @param printType
* @return * @return
*/ */
public Map<String,Object> getWaybillPrintOrder(String billCode, String billCodeRange, String lang, String printType) { public Map<String,Object> getWaybillPrintOrder(String billCode, String billCodeRange, String tplCode,String lang, String printType) {
if (StringUtils.isEmpty(billCode)) { if (StringUtils.isEmpty(billCode)) {
return null; return null;
} }