This commit is contained in:
linfso 2024-08-24 22:38:20 +08:00
parent e5c183dbd1
commit a41e5aab0e
2 changed files with 8 additions and 4 deletions

View File

@ -1268,22 +1268,26 @@ public class EmisWaybillController extends EmisBaseController
if(!StringUtils.isEmpty(item)) { if(!StringUtils.isEmpty(item)) {
Map<String, Object> order = emisBaseService.getWaybillPrintOrder(item, subBillCodeRange, tpCodeItem, "zh", tpCodeItem, printManCode); Map<String, Object> order = emisBaseService.getWaybillPrintOrder(item, subBillCodeRange, tpCodeItem, "zh", tpCodeItem, printManCode);
String cmd=CvtTplToCpcl.getPrintCmd(emisPrintTpl.getTplData(),order); if(order!=null) {
String cmd = CvtTplToCpcl.getPrintCmd(emisPrintTpl.getTplData(), order);
sbPrintCmd.append(cmd); sbPrintCmd.append(cmd);
} }
} }
} }
} }
} }
}
}else{ }else{
// 直接获取 // 直接获取
Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, subBillCodeRange, tpCodeItem, "zh", tpCodeItem, printManCode); Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, subBillCodeRange, tpCodeItem, "zh", tpCodeItem, printManCode);
String cmd=CvtTplToCpcl.getPrintCmd(emisPrintTpl.getTplData(),order); if(order!=null) {
String cmd = CvtTplToCpcl.getPrintCmd(emisPrintTpl.getTplData(), order);
sbPrintCmd.append(cmd); sbPrintCmd.append(cmd);
} }
} }
} }
}
log.error("打印指令==>{}",sbPrintCmd.toString()); log.error("打印指令==>{}",sbPrintCmd.toString());
String printBase64Data=Base64.getEncoder().encodeToString(sbPrintCmd.toString().getBytes("UTF-8")); String printBase64Data=Base64.getEncoder().encodeToString(sbPrintCmd.toString().getBytes("UTF-8"));