From 283433e329dbd8de66f763caa7add995685b9d50 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 06 九月 2023 21:47:09 +0800
Subject: [PATCH] 生产看板下发多次任务后，数据库中相同工单的数据应不重复
---
model/procedures.go | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/model/procedures.go b/model/procedures.go
index 3ca628f..9cc75f2 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -16,6 +16,7 @@
WorkOrderID string `gorm:"index;type:varchar(191);not null;comment:宸ュ崟ID" json:"-"`
OrderID string `gorm:"index;type:varchar(191);not null;comment:璁㈠崟ID" json:"-"`
DeviceID string `gorm:"index;type:varchar(191);comment:璁惧ID" json:"deviceId"`
+ ProcedureID string `gorm:"index;type:varchar(191);comment:宸ュ簭ID" json:"procedureId"`
StartTime int64 `gorm:"comment:璁″垝寮�濮嬫椂闂�" json:"startTime"`
EndTime int64 `gorm:"comment:璁″垝缁撴潫鏃堕棿" json:"endTime"`
Status ProcedureStatus
@@ -32,6 +33,7 @@
Preload bool
StartTimeMax int64
StatusNot ProcedureStatus
+ ProcedureIds []string
}
)
@@ -93,6 +95,11 @@
return slf
}
+func (slf *ProceduresSearch) SetProcedureIds(procedureIds []string) *ProceduresSearch {
+ slf.ProcedureIds = procedureIds
+ return slf
+}
+
func (slf *ProceduresSearch) SetDeviceId(id string) *ProceduresSearch {
slf.DeviceID = id
return slf
@@ -148,6 +155,10 @@
db = db.Where("status <> ?", slf.StatusNot)
}
+ if len(slf.ProcedureIds) > 0 {
+ db = db.Where("procedure_id in ?", slf.ProcedureIds)
+ }
+
return db
}
--
Gitblit v1.8.0