From 49e90e5de2e7166e74e26102dff9064b933fc5fd Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 05 九月 2023 16:00:27 +0800
Subject: [PATCH] 工序的生产进度存表
---
api/v1/task.go | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 1729bc7..cfd6ce1 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -35,7 +35,7 @@
return
}
var resp response.TaskCountdown
- workOrder, err := service.NewTaskService().GetCurrentTask()
+ workOrder, err := service.NewTaskService().GetNextTask()
if err == nil {
seconds := workOrder.StartTime - time.Now().Unix()
resp.CountDownHour = seconds / 3600
@@ -180,12 +180,13 @@
return
}
id := convertx.Atoi(idx)
- procedure, code := service.NewTaskService().GetProcedureById(id)
+ taskService := service.NewTaskService()
+ procedure, code := taskService.GetProcedureById(id)
if code != ecode.OK {
ctx.Fail(code)
return
}
- order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
+ order, err := taskService.GetOrderByWorkOrderId(procedure.WorkOrderID)
if err != nil {
ctx.Fail(ecode.UnknownErr)
return
@@ -196,22 +197,22 @@
return
}
- processModel, err := service.NewTaskService().GetProcessParams(procedure, order)
+ processModel, err := taskService.GetProcessParams(procedure, order)
if err != nil || processModel == nil || processModel.ParamsMap == nil {
- ctx.Fail(ecode.UnknownErr)
- return
+ //ctx.Fail(ecode.UnknownErr) //todo
+ //return
}
err = model.WithTransaction(func(db *gorm.DB) error {
- err = service.NewTaskService().UpdateProcedureStatus(db, id, model.ProcedureStatusProcessing)
+ err = taskService.UpdateProcedureStatus(db, id, model.ProcedureStatusProcessing)
if err != nil {
return err
}
- err = service.NewTaskService().UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
+ err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
if err != nil {
return err
}
- return nil
+ return service.NewProgressService().AddProgress(db, procedure, order)
})
if err != nil {
logx.Errorf("SendProcessParams update order and procedure status error:%v", err.Error())
--
Gitblit v1.8.0