This commit is contained in:
linfso 2024-05-14 11:38:10 +08:00
parent 026d6c70d7
commit 4d9a5ce66c

View File

@ -555,29 +555,25 @@ public class EmisWaybillController extends BaseController
if(!StringUtils.isEmpty(billCode)){
try {
JSONArray jArr = new JSONArray();
String[] billCodeArr = billCode.split(",");
for(String billCodeItem:billCodeArr) {
Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType);
JSONObject printItem = new JSONObject();
printItem.put("billCode",billCodeItem);
Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType);
JSONObject printItem = new JSONObject();
printItem.put("billCode",billCode);
if(order!=null) {
printItem.put("billDetail",Base64.getEncoder().encodeToString(JSONObject.toJSONString(order).getBytes(Charset.forName("UTF-8"))));
printItem.put("isEncrpt",false);
printItem.put("printCount",1);
printItem.put("printDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date()));
printItem.put("result","success");
printItem.put("message","success");
}else{
printItem.put("result","fail");
printItem.put("message","未获取到数据");
}
jArr.add(printItem);
if(order!=null) {
printItem.put("billDetail",Base64.getEncoder().encodeToString(JSONObject.toJSONString(order).getBytes(Charset.forName("UTF-8"))));
printItem.put("isEncrpt",false);
printItem.put("printCount",1);
printItem.put("printDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date()));
printItem.put("result","success");
printItem.put("message","success");
}else{
printItem.put("result","fail");
printItem.put("message","未获取到数据");
}
return AjaxResult.success("获取成功",jArr);
return AjaxResult.success("获取成功",printItem);
}catch (Exception ex){
ex.printStackTrace();
return AjaxResult.error("获取失败");