From d440849e7acbd04b389dae5f3bbb0769dacb264e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 09 十月 2023 19:19:41 +0800
Subject: [PATCH] merge master
---
service/task.go | 2 +-
model/request/task.go | 2 +-
api/v1/task.go | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 2d66ffe..ce5b49d 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -388,7 +388,7 @@
}
plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK || plcConfig.Id == 0 {
+ if code != ecode.OK || plcConfig.ID == 0 {
ctx.FailWithMsg(ecode.NeedConfirmedErr, "璇峰厛閰嶇疆PLC")
return
}
diff --git a/model/request/task.go b/model/request/task.go
index 6be2efa..6198d95 100644
--- a/model/request/task.go
+++ b/model/request/task.go
@@ -18,7 +18,7 @@
}
type SendProcessParams struct {
- ProcedureId int `json:"procedureId" binding:"required"`
+ ProcedureId uint `json:"procedureId" binding:"required"`
}
type GetProductProgress struct {
diff --git a/service/task.go b/service/task.go
index 4ff5cb8..ed4c737 100644
--- a/service/task.go
+++ b/service/task.go
@@ -131,7 +131,7 @@
return procedure, ecode.OK
}
-func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id int, status model.ProcedureStatus, channel int32, processModelNumber string) error {
+func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id uint, status model.ProcedureStatus, channel int32, processModelNumber string) error {
if status == model.ProcedureStatusFinished || status == model.ProcedureStatusWaitProcess {
ProgressCacheUnset(channel)
}
--
Gitblit v1.8.0