fix: 物品打印模板客户移至左侧二维码下方
This commit is contained in:
@@ -248,7 +248,9 @@ object PrintHelper {
|
|||||||
textY = drawTextBlock(canvas, "", "位置:${item.containerBreadcrumb}", textX, textY, textMaxWidth, maxLines = 4, textSize = 25f, lineSpacingExtra = 4f)
|
textY = drawTextBlock(canvas, "", "位置:${item.containerBreadcrumb}", textX, textY, textMaxWidth, maxLines = 4, textSize = 25f, lineSpacingExtra = 4f)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (textY < maxTextY && !item.linkedCustomers.isNullOrEmpty()) {
|
canvas.drawLine(dividerX.toFloat(), padding.toFloat(), dividerX.toFloat(), maxTextY.toFloat(), sepPaint)
|
||||||
|
|
||||||
|
if (!item.linkedCustomers.isNullOrEmpty()) {
|
||||||
val customerNames = item.linkedCustomers
|
val customerNames = item.linkedCustomers
|
||||||
.mapNotNull { c ->
|
.mapNotNull { c ->
|
||||||
listOfNotNull(c.first_name, c.last_name)
|
listOfNotNull(c.first_name, c.last_name)
|
||||||
@@ -256,10 +258,13 @@ object PrintHelper {
|
|||||||
.ifBlank { null }
|
.ifBlank { null }
|
||||||
}
|
}
|
||||||
.joinToString(", ")
|
.joinToString(", ")
|
||||||
textY = drawTextBlock(canvas, "", "客户:$customerNames", textX, textY, textMaxWidth, maxLines = 2, textSize = 25f, lineSpacingExtra = 4f)
|
val customerText = "客户:$customerNames"
|
||||||
|
val customerY = qrY + qrSize + 4
|
||||||
|
val leftTextMaxWidth = (dividerX - padding * 2).toFloat()
|
||||||
|
if (customerY < maxTextY) {
|
||||||
|
drawTextBlock(canvas, "", customerText, padding.toFloat(), customerY.toFloat(), leftTextMaxWidth, maxLines = 2, textSize = 20f, lineSpacingExtra = 2f)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
canvas.drawLine(dividerX.toFloat(), padding.toFloat(), dividerX.toFloat(), maxTextY.toFloat(), sepPaint)
|
|
||||||
|
|
||||||
if (!item.serial_number.isNullOrBlank()) {
|
if (!item.serial_number.isNullOrBlank()) {
|
||||||
canvas.drawLine(padding.toFloat(), maxTextY.toFloat(), (widthDots - padding).toFloat(), maxTextY.toFloat(), sepPaint)
|
canvas.drawLine(padding.toFloat(), maxTextY.toFloat(), (widthDots - padding).toFloat(), maxTextY.toFloat(), sepPaint)
|
||||||
|
|||||||
Reference in New Issue
Block a user