From 252ad9f55e8828bcacb8ddef28c8e9ff0a62f8d6 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 27 十一月 2023 15:41:39 +0800
Subject: [PATCH] 计算工时，生产条形码
---
model/report_work.go | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/model/report_work.go b/model/report_work.go
index 4e6a70b..99ffc26 100644
--- a/model/report_work.go
+++ b/model/report_work.go
@@ -17,8 +17,12 @@
Channel int32 `gorm:"index;" json:"channel"` //閫氶亾
StartTime int64 `json:"startTime"`
EndTime int64 `json:"endTime"`
- WorkerID string `json:"workerID"` //鎶ュ伐浜篿d
- WorkerName string `json:"workerName"` //鎶ュ伐浜哄鍚�
+ ReportAmount int `json:"reportAmount"` //鎶ュ伐鏁伴噺
+ FinishAmount int `json:"finishAmount"` //鏈鎶ュ伐 - 涓婃鎶ュ伐
+ WorkerID string `json:"workerID"` //鎶ュ伐浜篿d
+ WorkerName string `json:"workerName"` //鎶ュ伐浜哄鍚�
+ WorkerTime int64 `json:"workerTime"` //宸ユ椂锛屽崟浣嶇
+ BarCode int64 `json:"barCode"` //鏉″舰鐮�
}
ReportWorkSearch struct {
@@ -137,6 +141,10 @@
db = db.Where("procedure_id = ?", slf.ProcedureID)
}
+ if slf.ProceduresID != 0 {
+ db = db.Where("procedures_id = ?", slf.ProceduresID)
+ }
+
if len(slf.Channels) > 0 {
db = db.Where("channel IN (?)", slf.Channels)
}
--
Gitblit v1.8.0