From 20bbbcc1d14536ddaa498ac84a6008828df8dc1c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 13 十二月 2023 20:23:11 +0800
Subject: [PATCH] 往plc写目标数时，优先往写入地址写，没有写入地址再往读取地址写
---
service/process_model.go | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/service/process_model.go b/service/process_model.go
index 1922fce..ead4ebf 100644
--- a/service/process_model.go
+++ b/service/process_model.go
@@ -7,13 +7,26 @@
"errors"
)
-func GetProcessModelList(offset, limit int, currentNumber string) (list []*model.ProcessModel, total int64, err error) {
+func GetProcessModelList(offset, limit int, product, procedure string) (list []*model.ProcessModel, total int64, err error) {
device, err := model.NewDeviceSearch().SetDeviceId(conf.Conf.CurrentDeviceID).First()
if err != nil {
return
}
list, total, err = model.NewProcessModelSearch().
- SetIsNew(true).SetOrder("id desc").SetCurrentNumber(currentNumber).
+ SetIsNew(true).SetOrder("id desc").
+ SetProduct(product).SetProcedure(procedure).
+ SetPage(offset, limit).SetProcedures(device.ProceduresArr).Find()
+ return
+}
+
+func GetOtherProcessModelList(offset, limit int, product, procedure string) (list []*model.ProcessModel, total int64, err error) {
+ device, err := model.NewDeviceSearch().SetDeviceId(conf.Conf.CurrentDeviceID).First()
+ if err != nil {
+ return
+ }
+ list, total, err = model.NewProcessModelSearch().
+ SetIsNew(true).SetOrder("id desc").
+ SetProductAndProcedureNot(product, procedure).
SetPage(offset, limit).SetProcedures(device.ProceduresArr).Find()
return
}
--
Gitblit v1.8.0