From 20bbbcc1d14536ddaa498ac84a6008828df8dc1c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 13 十二月 2023 20:23:11 +0800
Subject: [PATCH] 往plc写目标数时，优先往写入地址写，没有写入地址再往读取地址写
---
api/v1/task.go | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index f866127..5f348a8 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -228,11 +228,13 @@
return err
}
record := model.TaskStatusSync{
- WorkOrderId: procedure.WorkOrderID,
- ProcedureID: procedure.ProcedureID,
- DeviceId: procedure.DeviceID,
- IsProcessing: false,
- IsFinish: true,
+ WorkOrderId: procedure.WorkOrderID,
+ ProcedureID: procedure.ProcedureID,
+ DeviceId: procedure.DeviceID,
+ ProductProcedureID: procedure.ProductProcedureID,
+ IsProcessing: false,
+ IsFinish: true,
+ FinishedQuantity: procedure.FinishedQuantity,
}
return service.NewTaskService().SaveTaskStatusSync(db, &record)
})
@@ -309,8 +311,14 @@
processModelNumber = processModel.Number
}
+ fieldType := constvar.PlcStartAddressTypeTotalNumber
+ for _, pc := range plcConfig.Details { //濡傛灉鏈夊啓鍏ュ湴鍧�锛屼紭鍏堝線鍐欏叆鍦板潃鍐欏叆锛屾病鏈夌殑璇濆線璇诲彇鍦板潃鍐欏叆
+ if pc.FieldName == constvar.PlcStartAddressTypeTotalNumberWrite && pc.Channel == procedure.Channel {
+ fieldType = constvar.PlcStartAddressTypeTotalNumberWrite
+ }
+ }
plcConfig.CurrentTryTimes = 0
- err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, procedure.Channel, order.Amount.IntPart())
+ err = service.PlcWrite(plcConfig, fieldType, procedure.Channel, order.Amount.IntPart())
if err != nil {
ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆锛�")
return
@@ -326,16 +334,13 @@
if err != nil {
return err
}
- err = service.NewProgressService().Add(db, procedure, order)
- if err != nil {
- return err
- }
record := model.TaskStatusSync{
- WorkOrderId: procedure.WorkOrderID,
- ProcedureID: procedure.ProcedureID,
- DeviceId: procedure.DeviceID,
- IsProcessing: true,
- IsFinish: false,
+ WorkOrderId: procedure.WorkOrderID,
+ ProcedureID: procedure.ProcedureID,
+ DeviceId: procedure.DeviceID,
+ ProductProcedureID: procedure.ProductProcedureID,
+ IsProcessing: true,
+ IsFinish: false,
}
return service.NewTaskService().SaveTaskStatusSync(db, &record)
})
--
Gitblit v1.8.0