From 66a85c70afb149986871febe17a4133b6995cd09 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 30 十一月 2023 19:58:02 +0800
Subject: [PATCH] dashboard接口和数据表
---
model/production_progress.go | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/model/production_progress.go b/model/production_progress.go
index 76fbd68..58bc036 100644
--- a/model/production_progress.go
+++ b/model/production_progress.go
@@ -13,7 +13,7 @@
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"`
- ProductProcedureID string `gorm:"type:varchar(191);not null" json:"productProcedureID"` //浜у搧宸ュ簭id
+ ProductProcedureID string `gorm:"type:varchar(191);" json:"productProcedureID"` //浜у搧宸ュ簭id
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"` //閫氶亾
@@ -76,6 +76,11 @@
return slf
}
+func (slf *ProductionProgressSearch) SetProductProcedureId(productProcedureId string) *ProductionProgressSearch {
+ slf.ProductProcedureID = productProcedureId
+ return slf
+}
+
func (slf *ProductionProgressSearch) SetId(id uint) *ProductionProgressSearch {
slf.ID = id
return slf
@@ -130,6 +135,10 @@
db = db.Where("finished_quantity < total_quantity")
}
+ if slf.ProductProcedureID != "" {
+ db = db.Where("product_procedure_id = ?", slf.ProductProcedureID)
+ }
+
return db
}
--
Gitblit v1.8.0