From efec800478214f3a412f879d2b51c2968515995d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 25 十一月 2023 17:04:25 +0800
Subject: [PATCH] plc断开连接时获取工序最后一次报工数量作为加工数
---
api/v1/task.go | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 60f6b8d..ec61f10 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -108,7 +108,7 @@
nowTs := time.Now().Unix()
flagMap := make(map[int32]struct{}, 0)
for _, task := range taskResponse.Tasks {
- if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(task.Channel) && task.Procedure.StartTime <= nowTs {
+ if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(conf.Conf.CurrentDeviceID, task.Channel) && task.Procedure.StartTime <= nowTs {
task.CanStarted = true
flagMap[task.Channel] = struct{}{}
}
@@ -153,14 +153,21 @@
var processModel *model.ProcessModel
if procedure.ProcessModelNumber != "" {
processModel, err = service.GetProcessModelByNumber(procedure.ProcessModelNumber)
- if err != nil || processModel == nil || processModel.ParamsMap == nil {
- ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
- return
- }
} else {
processModel, err = service.NewTaskService().GetProcessParams(procedure, order)
- if err != nil || processModel == nil || processModel.ParamsMap == nil {
+ }
+
+ if err != nil || processModel == nil || processModel.ParamsMap == nil {
+ device, err := service.GetCurrentDevice()
+ if err != nil {
+ ctx.FailWithMsg(ecode.UnknownErr, err.Error())
+ return
+ }
+ if device.NeedSetProcessParams {
ctx.FailWithMsg(ecode.ParamsErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟锛岃鍦ㄥ伐鑹烘ā鍨嬪簱涓笂浼狅紒")
+ return
+ } else {
+ ctx.OkWithDetailed(response.ProcessParamsResponse{})
return
}
}
@@ -233,8 +240,8 @@
return
}
- service.TaskFlagUnset(procedure.Channel)
- service.TaskEndTimeSet(procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
+ service.TaskFlagUnset(conf.Conf.CurrentDeviceID, procedure.Channel)
+ service.TaskEndTimeSet(conf.Conf.CurrentDeviceID, procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
ctx.Ok()
}
@@ -284,6 +291,7 @@
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 {
@@ -295,6 +303,7 @@
ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
return
}
+ processModelNumber = processModel.Number
}
plcConfig.CurrentTryTimes = 0
@@ -304,7 +313,7 @@
return
}
err = model.WithTransaction(func(db *gorm.DB) error {
- err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModel.Number)
+ err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel, processModelNumber)
if err != nil {
return err
}
@@ -331,9 +340,9 @@
return
}
- service.TaskFlagSet(procedure.Channel, int(procedure.ID))
- service.TaskStartTimeSet(procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯寮�濮嬫椂闂�
- service.TaskEndTimeSet(procedure.Channel, 0) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
+ service.TaskFlagSet(conf.Conf.CurrentDeviceID, procedure.Channel, int(procedure.ID))
+ service.TaskStartTimeSet(conf.Conf.CurrentDeviceID, procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯寮�濮嬫椂闂�
+ service.TaskEndTimeSet(conf.Conf.CurrentDeviceID, procedure.Channel, 0) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
ctx.Ok()
}
@@ -492,7 +501,7 @@
nowTs := time.Now().Unix()
flagMap := make(map[int32]struct{}, 0)
for _, task := range taskResponse.Tasks {
- if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(task.Channel) && task.Procedure.StartTime <= nowTs {
+ if _, ok := flagMap[task.Channel]; !ok && !service.TaskFlagGet(conf.Conf.CurrentDeviceID, task.Channel) && task.Procedure.StartTime <= nowTs {
task.CanStarted = true
flagMap[task.Channel] = struct{}{}
}
--
Gitblit v1.8.0