From 56307a744dc94f9b1eed3f7513a4be16a130e984 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 17 十月 2023 17:20:25 +0800
Subject: [PATCH] 定时同步任务状态
---
model/production_progress.go | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/model/production_progress.go b/model/production_progress.go
index 898b186..bbdeb98 100644
--- a/model/production_progress.go
+++ b/model/production_progress.go
@@ -3,20 +3,19 @@
import (
"apsClient/pkg/sqlitex"
"fmt"
- "gorm.io/gorm"
+ "github.com/jinzhu/gorm"
)
type (
ProductionProgress struct {
- gorm.Model `json:"-"`
- ID int `gorm:"primarykey"`
- WorkOrderID string `gorm:"index;type:varchar(191);not null;comment:宸ュ崟ID" json:"workOrderID"`
- OrderID string `gorm:"index;type:varchar(191);not null;comment:璁㈠崟ID" json:"orderID"`
- ProcedureID string `gorm:"type:varchar(191);comment:宸ュ簭ID" json:"procedureId"`
- DeviceID string `gorm:"type:varchar(191);not null;comment:璁惧ID" json:"deviceId"`
- FinishedQuantity int64 `gorm:"type:int;not null;comment:瀹屾垚鏁伴噺" json:"finishedQuantity"`
- Position int `gorm:"type:int;comment:宸ヤ綔浣嶇疆" json:"position"` //姣忎釜璁惧鍙兘鏈夊涓満浣嶅悓鏃剁敓浜э紝鐢╬osition琛ㄧず浣嶇疆
- TotalQuantity int64 `gorm:"type:int;not null;comment:鎬婚噺" json:"totalQuantity"`
+ gorm.Model
+ WorkOrderID string `gorm:"index;type:varchar(191);not null" json:"workOrderID"`
+ OrderID string `gorm:"index;type:varchar(191);not null" json:"orderID"`
+ ProcedureID string `gorm:"type:varchar(191)" json:"procedureId"`
+ DeviceID string `gorm:"type:varchar(191);not null" json:"deviceId"`
+ FinishedQuantity int64 `gorm:"type:int;not null" json:"finishedQuantity"`
+ Channel int32 `gorm:"type:int" json:"channel"` //閫氶亾
+ TotalQuantity int64 `gorm:"type:int;not null" json:"totalQuantity"`
}
ProductionProgressSearch struct {
@@ -69,13 +68,13 @@
return slf
}
-func (slf *ProductionProgressSearch) SetId(id int) *ProductionProgressSearch {
+func (slf *ProductionProgressSearch) SetId(id uint) *ProductionProgressSearch {
slf.ID = id
return slf
}
-func (slf *ProductionProgressSearch) SetPosition(position int) *ProductionProgressSearch {
- slf.Position = position
+func (slf *ProductionProgressSearch) SetChannel(channel int32) *ProductionProgressSearch {
+ slf.Channel = channel
return slf
}
@@ -106,8 +105,8 @@
db = db.Where("device_id = ?", slf.DeviceID)
}
- if slf.Position != 0 {
- db = db.Where("position = ?", slf.Position)
+ if slf.Channel != 0 {
+ db = db.Where("channel = ?", slf.Channel)
}
return db
--
Gitblit v1.8.0