From dcf393c077af5638ea12c05dd6e1754fa535be20 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 27 十一月 2023 16:30:04 +0800
Subject: [PATCH] 排程任务下发增加productProcedureID，报工表和工序表增加productProcedureID
---
service/report_work.go | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/service/report_work.go b/service/report_work.go
index 2f7e668..710b490 100644
--- a/service/report_work.go
+++ b/service/report_work.go
@@ -5,6 +5,7 @@
"apsClient/constvar"
"apsClient/model"
"apsClient/model/request"
+ "apsClient/pkg/snowflake"
"errors"
"time"
)
@@ -48,18 +49,21 @@
}
record := &model.ReportWork{
- ProceduresID: params.ProcedureId,
- WorkOrderID: procedure.WorkOrderID,
- DeviceID: procedure.DeviceID,
- DeviceName: procedure.ProceduresInfo.DeviceName,
- ProcedureID: procedure.ProcedureID,
- Channel: procedure.Channel,
- StartTime: startTs,
- EndTime: nowTs,
- ReportAmount: params.ReportAmount,
- FinishAmount: finishAmount,
- WorkerID: params.WorkerID,
- WorkerName: workerName,
+ ProceduresID: params.ProcedureId,
+ ProductProcedureID: procedure.ProductProcedureID,
+ WorkOrderID: procedure.WorkOrderID,
+ DeviceID: procedure.DeviceID,
+ DeviceName: procedure.ProceduresInfo.DeviceName,
+ ProcedureID: procedure.ProcedureID,
+ Channel: procedure.Channel,
+ StartTime: startTs,
+ EndTime: nowTs,
+ ReportAmount: params.ReportAmount,
+ FinishAmount: finishAmount,
+ WorkerID: params.WorkerID,
+ WorkerName: workerName,
+ WorkerTime: nowTs - startTs,
+ BarCode: snowflake.GenerateIdStr(),
}
err = model.NewReportWorkSearch(nil).Create(record)
--
Gitblit v1.8.0