This commit is contained in:
richboo111
2023-05-06 12:04:08 +08:00
parent e37225a2ef
commit 27d6e63988

View File

@@ -101,10 +101,14 @@ func (p PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, s
return return
} }
content := "" content := ""
if store.PrinterFontSize == partner.PrinterFontSizeBig || store.PrinterFontSize == partner.PrinterFontSizeBig2 { if store.ID == 669063 {
content = p.getOrderContentBigV2(order, store.Tel1, storeDetail) content = p.getOrderContent(order, store.Tel1, storeDetail)
} else { } else {
content = p.getOrderContentV2(order, store.Tel1, storeDetail) if store.PrinterFontSize == partner.PrinterFontSizeBig || store.PrinterFontSize == partner.PrinterFontSizeBig2 {
content = p.getOrderContentBigV2(order, store.Tel1, storeDetail)
} else {
content = p.getOrderContentV2(order, store.Tel1, storeDetail)
}
} }
count := 0 count := 0
for { for {
@@ -326,6 +330,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
<LEFT>期望送达: %s</LEFT> <LEFT>期望送达: %s</LEFT>
<LEFT>客户姓名: %s</LEFT> <LEFT>客户姓名: %s</LEFT>
<LEFT>客户电话: %s</LEFT> <LEFT>客户电话: %s</LEFT>
<LEFT>店铺名称: %s</LEFT>
<LEFT><font# bolder=0 height=2 width=1>订单编号: %s</font#></LEFT><BR> <LEFT><font# bolder=0 height=2 width=1>订单编号: %s</font#></LEFT><BR>
<C><font# bolder=0 height=2 width=2>%s#%d</font#> <C><font# bolder=0 height=2 width=2>%s#%d</font#>
<QR>%s</QR></C> <QR>%s</QR></C>
@@ -334,7 +339,6 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
<font# bolder=0 height=1 width=1>--------------------------------</font#> <font# bolder=0 height=1 width=1>--------------------------------</font#>
<LEFT><font# bolder=0 height=1 width=1>客户备注:%s</font#></LEFT> <LEFT><font# bolder=0 height=1 width=1>客户备注:%s</font#></LEFT>
<font# bolder=0 height=1 width=1>--------------------------------</font#> <font# bolder=0 height=1 width=1>--------------------------------</font#>
<LEFT><font# bolder=0 height=1 width=1>商品列表</font#></LEFT>
商品名` + trenditapi.StrRepeat(" ", 2) + `数量` + trenditapi.StrRepeat(" ", 3) + `单价` + trenditapi.StrRepeat(" ", 5) + `小计 商品名` + trenditapi.StrRepeat(" ", 2) + `数量` + trenditapi.StrRepeat(" ", 3) + `单价` + trenditapi.StrRepeat(" ", 5) + `小计
` + trenditapi.StrRepeat("-", 32) + ` ` + trenditapi.StrRepeat("-", 32) + `
` `
@@ -343,6 +347,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
utils.Time2Str(expectedDeliveryTime), utils.Time2Str(expectedDeliveryTime),
order.ConsigneeName, order.ConsigneeName,
order.ConsigneeMobile, order.ConsigneeMobile,
order.StoreName,
order.VendorOrderID, order.VendorOrderID,
jxutils.GetVendorName(order.VendorID), jxutils.GetVendorName(order.VendorID),
order.OrderSeq, order.OrderSeq,
@@ -394,6 +399,7 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
<LEFT><font# bolder=0 height=2 width=1>期望送达: %s</font#></LEFT> <LEFT><font# bolder=0 height=2 width=1>期望送达: %s</font#></LEFT>
<LEFT><font# bolder=0 height=2 width=1>客户姓名: %s</font#></LEFT> <LEFT><font# bolder=0 height=2 width=1>客户姓名: %s</font#></LEFT>
<LEFT><font# bolder=0 height=2 width=1>客户电话: %s</font#></LEFT> <LEFT><font# bolder=0 height=2 width=1>客户电话: %s</font#></LEFT>
<LEFT><font# bolder=0 height=3 width=1>店铺名称: %s</font#></LEFT>
<LEFT><font# bolder=0 height=3 width=1>订单编号: %s</font#></LEFT><BR> <LEFT><font# bolder=0 height=3 width=1>订单编号: %s</font#></LEFT><BR>
<C><font# bolder=1 height=2 width=2>%s#%d</font#> <C><font# bolder=1 height=2 width=2>%s#%d</font#>
<QR>%s</QR></C> <QR>%s</QR></C>