From 1c31947fd6902b570e3b9ac9eaab8ad9de58ee19 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 02 九月 2023 15:23:41 +0800
Subject: [PATCH] 获取任务逻辑调整，只获取本设备的工序，由工序反推订单
---
model/procedures.go | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/model/procedures.go b/model/procedures.go
index a1fb11b..b15cc0c 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -15,6 +15,7 @@
ID int `gorm:"primarykey"`
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"`
StartTime int64 `gorm:"comment:璁″垝寮�濮嬫椂闂�" json:"startTime"`
EndTime int64 `gorm:"comment:璁″垝缁撴潫鏃堕棿" json:"endTime"`
Status ProcedureStatus
@@ -30,14 +31,16 @@
Orm *gorm.DB
Preload bool
StartTimeMax int64
+ StatusNot ProcedureStatus
}
)
type ProcedureStatus int
const (
- ProcedureStatusUnFinished ProcedureStatus = 1
- ProcedureStatusFinished ProcedureStatus = 2
+ ProcedureStatusWaitProcess ProcedureStatus = 1
+ ProcedureStatusProcessing ProcedureStatus = 2
+ ProcedureStatusFinished ProcedureStatus = 3
)
func (slf *Procedures) TableName() string {
@@ -90,8 +93,18 @@
return slf
}
+func (slf *ProceduresSearch) SetDeviceId(id string) *ProceduresSearch {
+ slf.DeviceID = id
+ return slf
+}
+
func (slf *ProceduresSearch) SetStatus(status ProcedureStatus) *ProceduresSearch {
slf.Status = status
+ return slf
+}
+
+func (slf *ProceduresSearch) SetStatusNot(status ProcedureStatus) *ProceduresSearch {
+ slf.StatusNot = status
return slf
}
@@ -127,6 +140,10 @@
db = db.Where("status = ?", slf.Status)
}
+ if slf.StatusNot != 0 {
+ db = db.Where("status != ?", slf.StatusNot)
+ }
+
return db
}
--
Gitblit v1.8.0