From 0a5276032dcc8719bbaa9e37586e804380204147 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 02 十一月 2023 18:23:52 +0800
Subject: [PATCH] 工艺参数列表去掉process_number参数
---
api/v1/process_model.go | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index 8a03909..baa40f3 100644
--- a/api/v1/process_model.go
+++ b/api/v1/process_model.go
@@ -24,9 +24,15 @@
if !ok {
return
}
- oldProcessModel, _ := service.GetProcessModelByNumber(params.Number)
+ procedure, code := service.NewTaskService().GetProcedureById(params.ProcedureId)
+ if code != ecode.OK {
+ ctx.Fail(code)
+ return
+ }
+
+ oldProcessModel, _ := service.GetProcessModelByNumber(procedure.ProcessModelNumber)
offset, limit, push := GetOffsetAndLimit(oldProcessModel, params.Page, params.PageSize)
- list, total, err := service.GetProcessModelList(offset, limit, params.Number)
+ list, total, err := service.GetProcessModelList(offset, limit, procedure.ProcessModelNumber)
if err != nil {
ctx.Fail(ecode.DBErr)
return
@@ -37,7 +43,7 @@
}
for _, processModel := range list {
if processModel.Procedure == oldProcessModel.Procedure && processModel.Product == oldProcessModel.Product {
- processModel.IsUpdate = processModel.Number != params.Number
+ processModel.IsUpdate = processModel.Number != procedure.ProcessModelNumber
}
if processModel.IsUpdate {
processModel.NewNumber, processModel.NewParamsMap = processModel.Number, processModel.ParamsMap
--
Gitblit v1.8.0