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 | 6 ++++++
service/report_work.go | 3 +++
docs/swagger.yaml | 9 +++++++++
docs/docs.go | 12 ++++++++++++
docs/swagger.json | 12 ++++++++++++
5 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 40d5d3d..c172a0f 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1537,6 +1537,10 @@
"model.ReportWork": {
"type": "object",
"properties": {
+ "barCode": {
+ "description": "鏉″舰鐮�",
+ "type": "integer"
+ },
"channel": {
"description": "閫氶亾",
"type": "integer"
@@ -1554,6 +1558,10 @@
"type": "string"
},
"endTime": {
+ "type": "integer"
+ },
+ "finishAmount": {
+ "description": "鏈鎶ュ伐 - 涓婃鎶ュ伐",
"type": "integer"
},
"id": {
@@ -1586,6 +1594,10 @@
"workerName": {
"description": "鎶ュ伐浜哄鍚�",
"type": "string"
+ },
+ "workerTime": {
+ "description": "宸ユ椂锛屽崟浣嶇",
+ "type": "integer"
}
}
},
diff --git a/docs/swagger.json b/docs/swagger.json
index d6f421a..2f8c92f 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -1525,6 +1525,10 @@
"model.ReportWork": {
"type": "object",
"properties": {
+ "barCode": {
+ "description": "鏉″舰鐮�",
+ "type": "integer"
+ },
"channel": {
"description": "閫氶亾",
"type": "integer"
@@ -1542,6 +1546,10 @@
"type": "string"
},
"endTime": {
+ "type": "integer"
+ },
+ "finishAmount": {
+ "description": "鏈鎶ュ伐 - 涓婃鎶ュ伐",
"type": "integer"
},
"id": {
@@ -1574,6 +1582,10 @@
"workerName": {
"description": "鎶ュ伐浜哄鍚�",
"type": "string"
+ },
+ "workerTime": {
+ "description": "宸ユ椂锛屽崟浣嶇",
+ "type": "integer"
}
}
},
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index a375c00..052311a 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -446,6 +446,9 @@
type: object
model.ReportWork:
properties:
+ barCode:
+ description: 鏉″舰鐮�
+ type: integer
channel:
description: 閫氶亾
type: integer
@@ -458,6 +461,9 @@
deviceName:
type: string
endTime:
+ type: integer
+ finishAmount:
+ description: 鏈鎶ュ伐 - 涓婃鎶ュ伐
type: integer
id:
type: integer
@@ -481,6 +487,9 @@
workerName:
description: 鎶ュ伐浜哄鍚�
type: string
+ workerTime:
+ description: 宸ユ椂锛屽崟浣嶇
+ type: integer
type: object
problem.CheckResult:
properties:
diff --git a/model/report_work.go b/model/report_work.go
index 7ccff11..99ffc26 100644
--- a/model/report_work.go
+++ b/model/report_work.go
@@ -21,6 +21,8 @@
FinishAmount int `json:"finishAmount"` //鏈鎶ュ伐 - 涓婃鎶ュ伐
WorkerID string `json:"workerID"` //鎶ュ伐浜篿d
WorkerName string `json:"workerName"` //鎶ュ伐浜哄鍚�
+ WorkerTime int64 `json:"workerTime"` //宸ユ椂锛屽崟浣嶇
+ BarCode int64 `json:"barCode"` //鏉″舰鐮�
}
ReportWorkSearch struct {
@@ -139,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)
}
diff --git a/service/report_work.go b/service/report_work.go
index 2f7e668..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"
)
@@ -60,6 +61,8 @@
FinishAmount: finishAmount,
WorkerID: params.WorkerID,
WorkerName: workerName,
+ WorkerTime: nowTs - startTs,
+ BarCode: snowflake.GenerateId(),
}
err = model.NewReportWorkSearch(nil).Create(record)
--
Gitblit v1.8.0