From e8b6ad0c160a39b024b0f2b996d603bdd9b22db9 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 28 九月 2023 17:44:07 +0800
Subject: [PATCH] 工艺参数列表增加是否可以更新字段
---
service/process_model.go | 2
model/process_model.go | 1
docs/swagger.yaml | 10 +++++
api/v1/process_model.go | 18 +++++++++
docs/docs.go | 14 +++++++
model/request/task.go | 2 +
docs/swagger.json | 14 +++++++
7 files changed, 60 insertions(+), 1 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index c20214b..06c1711 100644
--- a/api/v1/process_model.go
+++ b/api/v1/process_model.go
@@ -23,10 +23,28 @@
if !ok {
return
}
+ procedure, code := service.NewTaskService().GetProcedureById(params.ProcedureId)
+ if code != ecode.OK {
+ ctx.Fail(code)
+ return
+ }
+
+ order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
+ if err != nil {
+ ctx.Fail(ecode.DBErr)
+ return
+ }
+
list, total, err := service.GetProcessModelList(params.Page, params.PageSize)
if err != nil {
ctx.Fail(ecode.DBErr)
return
}
+ for _, processModel := range list {
+ if processModel.Procedure == procedure.ProceduresInfo.ProcedureName && processModel.Product == order.ProductName {
+ processModel.IsUpdate = processModel.Number != params.Number
+ }
+ }
+
ctx.ResultList(list, total)
}
diff --git a/docs/docs.go b/docs/docs.go
index afaae07..1ad485b 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -377,6 +377,13 @@
"summary": "鑾峰彇宸ヨ壓妯″瀷鍒楄〃",
"parameters": [
{
+ "type": "string",
+ "description": "褰撳墠姝ｅ湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�",
+ "name": "number",
+ "in": "query",
+ "required": true
+ },
+ {
"type": "integer",
"description": "椤电爜",
"name": "page",
@@ -387,6 +394,13 @@
"description": "姣忛〉澶у皬",
"name": "pageSize",
"in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "褰撳墠鐨勫伐搴廼d",
+ "name": "procedureId",
+ "in": "query",
+ "required": true
}
],
"responses": {
diff --git a/docs/swagger.json b/docs/swagger.json
index 2424d49..03ce549 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -365,6 +365,13 @@
"summary": "鑾峰彇宸ヨ壓妯″瀷鍒楄〃",
"parameters": [
{
+ "type": "string",
+ "description": "褰撳墠姝ｅ湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�",
+ "name": "number",
+ "in": "query",
+ "required": true
+ },
+ {
"type": "integer",
"description": "椤电爜",
"name": "page",
@@ -375,6 +382,13 @@
"description": "姣忛〉澶у皬",
"name": "pageSize",
"in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "褰撳墠鐨勫伐搴廼d",
+ "name": "procedureId",
+ "in": "query",
+ "required": true
}
],
"responses": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index e7a2ebb..b73d1c3 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -651,6 +651,11 @@
/v1/processModel/list:
get:
parameters:
+ - description: 褰撳墠姝ｅ湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�
+ in: query
+ name: number
+ required: true
+ type: string
- description: 椤电爜
in: query
name: page
@@ -659,6 +664,11 @@
in: query
name: pageSize
type: integer
+ - description: 褰撳墠鐨勫伐搴廼d
+ in: query
+ name: procedureId
+ required: true
+ type: integer
produces:
- application/json
responses:
diff --git a/model/process_model.go b/model/process_model.go
index 9729a0c..9ff8e4f 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -19,6 +19,7 @@
ParamsMap map[string]interface{} `json:"paramsMap" gorm:"-"`
DeviceId string `json:"deviceId" gorm:"-"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
IsNew bool `json:"isNew" gorm:"column:is_new;comment:鏄惁鏈�鏂扮殑"` //鏄惁鏈�鏂扮殑
+ IsUpdate bool `json:"isUpdate" gorm:"-"` //鍓嶇鐢�
}
ProcessModelSearch struct {
diff --git a/model/request/task.go b/model/request/task.go
index 272f1e1..b1054ea 100644
--- a/model/request/task.go
+++ b/model/request/task.go
@@ -30,4 +30,6 @@
// ProcessModelList 宸ヨ壓鍙傛暟鍒楄〃璇锋眰鍙傛暟
type ProcessModelList struct {
PageInfo
+ ProcedureId int `json:"procedureId" form:"procedureId" binding:"required"` //褰撳墠鐨勫伐搴廼d
+ Number string `json:"number" form:"number" binding:"required"` //褰撳墠姝ｅ湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�
}
diff --git a/service/process_model.go b/service/process_model.go
index de73152..c4ff7dd 100644
--- a/service/process_model.go
+++ b/service/process_model.go
@@ -11,7 +11,7 @@
return
}
list, total, err = model.NewProcessModelSearch().
- SetIsNew(true).
+ SetIsNew(true).SetOrder("id desc").
SetPage(page, pageSize).SetProcedures(device.ProceduresArr).Find()
return
}
--
Gitblit v1.8.0