排队取号小票未打印BUG修复
This commit is contained in:
@@ -41,9 +41,10 @@ public abstract class PrinterHandler {
|
|||||||
|
|
||||||
protected void print(TbPrintMachine machine, boolean isReturn, TbOrderInfo orderInfo, List<TbOrderDetail> tbOrderDetailList, CallNumPrintDTO printDTO) {
|
protected void print(TbPrintMachine machine, boolean isReturn, TbOrderInfo orderInfo, List<TbOrderDetail> tbOrderDetailList, CallNumPrintDTO printDTO) {
|
||||||
String printMethod = machine.getPrintMethod();
|
String printMethod = machine.getPrintMethod();
|
||||||
if (StrUtil.isBlank(printMethod)) {
|
if (StrUtil.isBlank(printMethod) && StrUtil.isBlank(machine.getPrintType())) {
|
||||||
throw new MsgException("打印机配置为空");
|
throw new MsgException("打印机配置为空");
|
||||||
}
|
}
|
||||||
|
if(StrUtil.isNotBlank(printMethod)){
|
||||||
List<CategoryInfo> categoryInfos = JSONUtil.parseJSONStr2TList(StrUtil.emptyToDefault(machine.getCategoryList(), "[]"), CategoryInfo.class);
|
List<CategoryInfo> categoryInfos = JSONUtil.parseJSONStr2TList(StrUtil.emptyToDefault(machine.getCategoryList(), "[]"), CategoryInfo.class);
|
||||||
//仅打印后厨-一菜一品
|
//仅打印后厨-一菜一品
|
||||||
if ("one".equals(printMethod)) {
|
if ("one".equals(printMethod)) {
|
||||||
@@ -58,6 +59,7 @@ public abstract class PrinterHandler {
|
|||||||
} else {
|
} else {
|
||||||
log.warn("未知打印类型: {}", printMethod);
|
log.warn("未知打印类型: {}", printMethod);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (StrUtil.isBlank(machine.getPrintType())) {
|
if (StrUtil.isBlank(machine.getPrintType())) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -71,9 +73,6 @@ public abstract class PrinterHandler {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
callNumPrint(machine, printDTO);
|
callNumPrint(machine, printDTO);
|
||||||
if (StrUtil.isBlank(printMethod)) {
|
|
||||||
throw new MsgException("打印机配置为空");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user