From 4c8cbe7c20cc109e7797ef9e784a6a14716bf26b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Tue, 25 Jun 2024 14:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/util/PrinterUtils.java   | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
index 1b00095..7ab595a 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
@@ -89,6 +89,7 @@ public class PrinterUtils {
 
         sb.append("<C><B>"+detailPO.getMerchantName()+"</B></C><BR><BR>");
         sb.append("<C><BOLD>"+type+"【"+detailPO.getMasterId()+"】</BOLD></C><BR><BR>");
+        sb.append("<CB><BOLD>"+detailPO.getOutNumber()+"</BOLD></CB><BR><BR>");
         sb.append("<S><L>订单号: "+detailPO.getOrderNo()+" </L></S><BR>");
         sb.append("<S><L>交易时间: "+detailPO.getTradeDate()+" </L></S><BR>");
         sb.append("<S><L>收银员: "+detailPO.getOperator()+" </L></S><BR><BR><BR>");
@@ -96,7 +97,7 @@ public class PrinterUtils {
         char paddingCharacter = ' ';
         sb.append("<S>"+String.format("%-15s","品名").replace(' ', paddingCharacter)+String.format("%-4s","数量").replace(' ', paddingCharacter)+String.format("%4s","小计").replace(' ', paddingCharacter)+"</S><BR>");
         for (OrderDetailPO.Detail detail : detailPO.getDetailList()) {
-            if(detail.getProductName().length()>4){
+            if(detail.getProductName().length()>4&&detail.getProductName().length()<=10){
 
                 int count=getProducrName(detail.getProductName());
                 if(count<=0){
@@ -107,6 +108,11 @@ public class PrinterUtils {
                     sb.append("<S>"+String.format("%-"+length+"s",detail.getProductName()).replace(' ', paddingCharacter)+String.format("%-4s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%8s",detail.getAmount()).replace(' ', paddingCharacter)+"</S><BR>");
                 }
 
+            }else if(detail.getProductName().length()>10){
+
+                sb.append("<S>"+detail.getProductName()+"</S><BR>");
+                sb.append("<S>"+String.format("%20s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%11s",detail.getAmount()).replace(' ', paddingCharacter)+"</S><BR>");
+
             }else {
                 sb.append("<S>"+String.format("%-15s",detail.getProductName()).replace(' ', paddingCharacter)+String.format("%-4s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%8s",detail.getAmount()).replace(' ', paddingCharacter)+"</S><BR>");
             }
@@ -131,9 +137,9 @@ public class PrinterUtils {
         sb.append("<S>余额:"+detailPO.getBalance()+"</S><BR>");
         sb.append("------------------------<BR>");
 
-//        if(Objects.nonNull(detailPO.getOutNumber())){
-//            sb.append("<QR>".concat(detailPO.getOutNumber()).concat("</QR><BR>"));
-//        }
+        if(Objects.nonNull(detailPO.getOutNumber())){
+            sb.append("<QR>".concat(detailPO.getOutNumber()).concat("</QR><BR>"));
+        }
 
         sb.append("<S>打印时间:"+DateUtils.getTime(new Date())+"</S><BR>");