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/task.go | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index afe8397..6729282 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -108,6 +108,9 @@
nowTs := time.Now().Unix()
flagMap := make(map[int32]struct{}, 0)
for _, task := range taskResponse.Tasks {
+ if task.Procedure.Status != model.ProcedureStatusWaitProcess {
+ continue
+ }
if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(conf.Conf.CurrentDeviceID, task.Channel) && task.Procedure.StartTime <= nowTs {
task.CanStarted = true
flagMap[task.Channel] = struct{}{}
@@ -225,11 +228,13 @@
return err
}
record := model.TaskStatusSync{
- WorkOrderId: procedure.WorkOrderID,
- ProcedureID: procedure.ProcedureID,
- DeviceId: procedure.DeviceID,
- IsProcessing: false,
- IsFinish: true,
+ WorkOrderId: procedure.WorkOrderID,
+ ProcedureID: procedure.ProcedureID,
+ DeviceId: procedure.DeviceID,
+ ProductProcedureID: procedure.ProductProcedureID,
+ IsProcessing: false,
+ IsFinish: true,
+ FinishedQuantity: procedure.FinishedQuantity,
}
return service.NewTaskService().SaveTaskStatusSync(db, &record)
})
@@ -323,16 +328,13 @@
if err != nil {
return err
}
- err = service.NewProgressService().Add(db, procedure, order)
- if err != nil {
- return err
- }
record := model.TaskStatusSync{
- WorkOrderId: procedure.WorkOrderID,
- ProcedureID: procedure.ProcedureID,
- DeviceId: procedure.DeviceID,
- IsProcessing: true,
- IsFinish: false,
+ WorkOrderId: procedure.WorkOrderID,
+ ProcedureID: procedure.ProcedureID,
+ DeviceId: procedure.DeviceID,
+ ProductProcedureID: procedure.ProductProcedureID,
+ IsProcessing: true,
+ IsFinish: false,
}
return service.NewTaskService().SaveTaskStatusSync(db, &record)
})
--
Gitblit v1.8.0