From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix
---
api/v1/process_model.go | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index 2c7a898..447668c 100644
--- a/api/v1/process_model.go
+++ b/api/v1/process_model.go
@@ -24,47 +24,58 @@
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
}
+ var oldProcessModel, newProcessModel, headProcessModel *model.ProcessModel
- if unShift && oldProcessModel != nil { //绮樺湪鍓嶉潰
- list = append([]*model.ProcessModel{oldProcessModel}, list...)
+ if procedure.ProcessModelNumber != "" {
+ oldProcessModel, _ = service.GetProcessModelByNumber(procedure.ProcessModelNumber) //鑾峰彇鏃х殑宸ヨ壓鍙傛暟
}
- for _, processModel := range list {
- if oldProcessModel != nil && processModel.Procedure == oldProcessModel.Procedure && processModel.Product == oldProcessModel.Product {
- processModel.IsUpdate = processModel.Number != procedure.ProcessModelNumber
+ newProcessModel, _ = service.NewTaskService().GetProcessParams(procedure, order) //鑾峰彇鏂扮殑宸ヨ壓鍙傛暟
+ if newProcessModel != nil && (oldProcessModel == nil || newProcessModel.Number != oldProcessModel.Number) { //鏃х殑娌℃湁鎴栬�呯紪鍙蜂笉鍚岋紝鏇存柊
+ if procedure.Status == model.ProcedureStatusProcessing {
+ 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
+ }
+ newProcessModel.IsUpdate = true
}
- if processModel.IsUpdate {
- processModel.NewNumber, processModel.NewParamsMap = processModel.Number, processModel.ParamsMap
- processModel.Number, processModel.ParamsMap = oldProcessModel.Number, oldProcessModel.ParamsMap
- }
+ headProcessModel = newProcessModel
+ } else if oldProcessModel != nil {
+ headProcessModel = oldProcessModel
+ }
+
+ 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) {
- //isNew鏄鏇存柊鐨�
- unShift = current != nil && current.IsNew && page == 1
+func GetOffsetAndLimit(head *model.ProcessModel, page, pageSize int) (offset, limit int, unShift bool) {
+ unShift = head != nil && page == 1
limit = pageSize
if unShift {
- limit-- //濡傛灉鏄柊鐨勶紝绗竴椤靛皯鏌ヤ竴涓�
+ limit-- //绗竴椤靛皯鏌ヤ竴涓�
}
offset = (page - 1) * pageSize
- if current != nil && current.IsNew && offset > 0 { //濡傛灉鏄柊鐨勶紝绗簩椤靛紑濮嬪亸绉婚噺宸︾Щ涓�涓�
+ if head != nil && offset > 0 { //绗簩椤靛紑濮嬪亸绉婚噺宸︾Щ涓�涓�
offset--
}
--
Gitblit v1.8.0