From 2f225f5b9ce679e641cdb73b74b41b500921ef02 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 25 十一月 2023 17:11:50 +0800
Subject: [PATCH] 未设置plc允许开始任务
---
api/v1/task.go | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index ec61f10..7ee8678 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -279,39 +279,37 @@
return
}
- plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK || plcConfig.ID == 0 {
- ctx.FailWithMsg(ecode.NeedConfirmedErr, "璇峰厛閰嶇疆PLC")
- return
- }
- plcConfig.MaxTryTimes = 2
-
- device, err := service.GetCurrentDevice()
- if err != nil {
- ctx.FailWithMsg(ecode.DBErr, err.Error())
- return
- }
var processModelNumber string
- if device.NeedSetProcessParams {
- processModel, err := taskService.GetProcessParams(procedure, order)
- if err != nil || processModel == nil || processModel.ParamsMap == nil {
- ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
+ plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
+ if code == ecode.OK && plcConfig.ID != 0 {
+ plcConfig.MaxTryTimes = 2
+ device, err := service.GetCurrentDevice()
+ if err != nil {
+ ctx.FailWithMsg(ecode.DBErr, err.Error())
return
}
- err = SendParams(processModel.ParamsMap, plcConfig)
+ if device.NeedSetProcessParams {
+ processModel, err := taskService.GetProcessParams(procedure, order)
+ if err != nil || processModel == nil || processModel.ParamsMap == nil {
+ ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
+ return
+ }
+ err = SendParams(processModel.ParamsMap, plcConfig)
+ if err != nil {
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
+ return
+ }
+ processModelNumber = processModel.Number
+ }
+
+ plcConfig.CurrentTryTimes = 0
+ err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, procedure.Channel, order.Amount.IntPart())
if err != nil {
ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
return
}
- processModelNumber = processModel.Number
}
- plcConfig.CurrentTryTimes = 0
- err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, procedure.Channel, order.Amount.IntPart())
- if err != nil {
- ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
- return
- }
err = model.WithTransaction(func(db *gorm.DB) error {
err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModelNumber)
if err != nil {
--
Gitblit v1.8.0