From 129c98e044c4e6782849fe50dd465f8b1baf8ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com>
Date: Fri, 26 Jul 2024 13:46:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=B0=8F=E7=A5=A8=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/util/PrinterUtils.java     | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 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 9593203..8e93980 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
@@ -113,20 +113,30 @@ public class PrinterUtils {
         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() > 8) {
-                sb.append("<S>" + detail.getProductName() + "</S><BR>");
-                sb.append("<S>" + String.format("%16s", detail.getNumber()).replace(' ', paddingCharacter) + String.format("%10s", detail.getAmount()).replace(' ', paddingCharacter) + "</S><BR>");
-            } else {
-                int tt = 16 - detail.getProductName().length();
-                sb.append("<S>" + String.format("%-" + tt + "s", detail.getProductName()).replace(' ', paddingCharacter) + String.format("%-4s", detail.getNumber()).replace(' ', paddingCharacter) + String.format("%6s", detail.getAmount()).replace(' ', paddingCharacter) + "</S><BR>");
+            if(detail.getProductName().length()>4&&detail.getProductName().length()<=10){
+
+                int count=getProducrName(detail.getProductName());
+                if(count<=0){
+                    int length=15-(detail.getProductName().length()-4);
+                    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 {
+                    int length=15+count-(detail.getProductName().length()-4);
+                    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>");
             }
 
-            if (detail.getSpec() != null && ObjectUtil.isNotEmpty(detail.getSpec())) {
-                sb.append("<S>规格:" + detail.getSpec() + "</S><BR>");
+            if(detail.getSpec()!=null&& ObjectUtil.isNotEmpty(detail.getSpec())){
+                sb.append("<S>规格:"+detail.getSpec()+"</S><BR>");
             }
 
-            sb.append("<BR>");
-
         }
         sb.append("------------------------<BR>");
         String t = "￥" + detailPO.getReceiptsAmount();