Kyaw_Min_Khant/KBZ-POS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update BaseXPrint.java

Browse Source
This commit is contained in:
MooN 2026-02-09 22:41:57 +06:30
parent 7f9aa52e47
commit 522af3578c
1 changed files with 50 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
View File

@ -559,6 +559,7 @@ public abstract class BaseXPrint {
String MMK = "MMK"; String MMK = "MMK";
SettleData settleData = payDetail.getSettleDataObj(); SettleData settleData = payDetail.getSettleDataObj();
boolean isQrDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable(); boolean isQrDecimalEnabled = SystemParamsOperation.getInstance().isQrDecimalEnable();
boolean isWallet = "WALLET".equalsIgnoreCase(payDetail.getAccountType());
int totalCount = settleData.getSaleCount() + settleData.getWavePayCount() + settleData.getVoidSaleCount() + settleData.getCashAdvanceCount() + settleData.getRefundCount() + settleData.getPreAuthCompCount() + settleData.getPreAuthCompVoidCount() + settleData.getWaveRefundCount(); int totalCount = settleData.getSaleCount() + settleData.getWavePayCount() + settleData.getVoidSaleCount() + settleData.getCashAdvanceCount() + settleData.getRefundCount() + settleData.getPreAuthCompCount() + settleData.getPreAuthCompVoidCount() + settleData.getWaveRefundCount();
long totalAmount = (settleData.getCashAdvanceAmount() + settleData.getSaleAmount() + settleData.getWavePayAmount() + settleData.getPreAuthCompAmount()) - (settleData.getVoidSaleAmount() + settleData.getRefundAmount() + settleData.getPreAuthCompVoidAmount() + settleData.getWaveRefundAmount()); long totalAmount = (settleData.getCashAdvanceAmount() + settleData.getSaleAmount() + settleData.getWavePayAmount() + settleData.getPreAuthCompAmount()) - (settleData.getVoidSaleAmount() + settleData.getRefundAmount() + settleData.getPreAuthCompVoidAmount() + settleData.getWaveRefundAmount());
@ -583,33 +584,57 @@ public abstract class BaseXPrint {
printer.appendPrnStr("(COUNT)TRANS", "AMOUNT(MMK)", fontNormal, false); printer.appendPrnStr("(COUNT)TRANS", "AMOUNT(MMK)", fontNormal, false);
if (settleData.getSaleCount() > 0) if (!isWallet) {
printColumnString("SALES", settleData.getSaleCount(), settleData.getSaleAmount(), false); boolean isDecimalEnabled = SystemParamsOperation.getInstance().getDecimalEnable();
// printer.appendPrnStr("SALES "+ countStringFormat(settleData.getSaleCount())+MMK+" "+ PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getSaleAmount()), fontNormal, AlignEnum.LEFT,false); if (settleData.getSaleCount() > 0) {
if (settleData.getVoidSaleCount() > 0) printer.appendPrnStr("(" + settleData.getSaleCount() + ")" + "SALES",
printColumnString("VOID SALES", settleData.getVoidSaleCount(), settleData.getVoidSaleAmount(), true); PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getSaleAmount(), isDecimalEnabled),
if (settleData.getCashAdvanceCount() > 0) fontNormal, false);
printColumnString("CASH OUT", settleData.getCashAdvanceCount(), settleData.getCashAdvanceAmount(), false); }
if (settleData.getPreAuthCount() > 0) if (settleData.getVoidSaleCount() > 0) {
printColumnString("PRE AUTH", settleData.getPreAuthCount(), settleData.getPreAuthAmount(), false); printer.appendPrnStr("(" + settleData.getVoidSaleCount() + ")" + "VOID SALES",
if (settleData.getPreAuthVoidCount() > 0) "- " + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getVoidSaleAmount(), isDecimalEnabled),
printColumnString("VOID PREAUTH", settleData.getPreAuthVoidCount(), settleData.getPreAuthVoidAmount(), true); fontNormal, false);
if (settleData.getRefundCount() > 0) }
printColumnString("REFUND", settleData.getRefundCount(), settleData.getRefundAmount(), true); if (settleData.getCashAdvanceCount() > 0) {
if (settleData.getPreAuthCompCount() > 0) printer.appendPrnStr("(" + settleData.getCashAdvanceCount() + ")" + "CASH OUT",
printColumnString("PREAUTH COMP", settleData.getPreAuthCompCount(), settleData.getPreAuthCompAmount(), false); PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getCashAdvanceAmount(), isDecimalEnabled),
if (settleData.getPreAuthCompVoidCount() > 0) fontNormal, false);
printColumnString("VOID PREAUTH COMPLETE", settleData.getPreAuthCompVoidCount(), settleData.getPreAuthCompVoidAmount(), true); }
if (settleData.getWavePayCount() >= 0){ if (settleData.getPreAuthCount() > 0) {
// printColumnString("QR PAY", settleData.getWavePayCount(), settleData.getWavePayAmount(), false); printer.appendPrnStr("(" + settleData.getPreAuthCount() + ")" + "PRE AUTH",
// printer.appendPrnStr( "QR PAY " + countStringFormat(settleData.getWavePayCount()) + " " + "MMK" , PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getWavePayAmount(), isQrDecimalEnabled) , fontNormal, false); PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getPreAuthAmount(), isDecimalEnabled),
fontNormal, false);
}
if (settleData.getPreAuthVoidCount() > 0) {
printer.appendPrnStr("(" + settleData.getPreAuthVoidCount() + ")" + "VOID PREAUTH",
"- " + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getPreAuthVoidAmount(), isDecimalEnabled),
fontNormal, false);
}
if (settleData.getRefundCount() > 0) {
printer.appendPrnStr("(" + settleData.getRefundCount() + ")" + "REFUND",
"- " + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getRefundAmount(), isDecimalEnabled),
fontNormal, false);
}
if (settleData.getPreAuthCompCount() > 0) {
printer.appendPrnStr("(" + settleData.getPreAuthCompCount() + ")" + "PREAUTH COMP",
PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getPreAuthCompAmount(), isDecimalEnabled),
fontNormal, false);
}
if (settleData.getPreAuthCompVoidCount() > 0) {
printer.appendPrnStr("(" + settleData.getPreAuthCompVoidCount() + ")" + "VOID PREAUTH COMPLETE",
"- " + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getPreAuthCompVoidAmount(), isDecimalEnabled),
fontNormal, false);
}
}
if (isWallet) {
if (settleData.getWavePayCount() > 0){
printer.appendPrnStr( "(" + settleData.getWavePayCount() + ")" + "QR PAY" , PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getWavePayAmount(), isQrDecimalEnabled) , fontNormal, false); printer.appendPrnStr( "(" + settleData.getWavePayCount() + ")" + "QR PAY" , PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getWavePayAmount(), isQrDecimalEnabled) , fontNormal, false);
} }
if (settleData.getWaveRefundCount() >= 0) { if (settleData.getWaveRefundCount() > 0) {
// printColumnString("QR REFUND", settleData.getWaveRefundCount(), settleData.getWaveRefundAmount(), true);
// printer.appendPrnStr( "QR REFUND " + countStringFormat(settleData.getWaveRefundCount()) + " " + "MMK" , PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getWaveRefundAmount(), isQrDecimalEnabled) , fontNormal, false);
printer.appendPrnStr( "(" + settleData.getWaveRefundCount() + ")" + "QR REFUND", "- " + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getWaveRefundAmount(), isQrDecimalEnabled) , fontNormal, false); printer.appendPrnStr( "(" + settleData.getWaveRefundCount() + ")" + "QR REFUND", "- " + PrintUtils.getInstance().getSeparatorNumberFormat(settleData.getWaveRefundAmount(), isQrDecimalEnabled) , fontNormal, false);
} }
}
// dashBreak(); // dashBreak();
dotBreak(); dotBreak();
// printColumnString("TOTAL", totalCount, totalAmount, false); // printColumnString("TOTAL", totalCount, totalAmount, false);