- Store.EnableNetPrinter

This commit is contained in:
gazebo
2019-07-09 09:28:36 +08:00
parent 050da79527
commit 327e602f6f
2 changed files with 9 additions and 1 deletions

View File

@@ -47,7 +47,7 @@ func PrintOrderByOrder(ctx *jxcontext.Context, order *model.GoodsOrder) (printRe
PrintResult: partner.PrintResultNoPrinter, PrintResult: partner.PrintResultNoPrinter,
}, nil }, nil
} }
if true { //globals.EnableStoreWrite { if globals.EnableStoreWrite {
printResult, err = handler.PrintOrder(ctx, store, order) printResult, err = handler.PrintOrder(ctx, store, order)
} else { } else {
err = fmt.Errorf("当前环境不支持打印") err = fmt.Errorf("当前环境不支持打印")
@@ -83,6 +83,9 @@ func getNetPrinterStatus(ctx *jxcontext.Context, store *model.Store) (printResul
} }
func GetHandlerFromStore(store *model.Store) (printerHandler partner.IPrinterHandler, err error) { func GetHandlerFromStore(store *model.Store) (printerHandler partner.IPrinterHandler, err error) {
if store.IsPrinterDisabled() {
return nil, fmt.Errorf("门店%s没有启用网络打印机", store.Name)
}
if printerHandler = partner.GetPrinterPlatformFromVendorID(store.PrinterVendorID); printerHandler == nil { if printerHandler = partner.GetPrinterPlatformFromVendorID(store.PrinterVendorID); printerHandler == nil {
return nil, fmt.Errorf("门店%s没有配置网络打印机", store.Name) return nil, fmt.Errorf("门店%s没有配置网络打印机", store.Name)
} }

View File

@@ -146,6 +146,7 @@ type Store struct {
DeliveryType int8 `orm:"-" json:"deliveryType"` // 仅用于传值 DeliveryType int8 `orm:"-" json:"deliveryType"` // 仅用于传值
PrinterDisabled int8 `orm:"default(0)" json:"printerDisabled"` // 是否禁用网络打印机
PrinterVendorID int `orm:"column(printer_vendor_id);" json:"printerVendorID"` PrinterVendorID int `orm:"column(printer_vendor_id);" json:"printerVendorID"`
PrinterSN string `orm:"size(32);column(printer_sn);index" json:"printerSN"` PrinterSN string `orm:"size(32);column(printer_sn);index" json:"printerSN"`
PrinterKey string `orm:"size(32)" json:"printerKey"` PrinterKey string `orm:"size(32)" json:"printerKey"`
@@ -194,6 +195,10 @@ func (*Store) TableUnique() [][]string {
} }
} }
func (s *Store) IsPrinterDisabled() bool {
return s.PrinterDisabled != 0
}
type StoreSub struct { type StoreSub struct {
ModelIDCULD ModelIDCULD