From f420004100c89f78aeef20a23a09c40e920b7ccf Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 27 十一月 2023 17:22:13 +0800
Subject: [PATCH] fix
---
model/report_work.go | 12 +++---------
model/procedures.go | 6 +++---
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/model/procedures.go b/model/procedures.go
index d38401c..d30f5a9 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -12,9 +12,9 @@
type (
Procedures struct {
gorm.Model
- ProductProcedureID string `gorm:"index;type:varchar(191);not null" json:"productProcedureID"` //浜у搧宸ュ簭id
- WorkOrderID string `gorm:"index;type:varchar(191);not null" json:"-"`
- OrderID string `gorm:"index;type:varchar(191);not null" json:"-"`
+ ProductProcedureID string `gorm:"index;type:varchar(191);" json:"productProcedureID"` //浜у搧宸ュ簭id
+ WorkOrderID string `gorm:"index;type:varchar(191);" json:"-"`
+ OrderID string `gorm:"index;type:varchar(191);" 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"` //閫氶亾
diff --git a/model/report_work.go b/model/report_work.go
index 658ff65..4f8d8a6 100644
--- a/model/report_work.go
+++ b/model/report_work.go
@@ -9,13 +9,12 @@
type (
ReportWork struct {
gorm.Model
- ProceduresID uint `gorm:"index;type:varchar(191)" json:"proceduresId"` //procedures琛ㄧ殑id
- ProductProcedureID string `gorm:"index;type:varchar(191);not null" json:"productProcedureID"` //浜у搧宸ュ簭id
- WorkOrderID string `gorm:"index;type:varchar(191);not null" json:"workOrderId"`
+ ProceduresID uint `gorm:"index;type:varchar(191)" json:"proceduresId"` //procedures琛ㄧ殑id
+ ProductProcedureID string `gorm:"index;type:varchar(191);" json:"productProcedureID"` //浜у搧宸ュ簭id
+ WorkOrderID string `gorm:"index;type:varchar(191);" json:"workOrderId"`
DeviceID string `gorm:"index;type:varchar(191)" json:"deviceId"`
DeviceName string `gorm:"index;type:varchar(191)" json:"deviceName"`
ProcedureID string `gorm:"index;type:varchar(191)" json:"procedureId"`
- Channel int32 `gorm:"index;" json:"channel"` //閫氶亾
StartTime int64 `json:"startTime"`
EndTime int64 `json:"endTime"`
ReportAmount int `json:"reportAmount"` //鎶ュ伐鏁伴噺
@@ -103,11 +102,6 @@
func (slf *ReportWorkSearch) SetChannels(channels []int32) *ReportWorkSearch {
slf.Channels = channels
- return slf
-}
-
-func (slf *ReportWorkSearch) SetChannel(channel int32) *ReportWorkSearch {
- slf.Channel = channel
return slf
}
--
Gitblit v1.8.0