From e6c81b3916494ef51edc21774a27402d0f16c49c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 24 八月 2023 17:21:04 +0800
Subject: [PATCH] plc配置支持serial和modbusTCP两种方式
---
model/procedures.go | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/model/procedures.go b/model/procedures.go
index 4915825..a1fb11b 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -1,7 +1,7 @@
package model
import (
- "apsClient/model/request"
+ "apsClient/model/common"
"apsClient/pkg/logx"
"apsClient/pkg/sqlitex"
"encoding/json"
@@ -12,12 +12,14 @@
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:"-"`
- Status ProcedureStatus `json:"-"`
- ProcedureData string `json:"-"` //request.ProductProcedure json涓�
- ProceduresInfo request.ProductProcedure `json:"procedure" gorm:"-"` //request.ProductProcedure 瀵硅薄
+ 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:"-"`
+ 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 瀵硅薄
}
ProceduresSearch struct {
@@ -41,14 +43,15 @@
func (slf *Procedures) TableName() string {
return "procedures"
}
-func (slf *Procedures) AfterFind() {
- var proceduresInfo request.ProductProcedure
+func (slf *Procedures) AfterFind(db *gorm.DB) error {
+ var proceduresInfo common.ProductProcedure
err := json.Unmarshal([]byte(slf.ProcedureData), &proceduresInfo)
if err != nil {
logx.Errorf("AfterFind Unmarshal err: %v", err.Error())
- return
+ return err
}
slf.ProceduresInfo = proceduresInfo
+ return nil
}
func NewProceduresSearch(db *gorm.DB) *ProceduresSearch {
@@ -104,6 +107,10 @@
db = db.Order(slf.Order)
}
+ if slf.ID != 0 {
+ db = db.Where("id = ?", slf.ID)
+ }
+
if slf.WorkOrderID != "" {
db = db.Where("work_order_id = ?", slf.WorkOrderID)
}
--
Gitblit v1.8.0