From 752a77ffd9b83965f3309656265050e2e03e8f01 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 14 十一月 2023 14:39:22 +0800
Subject: [PATCH] 没有下发工艺参数的工序，生产中支持补充下发
---
service/task.go | 3 +
service/process_model.go | 17 +++++++-
model/process_model.go | 20 ++++++++++
api/v1/process_model.go | 50 ++++++++++++++----------
4 files changed, 67 insertions(+), 23 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index c15b609..5a8e8f6 100644
--- a/api/v1/process_model.go
+++ b/api/v1/process_model.go
@@ -24,47 +24,55 @@
if !ok {
return
}
+
procedure, code := service.NewTaskService().GetProcedureById(params.ProcedureId)
if code != ecode.OK {
ctx.Fail(code)
return
}
- var oldProcessModel *model.ProcessModel
- if procedure.ProcessModelNumber != "" {
- oldProcessModel, _ = service.GetProcessModelByNumber(procedure.ProcessModelNumber)
- }
-
- offset, limit, unShift := GetOffsetAndLimit(oldProcessModel, params.Page, params.PageSize)
- list, total, err := service.GetProcessModelList(offset, limit, procedure.ProcessModelNumber)
+ order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
if err != nil {
ctx.Fail(ecode.DBErr)
return
}
-
- if unShift && oldProcessModel != nil { //绮樺湪鍓嶉潰
- list = append([]*model.ProcessModel{oldProcessModel}, list...)
+ var oldProcessModel, newProcessModel, headProcessModel *model.ProcessModel
+ if procedure.ProcessModelNumber != "" {
+ oldProcessModel, _ = service.GetProcessModelByNumber(procedure.ProcessModelNumber) //鑾峰彇鏃х殑宸ヨ壓鍙傛暟
+ newProcessModel, _ = service.NewTaskService().GetProcessParams(procedure, order) //鑾峰彇鏂扮殑宸ヨ壓鍙傛暟
+ if newProcessModel != nil && (oldProcessModel == nil || newProcessModel.Number != oldProcessModel.Number) { //鏃х殑娌℃湁鎴栬�呯紪鍙蜂笉鍚岋紝鏇存柊
+ newProcessModel.NewNumber, newProcessModel.NewParamsMap = newProcessModel.Number, newProcessModel.ParamsMap
+ if oldProcessModel != nil {
+ newProcessModel.Number, newProcessModel.ParamsMap = oldProcessModel.Number, oldProcessModel.ParamsMap
+ } else { //鏃х殑娌℃湁锛屼篃鍙互"鏇存柊"(琛ュ厖)
+ newProcessModel.Number, newProcessModel.ParamsMap = "", nil
+ }
+ headProcessModel = newProcessModel
+ } else if oldProcessModel != nil {
+ headProcessModel = oldProcessModel
+ }
}
- for _, processModel := range list {
- if oldProcessModel != nil && processModel.Procedure == oldProcessModel.Procedure && processModel.Product == oldProcessModel.Product {
- processModel.IsUpdate = processModel.Number != procedure.ProcessModelNumber
- }
- if processModel.IsUpdate {
- processModel.NewNumber, processModel.NewParamsMap = processModel.Number, processModel.ParamsMap
- processModel.Number, processModel.ParamsMap = oldProcessModel.Number, oldProcessModel.ParamsMap
- }
+
+ offset, limit, unShift := GetOffsetAndLimit(headProcessModel, params.Page, params.PageSize)
+ list, total, err := service.GetOtherProcessModelList(offset, limit, order.ProductName, procedure.ProceduresInfo.ProcedureName) //鑾峰彇鍏朵粬宸ヨ壓鍙傛暟
+ if err != nil {
+ ctx.Fail(ecode.DBErr)
+ return
+ }
+ if unShift && headProcessModel != nil { //绮樺湪鍓嶉潰
+ list = append([]*model.ProcessModel{headProcessModel}, list...)
}
ctx.ResultList(list, total)
}
-func GetOffsetAndLimit(current *model.ProcessModel, page, pageSize int) (offset, limit int, unShift bool) {
+func GetOffsetAndLimit(head *model.ProcessModel, page, pageSize int) (offset, limit int, unShift bool) {
//isNew鏄鏇存柊鐨�
- unShift = current != nil && page == 1
+ unShift = head != nil && page == 1
limit = pageSize
if unShift {
limit-- //濡傛灉鏄柊鐨勶紝绗竴椤靛皯鏌ヤ竴涓�
}
offset = (page - 1) * pageSize
- if current != nil && offset > 0 { //濡傛灉鏄柊鐨勶紝绗簩椤靛紑濮嬪亸绉婚噺宸︾Щ涓�涓�
+ if head != nil && offset > 0 { //濡傛灉鏄柊鐨勶紝绗簩椤靛紑濮嬪亸绉婚噺宸︾Щ涓�涓�
offset--
}
diff --git a/model/process_model.go b/model/process_model.go
index 1614b26..aab6e62 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -33,6 +33,8 @@
Procedures []string
CurrentNumber string
Numbers []string
+ ProductNot string
+ ProcedureNot string
}
)
@@ -98,6 +100,16 @@
return slf
}
+func (slf *ProcessModelSearch) SetProductNot(product string) *ProcessModelSearch {
+ slf.ProductNot = product
+ return slf
+}
+
+func (slf *ProcessModelSearch) SetProcedureNot(procedure string) *ProcessModelSearch {
+ slf.ProcedureNot = procedure
+ return slf
+}
+
func (slf *ProcessModelSearch) SetProcedures(procedures []string) *ProcessModelSearch {
slf.Procedures = procedures
return slf
@@ -123,6 +135,14 @@
db = db.Where("`procedure` = ?", slf.Procedure)
}
+ if len(slf.ProductNot) != 0 {
+ db = db.Where("product <> ?", slf.ProductNot)
+ }
+
+ if len(slf.ProcedureNot) != 0 {
+ db = db.Where("`procedure` <> ?", slf.ProcedureNot)
+ }
+
if len(slf.Procedures) != 0 {
db = db.Where("`procedure` IN (?)", slf.Procedures)
}
diff --git a/service/process_model.go b/service/process_model.go
index 1922fce..df31dea 100644
--- a/service/process_model.go
+++ b/service/process_model.go
@@ -7,13 +7,26 @@
"errors"
)
-func GetProcessModelList(offset, limit int, currentNumber string) (list []*model.ProcessModel, total int64, err error) {
+func GetProcessModelList(offset, limit int, product, procedure string) (list []*model.ProcessModel, total int64, err error) {
device, err := model.NewDeviceSearch().SetDeviceId(conf.Conf.CurrentDeviceID).First()
if err != nil {
return
}
list, total, err = model.NewProcessModelSearch().
- SetIsNew(true).SetOrder("id desc").SetCurrentNumber(currentNumber).
+ SetIsNew(true).SetOrder("id desc").
+ SetProduct(product).SetProcedure(procedure).
+ SetPage(offset, limit).SetProcedures(device.ProceduresArr).Find()
+ return
+}
+
+func GetOtherProcessModelList(offset, limit int, product, procedure string) (list []*model.ProcessModel, total int64, err error) {
+ device, err := model.NewDeviceSearch().SetDeviceId(conf.Conf.CurrentDeviceID).First()
+ if err != nil {
+ return
+ }
+ list, total, err = model.NewProcessModelSearch().
+ SetIsNew(true).SetOrder("id desc").
+ SetProductNot(product).SetProcedureNot(procedure).
SetPage(offset, limit).SetProcedures(device.ProceduresArr).Find()
return
}
diff --git a/service/task.go b/service/task.go
index bebd3ff..a4e6931 100644
--- a/service/task.go
+++ b/service/task.go
@@ -173,6 +173,9 @@
logx.Errorf("TaskStart GetProcessModel err:%v", err)
return nil, err
}
+ if err == gorm.ErrRecordNotFound {
+ return nil, err
+ }
if err == nil {
return data, nil
}
--
Gitblit v1.8.0