From dcf393c077af5638ea12c05dd6e1754fa535be20 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 27 十一月 2023 16:30:04 +0800
Subject: [PATCH] 排程任务下发增加productProcedureID，报工表和工序表增加productProcedureID
---
model/procedures.go | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/model/procedures.go b/model/procedures.go
index 7f8c8b9..d38401c 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -12,6 +12,7 @@
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:"-"`
DeviceID string `gorm:"index;type:varchar(191)" json:"deviceId"`
@@ -193,7 +194,7 @@
}
if slf.StartTimeMin != 0 {
- db = db.Where("start_time >= ?", slf.EndTimeMin)
+ db = db.Where("start_time >= ?", slf.StartTimeMin)
}
if slf.EndTimeMin != 0 {
@@ -201,7 +202,7 @@
}
if slf.EndTimeMax != 0 {
- db = db.Where("end_time < ?", slf.StartTimeMax)
+ db = db.Where("end_time < ?", slf.EndTimeMax)
}
if slf.Status != 0 {
--
Gitblit v1.8.0