This commit is contained in:
suyl
2021-07-20 14:15:35 +08:00
parent 902a245674
commit 1facd77f78

View File

@@ -50,7 +50,7 @@ func AddPrinter(appID int, printers []*model.Printer) (err error) {
return fmt.Errorf("一次最多只能绑定50台") return fmt.Errorf("一次最多只能绑定50台")
} }
for _, v := range printers { for _, v := range printers {
if printers2, _ := dao.GetPrinters(db, appID, v.PrintNo); len(printers2) > 0 { if printers2, _ := dao.GetPrinters(db, appID, v.PrintNo, 0, 0); len(printers2) > 0 {
errs = append(errs, fmt.Errorf("此应用已经绑定了该打印机print_no : %v ", v.PrintNo)) errs = append(errs, fmt.Errorf("此应用已经绑定了该打印机print_no : %v ", v.PrintNo))
continue continue
} }
@@ -115,7 +115,7 @@ func DelPrinter(appID int, printNos []string) (err error) {
errs []error errs []error
) )
for _, v := range printNos { for _, v := range printNos {
if printers, _ := dao.GetPrinters(db, appID, v); len(printers) == 0 { if printers, _ := dao.GetPrinters(db, appID, v, 0, 0); len(printers) == 0 {
errs = append(errs, fmt.Errorf("该应用下未找到该打印机print_no : %v ", v)) errs = append(errs, fmt.Errorf("该应用下未找到该打印机print_no : %v ", v))
continue continue
} else { } else {
@@ -138,7 +138,7 @@ func UpdatePrinter(appID int, printNo string, name, sim, sound *string, volume *
fields []string fields []string
) )
//看有没有 //看有没有
if printers, _ := dao.GetPrinters(db, appID, printNo); len(printers) == 0 { if printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0); len(printers) == 0 {
return fmt.Errorf("该应用下未找到该打印机print_no : %v", printNo) return fmt.Errorf("该应用下未找到该打印机print_no : %v", printNo)
} else { } else {
if name != nil { if name != nil {
@@ -195,7 +195,7 @@ func DelPrinterSeq(appID int, printNo string) (err error) {
db = dao.GetDB() db = dao.GetDB()
) )
//看有没有 //看有没有
if printers, _ := dao.GetPrinters(db, appID, printNo); len(printers) == 0 { if printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0); len(printers) == 0 {
return fmt.Errorf("该应用下未找到该打印机print_no : %v", printNo) return fmt.Errorf("该应用下未找到该打印机print_no : %v", printNo)
} else { } else {
printMsgs, _ := dao.GetPrintMsgs(db, printNo, "", model.PrintMsgAll, model.PrintMsgSuccess) printMsgs, _ := dao.GetPrintMsgs(db, printNo, "", model.PrintMsgAll, model.PrintMsgSuccess)
@@ -214,7 +214,7 @@ func DoPrint(appID int, msgID, printNo, content string, orderNo int) (err error)
db = dao.GetDB() db = dao.GetDB()
) )
//打印机必须绑定在该应用下才能打印 //打印机必须绑定在该应用下才能打印
if printers, _ := dao.GetPrinters(db, appID, printNo); len(printers) == 0 { if printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0); len(printers) == 0 {
return fmt.Errorf("未在该应用下获取到此打印机print_no %v", printNo) return fmt.Errorf("未在该应用下获取到此打印机print_no %v", printNo)
} }
printMsg := &model.PrintMsg{ printMsg := &model.PrintMsg{
@@ -265,7 +265,7 @@ func GetPrinterStatus(appID int, printNo string) (status int, err error) {
db = dao.GetDB() db = dao.GetDB()
) )
//看有没有 //看有没有
if printers, _ := dao.GetPrinters(db, appID, printNo); len(printers) == 0 { if printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0); len(printers) == 0 {
return status, fmt.Errorf("该应用下未找到该打印机print_no : %v", printNo) return status, fmt.Errorf("该应用下未找到该打印机print_no : %v", printNo)
} else { } else {
server := "print.jxcs.net:8000" server := "print.jxcs.net:8000"