From 45c681d18e7fecd4d34ca7f2197991d60bc92aa8 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 17 Apr 2026 11:00:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E9=98=9F=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/service/order/print/PrinterImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java index 33ec07a73..efcefa3ef 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java @@ -813,7 +813,7 @@ public interface PrinterImpl { PrintSignLabel signLabelInfo = getSignLabelInfo(); CallTable callTable = printDTO.getCallTable(); CallQueue callQueue = printDTO.getCallQueue(); - return getFormatLabel(shopName, signLabelInfo.center) + + String str = getFormatLabel(shopName, signLabelInfo.center) + signLabelInfo.br + signLabelInfo.br + getFormatLabel(StrUtil.format("{} {}", callTable.getName(), callQueue.getCallNum()), signLabelInfo.center, signLabelInfo.bold) + @@ -824,11 +824,14 @@ public interface PrinterImpl { signLabelInfo.br + getFormatLabel(printDTO.getCallUrl(), signLabelInfo.center, signLabelInfo.qr) + signLabelInfo.br + getDividingLine() + signLabelInfo.br + - getFormatLabel("描述：" + callTable.getNote(), signLabelInfo.s) + signLabelInfo.br + - getFormatLabel(StrUtil.format("过号顺延{}桌 {}桌后需重新排号", callTable.getPostponeNum(), callTable.getPostponeNum()), signLabelInfo.s) + signLabelInfo.br + - getFormatLabel(StrUtil.format("取号时间: {}", DateUtil.format(callQueue.getCreateTime(), "yyyy-MM-dd HH:mm:ss")), signLabelInfo.s) + + getFormatLabel("描述：" + callTable.getNote(), signLabelInfo.s) + signLabelInfo.br; + if (callTable.getIsPostpone() != null && callTable.getIsPostpone() == 1) { + str = str + getFormatLabel(StrUtil.format("过号顺延{}桌 {}桌后需重新排号", callTable.getPostponeNum(), callTable.getPostponeNum()), signLabelInfo.s) + signLabelInfo.br; + } + str = str + getFormatLabel(StrUtil.format("取号时间: {}", DateUtil.format(callQueue.getCreateTime(), "yyyy-MM-dd HH:mm:ss")), signLabelInfo.s) + signLabelInfo.br + signLabelInfo.getOut(150) + signLabelInfo.cut; + return str; }