From 28addaa46cb97c20ad37e13eb10535de7b75e71c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 29 十一月 2023 19:29:43 +0800
Subject: [PATCH] 首次报工开始时间为工序开始时间
---
api/v1/process_model.go | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index 597116f..447668c 100644
--- a/api/v1/process_model.go
+++ b/api/v1/process_model.go
@@ -42,13 +42,15 @@
}
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
+ 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
}
- newProcessModel.IsUpdate = true
headProcessModel = newProcessModel
} else if oldProcessModel != nil {
headProcessModel = oldProcessModel
--
Gitblit v1.8.0