From 252ad9f55e8828bcacb8ddef28c8e9ff0a62f8d6 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 27 十一月 2023 15:41:39 +0800
Subject: [PATCH] 计算工时，生产条形码
---
service/report_work.go | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/service/report_work.go b/service/report_work.go
index cf8deb4..5e7c8a9 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"
)
@@ -40,6 +41,12 @@
if startTs == 0 {
return errors.New("娌℃湁鎵惧埌褰撳墠鍊肩彮浜哄憳寮�濮嬫椂闂�")
}
+ finishAmount := params.ReportAmount
+ lastReportWork, err := GetLastReportWork(params.ProcedureId)
+ if err == nil {
+ finishAmount = params.ReportAmount - lastReportWork.ReportAmount
+ startTs = lastReportWork.EndTime
+ }
record := &model.ReportWork{
ProceduresID: params.ProcedureId,
@@ -51,8 +58,11 @@
StartTime: startTs,
EndTime: nowTs,
ReportAmount: params.ReportAmount,
+ FinishAmount: finishAmount,
WorkerID: params.WorkerID,
WorkerName: workerName,
+ WorkerTime: nowTs - startTs,
+ BarCode: snowflake.GenerateId(),
}
err = model.NewReportWorkSearch(nil).Create(record)
--
Gitblit v1.8.0