md
This commit is contained in:
parent
026d6c70d7
commit
4d9a5ce66c
@ -555,13 +555,10 @@ public class EmisWaybillController extends BaseController
|
|||||||
|
|
||||||
if(!StringUtils.isEmpty(billCode)){
|
if(!StringUtils.isEmpty(billCode)){
|
||||||
try {
|
try {
|
||||||
JSONArray jArr = new JSONArray();
|
|
||||||
String[] billCodeArr = billCode.split(",");
|
|
||||||
|
|
||||||
for(String billCodeItem:billCodeArr) {
|
|
||||||
Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType);
|
Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType);
|
||||||
JSONObject printItem = new JSONObject();
|
JSONObject printItem = new JSONObject();
|
||||||
printItem.put("billCode",billCodeItem);
|
printItem.put("billCode",billCode);
|
||||||
|
|
||||||
if(order!=null) {
|
if(order!=null) {
|
||||||
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"))));
|
||||||
@ -574,10 +571,9 @@ public class EmisWaybillController extends BaseController
|
|||||||
printItem.put("result","fail");
|
printItem.put("result","fail");
|
||||||
printItem.put("message","未获取到数据");
|
printItem.put("message","未获取到数据");
|
||||||
}
|
}
|
||||||
jArr.add(printItem);
|
|
||||||
}
|
|
||||||
|
|
||||||
return AjaxResult.success("获取成功",jArr);
|
|
||||||
|
return AjaxResult.success("获取成功",printItem);
|
||||||
}catch (Exception ex){
|
}catch (Exception ex){
|
||||||
ex.printStackTrace();
|
ex.printStackTrace();
|
||||||
return AjaxResult.error("获取失败");
|
return AjaxResult.error("获取失败");
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user