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("" + String.format("%-15s", "品名").replace(' ', paddingCharacter) + String.format("%-4s", "数量").replace(' ', paddingCharacter) + String.format("%4s", "小计").replace(' ', paddingCharacter) + "
");
for (OrderDetailPO.Detail detail : detailPO.getDetailList()) {
- if (detail.getProductName().length() > 8) {
- sb.append("" + detail.getProductName() + "
");
- sb.append("" + String.format("%16s", detail.getNumber()).replace(' ', paddingCharacter) + String.format("%10s", detail.getAmount()).replace(' ', paddingCharacter) + "
");
- } else {
- int tt = 16 - detail.getProductName().length();
- sb.append("" + String.format("%-" + tt + "s", detail.getProductName()).replace(' ', paddingCharacter) + String.format("%-4s", detail.getNumber()).replace(' ', paddingCharacter) + String.format("%6s", detail.getAmount()).replace(' ', paddingCharacter) + "
");
+ 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(""+String.format("%-"+length+"s",detail.getProductName()).replace(' ', paddingCharacter)+String.format("%-4s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%8s",detail.getAmount()).replace(' ', paddingCharacter)+"
");
+ }else {
+ int length=15+count-(detail.getProductName().length()-4);
+ sb.append(""+String.format("%-"+length+"s",detail.getProductName()).replace(' ', paddingCharacter)+String.format("%-4s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%8s",detail.getAmount()).replace(' ', paddingCharacter)+"
");
+ }
+
+ }else if(detail.getProductName().length()>10){
+
+ sb.append(""+detail.getProductName()+"
");
+ sb.append(""+String.format("%20s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%11s",detail.getAmount()).replace(' ', paddingCharacter)+"
");
+
+ }else {
+ sb.append(""+String.format("%-15s",detail.getProductName()).replace(' ', paddingCharacter)+String.format("%-4s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%8s",detail.getAmount()).replace(' ', paddingCharacter)+"
");
}
- if (detail.getSpec() != null && ObjectUtil.isNotEmpty(detail.getSpec())) {
- sb.append("规格:" + detail.getSpec() + "
");
+ if(detail.getSpec()!=null&& ObjectUtil.isNotEmpty(detail.getSpec())){
+ sb.append("规格:"+detail.getSpec()+"
");
}
- sb.append("
");
-
}
sb.append("------------------------
");
String t = "¥" + detailPO.getReceiptsAmount();