From cab6eea89a0d82710369604ecb51f1cdb122e433 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 17:26:34 +0800
Subject: [PATCH] fix
---
model/procedures.go | 45 ++++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/model/procedures.go b/model/procedures.go
index c4229a3..4c93059 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -6,24 +6,23 @@
"apsClient/pkg/sqlitex"
"encoding/json"
"fmt"
- "gorm.io/gorm"
- "gorm.io/gorm/clause"
+ "github.com/jinzhu/gorm"
)
type (
Procedures struct {
- gorm.Model `json:"-"`
- 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"`
- Channel int32 `gorm:"index;comment:閫氶亾" json:"channel"` //閫氶亾
- StartTime int64 `gorm:"comment:璁″垝寮�濮嬫椂闂�" json:"startTime"`
- EndTime int64 `gorm:"comment:璁″垝缁撴潫鏃堕棿" json:"endTime"`
- Status ProcedureStatus
- ProcedureData string `json:"-"` //common.ProductProcedure json涓�
- ProceduresInfo common.ProductProcedure `json:"procedure" gorm:"-"` //common.ProductProcedure 瀵硅薄
+ gorm.Model
+ WorkOrderID string `gorm:"index;type:varchar(191);not null" json:"-"`
+ OrderID string `gorm:"index;type:varchar(191);not null" json:"-"`
+ DeviceID string `gorm:"index;type:varchar(191)" json:"deviceId"`
+ ProcedureID string `gorm:"index;type:varchar(191)" json:"procedureId"`
+ Channel int32 `gorm:"index;" json:"channel"` //閫氶亾
+ ProcessModelNumber string `gorm:"index;" json:"processModelNumber"` //宸ヨ壓妯″瀷缂栧彿
+ StartTime int64 `json:"startTime"`
+ EndTime int64 `json:"endTime"`
+ Status ProcedureStatus
+ ProcedureData string `json:"-"` //common.ProductProcedure json涓�
+ ProceduresInfo common.ProductProcedure `json:"procedure" gorm:"-"` //common.ProductProcedure 瀵硅薄
}
ProceduresSearch struct {
@@ -105,7 +104,7 @@
return slf
}
-func (slf *ProceduresSearch) SetId(id int) *ProceduresSearch {
+func (slf *ProceduresSearch) SetId(id uint) *ProceduresSearch {
slf.ID = id
return slf
}
@@ -137,11 +136,6 @@
func (slf *ProceduresSearch) SetChannels(channels []int32) *ProceduresSearch {
slf.Channels = channels
- return slf
-}
-
-func (slf *ProceduresSearch) SetChannel(channel int32) *ProceduresSearch {
- slf.Channel = channel
return slf
}
@@ -185,7 +179,7 @@
}
if len(slf.ProcedureIds) > 0 {
- db = db.Where("procedure_id in ?", slf.ProcedureIds)
+ db = db.Where("procedure_id IN (?)", slf.ProcedureIds)
}
if slf.ProcedureID != "" {
@@ -193,7 +187,7 @@
}
if len(slf.Channels) > 0 {
- db = db.Where("channel in ?", slf.Channels)
+ db = db.Where("channel IN (?)", slf.Channels)
}
return db
@@ -226,10 +220,11 @@
old, err := slf.First()
if err != gorm.ErrRecordNotFound && old.ID != 0 {
record.ID = old.ID
+ err = db.Save(&record).Error
+ } else {
+ err = db.Create(&record).Error
}
- if err := db.Clauses(clause.OnConflict{
- UpdateAll: true,
- }).Create(&record).Error; err != nil {
+ if err != nil {
return fmt.Errorf("save err: %v, record: %+v", err, record)
}
--
Gitblit v1.8.0