From 752a77ffd9b83965f3309656265050e2e03e8f01 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 14 十一月 2023 14:39:22 +0800
Subject: [PATCH] 没有下发工艺参数的工序,生产中支持补充下发

---
 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..df31dea 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").
+		SetProductNot(product).SetProcedureNot(procedure).
 		SetPage(offset, limit).SetProcedures(device.ProceduresArr).Find()
 	return
 }

--
Gitblit v1.8.0