From b555874608be2e4bb40cceba60b497c04caef842 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 12 九月 2023 14:17:51 +0800
Subject: [PATCH] 三菱协议更改
---
model/procedures.go | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/model/procedures.go b/model/procedures.go
index a1fb11b..6a4762e 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -15,6 +15,8 @@
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"`
+ 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
@@ -30,14 +32,17 @@
Orm *gorm.DB
Preload bool
StartTimeMax int64
+ StatusNot ProcedureStatus
+ ProcedureIds []string
}
)
type ProcedureStatus int
const (
- ProcedureStatusUnFinished ProcedureStatus = 1
- ProcedureStatusFinished ProcedureStatus = 2
+ ProcedureStatusWaitProcess ProcedureStatus = 1
+ ProcedureStatusProcessing ProcedureStatus = 2
+ ProcedureStatusFinished ProcedureStatus = 3
)
func (slf *Procedures) TableName() string {
@@ -80,6 +85,12 @@
slf.WorkOrderID = orderId
return slf
}
+
+func (slf *ProceduresSearch) SetProcedureId(id string) *ProceduresSearch {
+ slf.ProcedureID = id
+ return slf
+}
+
func (slf *ProceduresSearch) SetStartTimeMax(ts int64) *ProceduresSearch {
slf.StartTimeMax = ts
return slf
@@ -90,8 +101,23 @@
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
+}
+
func (slf *ProceduresSearch) SetStatus(status ProcedureStatus) *ProceduresSearch {
slf.Status = status
+ return slf
+}
+
+func (slf *ProceduresSearch) SetStatusNot(status ProcedureStatus) *ProceduresSearch {
+ slf.StatusNot = status
return slf
}
@@ -115,6 +141,10 @@
db = db.Where("work_order_id = ?", slf.WorkOrderID)
}
+ if slf.DeviceID != "" {
+ db = db.Where("device_id = ?", slf.DeviceID)
+ }
+
if slf.Preload {
db = db.Preload("InputMaterials").Preload("OutputMaterials")
}
@@ -125,6 +155,18 @@
if slf.Status != 0 {
db = db.Where("status = ?", slf.Status)
+ }
+
+ if slf.StatusNot != 0 {
+ db = db.Where("status <> ?", slf.StatusNot)
+ }
+
+ if len(slf.ProcedureIds) > 0 {
+ db = db.Where("procedure_id in ?", slf.ProcedureIds)
+ }
+
+ if slf.ProcedureID != "" {
+ db = db.Where("procedure_id = ?", slf.ProcedureID)
}
return db
@@ -152,10 +194,10 @@
return nil
}
-func (slf *ProceduresSearch) Save(record *Procedures) error {
+func (slf *ProceduresSearch) Updates(record *Procedures) error {
var db = slf.build()
- if err := db.Save(record).Error; err != nil {
+ if err := db.Updates(record).Error; err != nil {
return fmt.Errorf("save err: %v, record: %+v", err, record)
}
--
Gitblit v1.8.0