From 28addaa46cb97c20ad37e13eb10535de7b75e71c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 29 十一月 2023 19:29:43 +0800
Subject: [PATCH] 首次报工开始时间为工序开始时间
---
model/task_status_sync.go | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/model/task_status_sync.go b/model/task_status_sync.go
index 503af79..f9a6c14 100644
--- a/model/task_status_sync.go
+++ b/model/task_status_sync.go
@@ -10,11 +10,12 @@
// TaskStatusSync 浠诲姟鐘舵�佸悓姝�
TaskStatusSync struct {
gorm.Model
- WorkOrderId string `json:"workOrderId"` //宸ュ崟缂栧彿
- ProcedureID string `json:"procedureId"` // 宸ュ簭缂栧彿
- DeviceId string `json:"deviceId"` //璁惧缂栧彿
- IsProcessing bool //鏄惁澶勭悊涓�
- IsFinish bool //鏄惁瀹屾垚
+ WorkOrderId string `json:"workOrderId"` //宸ュ崟缂栧彿
+ ProductProcedureID string `gorm:"type:varchar(191);" json:"productProcedureID"` //浜у搧宸ュ簭id
+ ProcedureID string `json:"procedureId"` // 宸ュ簭缂栧彿
+ DeviceId string `json:"deviceId"` //璁惧缂栧彿
+ IsProcessing bool //鏄惁澶勭悊涓�
+ IsFinish bool //鏄惁瀹屾垚
}
TaskStatusSyncSearch struct {
@@ -58,6 +59,11 @@
return slf
}
+func (slf *TaskStatusSyncSearch) SetProductProcedureId(productProcedureId string) *TaskStatusSyncSearch {
+ slf.ProductProcedureID = productProcedureId
+ return slf
+}
+
func (slf *TaskStatusSyncSearch) SetIDs(ids []uint) *TaskStatusSyncSearch {
slf.IDs = ids
return slf
@@ -70,8 +76,12 @@
db = db.Where("id = ?", slf.ID)
}
+ if slf.ProductProcedureID != "" {
+ db = db.Where("product_procedure_id = ?", slf.ProductProcedureID)
+ }
+
if len(slf.IDs) != 0 {
- db = db.Where("id in ?", slf.IDs)
+ db = db.Where("id in (?)", slf.IDs)
}
if slf.Order != "" {
--
Gitblit v1.8.0