From b6b889b3fcd1ecba07aa90f7ec82c6b7d5d5da3f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 29 十二月 2023 11:49:02 +0800
Subject: [PATCH] 同步加工数过滤掉加工数为0的记录
---
api/v1/task.go | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index f9741cb..57a39a4 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -234,6 +234,7 @@
ProductProcedureID: procedure.ProductProcedureID,
IsProcessing: false,
IsFinish: true,
+ FinishedQuantity: procedure.FinishedQuantity,
}
return service.NewTaskService().SaveTaskStatusSync(db, &record)
})
@@ -310,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
@@ -324,10 +331,6 @@
return err
}
err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
- if err != nil {
- return err
- }
- err = service.NewProgressService().Add(db, procedure, order)
if err != nil {
return err
}
@@ -427,7 +430,9 @@
logx.Errorf("miss param address, k:%v, v:%v", k, v)
continue
}
- err := service.PlcWriteDirect(plcConfig, address, v)
+ err := service.PlcWriteDirect(plcConfig, v, &model.DevicePlcAddress{
+ StartAddress: address,
+ })
if err != nil {
plcConfig.CurrentErr = err
failedNumbers++
--
Gitblit v1.8.0