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

---
 model/process_model.go |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/model/process_model.go b/model/process_model.go
index 1614b26..aab6e62 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -33,6 +33,8 @@
 		Procedures    []string
 		CurrentNumber string
 		Numbers       []string
+		ProductNot    string
+		ProcedureNot  string
 	}
 )
 
@@ -98,6 +100,16 @@
 	return slf
 }
 
+func (slf *ProcessModelSearch) SetProductNot(product string) *ProcessModelSearch {
+	slf.ProductNot = product
+	return slf
+}
+
+func (slf *ProcessModelSearch) SetProcedureNot(procedure string) *ProcessModelSearch {
+	slf.ProcedureNot = procedure
+	return slf
+}
+
 func (slf *ProcessModelSearch) SetProcedures(procedures []string) *ProcessModelSearch {
 	slf.Procedures = procedures
 	return slf
@@ -123,6 +135,14 @@
 		db = db.Where("`procedure` = ?", slf.Procedure)
 	}
 
+	if len(slf.ProductNot) != 0 {
+		db = db.Where("product <> ?", slf.ProductNot)
+	}
+
+	if len(slf.ProcedureNot) != 0 {
+		db = db.Where("`procedure` <> ?", slf.ProcedureNot)
+	}
+
 	if len(slf.Procedures) != 0 {
 		db = db.Where("`procedure` IN (?)", slf.Procedures)
 	}

--
Gitblit v1.8.0