From 510da2930e2e639b3d490e6fddc15af64520f8eb Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 21 九月 2023 16:38:00 +0800
Subject: [PATCH] 工艺模型库字段精简
---
service/task.go | 5 +----
model/process_model.go | 27 ---------------------------
2 files changed, 1 insertions(+), 31 deletions(-)
diff --git a/model/process_model.go b/model/process_model.go
index 77cf9af..1828814 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -11,11 +11,8 @@
ProcessModel struct {
gorm.Model `json:"-"`
Number string `gorm:"index;column:number;type:varchar(255);not null;default '';comment:宸ヨ壓妯″瀷缂栧彿" json:"number"` //宸ヨ壓妯″瀷缂栧彿
- OrderId string `gorm:"column:order_id;type:varchar(255);not null;default '';comment:璁㈠崟id" json:"orderId"` //璁㈠崟id
Product string `gorm:"column:product;type:varchar(255);not null;default '';comment:浜у搧鍚嶇О" json:"product"` //浜у搧鍚嶇О
Procedure string `gorm:"column:procedure;type:varchar(255);not null;default '';comment:宸ュ簭" json:"procedure"` //宸ュ簭
- WorkOrder string `gorm:"column:work_order;type:varchar(255);not null;default '';comment:宸ュ崟" json:"workOrder"` //宸ュ崟
- Device string `gorm:"column:device;type:varchar(255);not null;default '';comment:璁惧" json:"device"` //璁惧
Params string `gorm:"type:text;comment:宸ヨ壓鍙傛暟閿�煎json涓�"`
ParamsMap map[string]interface{} `json:"paramsMap" gorm:"-"`
DeviceId string `json:"deviceId" gorm:"-"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
@@ -63,24 +60,12 @@
return slf
}
-func (slf *ProcessModelSearch) SetWorkOrder(workOrder string) *ProcessModelSearch {
- slf.WorkOrder = workOrder
- return slf
-}
-func (slf *ProcessModelSearch) SetOrderId(orderId string) *ProcessModelSearch {
- slf.OrderId = orderId
- return slf
-}
func (slf *ProcessModelSearch) SetProduct(product string) *ProcessModelSearch {
slf.Product = product
return slf
}
func (slf *ProcessModelSearch) SetProcedure(procedure string) *ProcessModelSearch {
slf.Procedure = procedure
- return slf
-}
-func (slf *ProcessModelSearch) SetDevice(device string) *ProcessModelSearch {
- slf.Device = device
return slf
}
@@ -91,24 +76,12 @@
db = db.Where("id = ?", slf.ID)
}
- if len(slf.WorkOrder) != 0 {
- db = db.Where("work_order = ?", slf.WorkOrder)
- }
-
- if len(slf.OrderId) != 0 {
- db = db.Where("order_id = ?", slf.OrderId)
- }
-
if len(slf.Product) != 0 {
db = db.Where("product = ?", slf.Product)
}
if len(slf.Procedure) != 0 {
db = db.Where("`procedure` = ?", slf.Procedure)
- }
-
- if len(slf.Device) != 0 {
- db = db.Where("device = ?", slf.Device)
}
if len(slf.Number) != 0 {
diff --git a/service/task.go b/service/task.go
index c07bbc8..2b2ef67 100644
--- a/service/task.go
+++ b/service/task.go
@@ -23,7 +23,7 @@
return &TaskService{}
}
-// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂村皬浜庣瓑浜庡綋鍓嶆椂闂达紝缁撴潫鏃堕棿澶т簬褰撳墠鏃堕棿
+// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂村皬浜庣瓑浜庡綋鍓嶆椂闂达紝缁撴潫鏃堕棿澶т簬褰撳墠鏃堕棿鐨勪换鍔�
func (slf TaskService) GetTask(page, pageSize int) (taskResp *response.TaskResponse, code int) {
var taskList []*response.TaskData
var count int64
@@ -146,9 +146,6 @@
func (slf TaskService) GetProcessParams(procedure *model.Procedures, order *model.Order) (processModel *model.ProcessModel, err error) {
data, err := model.NewProcessModelSearch().
- SetWorkOrder(procedure.WorkOrderID).
- SetDevice(procedure.ProceduresInfo.DeviceName).
- SetOrderId(procedure.OrderID).
SetProcedure(procedure.ProceduresInfo.ProcedureName).
SetProduct(order.ProductName).
SetOrder("id desc").First()
--
Gitblit v1.8.0