From 915253f87d4ef04d886bebb50135d75082ae0eee Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 15 九月 2023 13:37:22 +0800
Subject: [PATCH] 换一种方式检查plc连接
---
api/v1/task.go | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 0552884..bbb328d 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -187,7 +187,7 @@
// @Produce application/json
// @Param object body request.SendProcessParams true "鏌ヨ鍙傛暟"
// @Success 200 {object} contextx.Response{service.GetProcessModel} "鎴愬姛"
-// @Router /v1/task/sendProcessParams/{id} [post]
+// @Router /v1/task/sendProcessParams [post]
func (slf *TaskApi) TaskStart(c *gin.Context) {
var params request.SendProcessParams
ctx, ok := contextx.NewContext(c, ¶ms)
@@ -227,7 +227,7 @@
if err != nil {
return err
}
- return service.NewProgressService().AddProgress(db, procedure, order)
+ return service.NewProgressService().Upsert(db, procedure, order)
})
if err != nil {
logx.Errorf("SendProcessParams update order and procedure status error:%v", err.Error())
@@ -243,6 +243,18 @@
err = SendParams(processModel.ParamsMap, plcConfig)
if err != nil {
logx.Errorf("SendProcessParams: %v", err.Error())
+ err = model.WithTransaction(func(db *gorm.DB) error {
+ err = taskService.UpdateProcedureStatusAndPosition(db, params.ProcedureId, model.ProcedureStatusWaitProcess, params.Position)
+ if err != nil {
+ return err
+ }
+ procedure.Position = params.Position
+ err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusWaitProcess)
+ if err != nil {
+ return err
+ }
+ return nil
+ })
ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
return
}
--
Gitblit v1.8.0