From fd2ac9ffd57cbeec7790df125add1c144d8edabf Mon Sep 17 00:00:00 2001 From: richboo111 Date: Wed, 29 Mar 2023 15:00:58 +0800 Subject: [PATCH] 1 --- business/partner/printer/trendit/trendit.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/business/partner/printer/trendit/trendit.go b/business/partner/printer/trendit/trendit.go index 10751c635..75d8ac6da 100644 --- a/business/partner/printer/trendit/trendit.go +++ b/business/partner/printer/trendit/trendit.go @@ -36,16 +36,16 @@ func init() { func (p PrinterHandler) PrintMsg(ctx *jxcontext.Context, sn, copies, voice, msgContent string) (printerStatus *partner.PrinterStatus, err error) { if sn != "" { - if globals.EnableStoreWrite { - printOrderID, err1 := api.TrendITAPI.Print(sn, msgContent, voice) - if err1 == nil && printOrderID != "" { - printerStatus, err = p.GetPrinterStatus(ctx, sn, "") - } - } - } else { - printerStatus = &partner.PrinterStatus{ - PrintResult: partner.PrintResultNoPrinter, + //if globals.EnableStoreWrite { + printOrderID, err1 := api.TrendITAPI.Print(sn, msgContent, voice) + if err1 == nil && printOrderID != "" { + printerStatus, err = p.GetPrinterStatus(ctx, sn, "") } + // } + //} else { + // printerStatus = &partner.PrinterStatus{ + // PrintResult: partner.PrintResultNoPrinter, + // } } return printerStatus, err } @@ -57,7 +57,7 @@ func (p PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, sn, id2 string) } tempOnline := utils.Float64TwoInt(onlineStatus) tempWork := utils.Float64TwoInt(workStatus) - if tempOnline == trenditapi.OnlineStatus && tempWork == trenditapi.WorkStatusReady { + if tempOnline == trenditapi.OnlineStatus && (tempWork == trenditapi.WorkStatusReady || tempWork == trenditapi.WorkStatusPrinting) { printerStatus.PrinterStatus = partner.PrinterStatusOnlineOK } else if tempOnline == trenditapi.OfflineStatus { printerStatus.PrinterStatus = partner.PrinterStatusOffline