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 0954ef8..df745af 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/util/PrinterUtils.java
@@ -113,7 +113,7 @@ public class PrinterUtils {
if(detail.getProductName().length()>8){
sb.append(""+detail.getProductName()+"
");
- sb.append(""+String.format("%15s",detail.getNumber()).replace(' ', paddingCharacter)+String.format("%10s",detail.getAmount()).replace(' ', paddingCharacter)+"
");
+ 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)+"
");
@@ -197,18 +197,18 @@ public class PrinterUtils {
char paddingCharacter = ' ';
- sb.append(" "+String.format("%-10s","品名").replace(' ', paddingCharacter)+String.format("%-4s","数量").replace(' ', paddingCharacter)+String.format("%4s","小计").replace(' ', paddingCharacter)+"
");
+ sb.append(" "+String.format("%-18s","品名").replace(' ', paddingCharacter)+String.format("%-4s","数量").replace(' ', paddingCharacter)+"
");
for (ProductInfo productInfo : handoverInfo.getProductInfos()) {
- if(productInfo.getProductName().length()>8){
+ if(productInfo.getProductName().length()>=16){
sb.append(" "+productInfo.getProductName()+"
");
- sb.append(" "+String.format("%15s",productInfo.getNum()).replace(' ', paddingCharacter)+String.format("%10s",productInfo.getAmount()).replace(' ', paddingCharacter)+"
");
+ sb.append(" "+String.format("%22s",productInfo.getNum()).replace(' ', paddingCharacter)+"
");
}else {
- int tt=14-productInfo.getProductName().length();
- sb.append(" "+String.format("%-"+tt+"s",productInfo.getProductName()).replace(' ', paddingCharacter)+String.format("%-4s",productInfo.getNum()).replace(' ', paddingCharacter)+String.format("%6s",productInfo.getAmount()).replace(' ', paddingCharacter)+"
");
+ int tt=21-productInfo.getProductName().length();
+ sb.append(" "+String.format("%-"+tt+"s",productInfo.getProductName()).replace(' ', paddingCharacter)+String.format("%-4s",productInfo.getNum()).replace(' ', paddingCharacter)+"
");
}
sb.append("
");
}
@@ -247,10 +247,6 @@ public class PrinterUtils {
sb.append("
");
}
-
-
-
-
}