From b6b889b3fcd1ecba07aa90f7ec82c6b7d5d5da3f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 29 十二月 2023 11:49:02 +0800
Subject: [PATCH] 同步加工数过滤掉加工数为0的记录
---
docs/swagger.yaml | 255 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 233 insertions(+), 22 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 68b35f7..ed8d041 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -57,6 +57,8 @@
type: string
procedureName:
type: string
+ productProcedureID:
+ type: string
startTime:
type: integer
workHours:
@@ -189,6 +191,138 @@
type: string
total:
type: integer
+ type: object
+ model.CommonStats:
+ properties:
+ name:
+ type: string
+ value:
+ type: string
+ type: object
+ model.Dashboard:
+ properties:
+ createdAt:
+ type: string
+ delayWorkOrderAmount:
+ description: 寤舵湡浜や粯宸ュ崟鏁�
+ type: integer
+ deletedAt:
+ type: string
+ deviceLoad:
+ description: 璁惧璐熻嵎瀵规瘮鍒嗘瀽
+ items:
+ $ref: '#/definitions/model.CommonStats'
+ type: array
+ deviceLoadData:
+ description: 璁惧璐熻嵎瀵规瘮鍒嗘瀽
+ type: string
+ deviceRunningAmount:
+ description: 寮�鏈哄彴鏁�
+ type: integer
+ externalDeviceRunningAmount:
+ description: 澶栧姞宸ュ彴鏁�
+ type: integer
+ id:
+ type: integer
+ inMaintenanceDeviceAmount:
+ description: 缁翠慨涓澶囨暟
+ type: integer
+ internalDeviceRunningAmount:
+ description: 鑷湁寮�鏈哄彴鏁�
+ type: integer
+ materialMissWorkOrderAmount:
+ description: 鐗╂枡涓嶈冻宸ュ崟鏁�
+ type: integer
+ materialRequirement:
+ description: 鐗╂枡闇�姹傜粺璁�
+ items:
+ $ref: '#/definitions/model.CommonStats'
+ type: array
+ materialRequirementData:
+ description: 鐗╂枡闇�姹傜粺璁�
+ type: string
+ orderFinishRate:
+ description: 璁㈠崟瀹屾垚姣旂巼
+ items:
+ $ref: '#/definitions/model.CommonStats'
+ type: array
+ orderFinishRateData:
+ description: 璁㈠崟瀹屾垚姣旂巼
+ type: string
+ outPlanProductionAmount:
+ description: 璁″垝澶栧姞宸ユ暟
+ type: integer
+ personnelProductivity:
+ description: 浜哄憳鐢熶骇鏁堢巼
+ items:
+ $ref: '#/definitions/model.CommonStats'
+ type: array
+ personnelProductivityData:
+ description: 浜哄憳鐢熶骇鏁堢巼
+ type: string
+ personnelSkillPercent:
+ description: 浜哄憳鎶�鑳藉崰姣�
+ items:
+ $ref: '#/definitions/model.CommonStats'
+ type: array
+ personnelSkillPercentData:
+ description: 浜哄憳鎶�鑳藉崰姣�
+ type: string
+ planOrderFinishRate:
+ description: 璁″垝杈炬垚鐜�
+ type: integer
+ planProductionAmount:
+ description: 璁″垝鍔犲伐鏁�
+ type: integer
+ realExternalProductionAmount:
+ description: 瀹為檯澶栧姞宸ユ暟
+ type: integer
+ realProductionAmount:
+ description: 瀹為檯鐢熶骇鏁�
+ type: integer
+ todayFinishAmount:
+ description: 杞﹂棿褰撴棩鍚堣鐢熶骇
+ type: integer
+ todayQualifiedRate:
+ description: 杞﹂棿褰撴棩姝ｅ搧鐜�
+ type: string
+ totalDeviceAmount:
+ description: 鎬昏澶囨暟
+ type: integer
+ totalProductionAmount:
+ description: 鎬讳骇閲�
+ type: integer
+ updatedAt:
+ type: string
+ version:
+ type: string
+ workOrderAmount:
+ description: 鐢熶骇宸ュ崟鏁�
+ type: integer
+ workOrderStats:
+ description: 宸ュ崟杩涘害缁熻
+ items:
+ $ref: '#/definitions/model.WorkOrderStats'
+ type: array
+ workOrderStatsData:
+ description: 宸ュ崟杩涘害缁熻
+ type: string
+ workerTypeStats:
+ description: 浜哄憳宸ョ鍒嗘瀽
+ items:
+ $ref: '#/definitions/model.CommonStats'
+ type: array
+ workerTypeStatsData:
+ description: 浜哄憳宸ョ鍒嗘瀽
+ type: string
+ workshopStats:
+ description: 杞﹂棿缁熻
+ items:
+ $ref: '#/definitions/model.WorkshopStats'
+ type: array
+ workshopStatsData:
+ description: 杞﹂棿缁熻
+ type: string
type: object
model.DevicePlc:
properties:
@@ -386,6 +520,8 @@
type: string
endTime:
type: integer
+ finishedQuantity:
+ type: integer
id:
type: integer
procedure:
@@ -396,6 +532,9 @@
type: string
processModelNumber:
description: 宸ヨ壓妯″瀷缂栧彿
+ type: string
+ productProcedureID:
+ description: 浜у搧宸ュ簭id
type: string
realEndTime:
type: integer
@@ -446,9 +585,9 @@
type: object
model.ReportWork:
properties:
- channel:
- description: 閫氶亾
- type: integer
+ barCode:
+ description: 鏉″舰鐮�
+ type: string
createdAt:
type: string
deletedAt:
@@ -459,12 +598,21 @@
type: string
endTime:
type: integer
+ finishAmount:
+ description: 鏈鎶ュ伐 - 涓婃鎶ュ伐
+ type: integer
id:
type: integer
procedureId:
type: string
proceduresId:
description: procedures琛ㄧ殑id
+ type: integer
+ productProcedureID:
+ description: 浜у搧宸ュ簭id
+ type: string
+ reportAmount:
+ description: 鎶ュ伐鏁伴噺
type: integer
startTime:
type: integer
@@ -478,6 +626,57 @@
workerName:
description: 鎶ュ伐浜哄鍚�
type: string
+ workerTime:
+ description: 宸ユ椂锛屽崟浣嶇
+ type: integer
+ type: object
+ model.WorkOrderStats:
+ properties:
+ amount:
+ description: 鐢熶骇鏁伴噺
+ type: integer
+ delayDays:
+ description: 寤舵湡澶╂暟
+ type: integer
+ finishProcedureNum:
+ description: 宸插畬鎴愬伐搴忔暟閲�
+ type: integer
+ number:
+ description: 缂栧彿
+ type: string
+ planTime:
+ description: 璁″垝鏃堕棿
+ type: string
+ procedureNum:
+ description: 宸ュ簭鏁伴噺
+ type: integer
+ processingProcedureNum:
+ description: 杩涜涓伐搴忔暟閲�
+ type: integer
+ product:
+ description: 浜у搧
+ type: string
+ scale:
+ description: 瑙勬牸
+ type: string
+ type: object
+ model.WorkshopStats:
+ properties:
+ defective:
+ description: 娆″搧鏁伴噺
+ type: integer
+ name:
+ description: 杞﹂棿鍚嶇О
+ type: string
+ percent:
+ description: 姝ｅ搧鐜�
+ type: integer
+ qualified:
+ description: 姝ｅ搧鏁伴噺
+ type: integer
+ total:
+ description: 鐢熶骇鎬绘暟
+ type: integer
type: object
problem.CheckResult:
properties:
@@ -511,6 +710,8 @@
properties:
channel:
type: integer
+ procedureId:
+ type: integer
type: object
request.QueryType:
enum:
@@ -537,20 +738,6 @@
- procedureId
- reportAmount
- workerID
- type: object
- request.ReportWorkList:
- properties:
- page:
- description: 椤电爜
- type: integer
- pageSize:
- description: 姣忛〉澶у皬
- type: integer
- procedureId:
- description: 宸ュ簭id
- type: integer
- required:
- - procedureId
type: object
request.SendProcessParams:
properties:
@@ -846,6 +1033,23 @@
summary: 鏇存柊plc閰嶇疆
tags:
- Config
+ /v1/dashboard/dashboard:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ $ref: '#/definitions/model.Dashboard'
+ type: object
+ summary: 椹鹃┒鑸�
+ tags:
+ - 椹鹃┒鑸�
/v1/device/config:
post:
parameters:
@@ -1048,12 +1252,19 @@
/v1/reportWork/list:
get:
parameters:
- - description: 鏌ヨ鍙傛暟
- in: body
- name: object
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ type: integer
+ - description: 宸ュ簭id
+ in: query
+ name: procedureId
required: true
- schema:
- $ref: '#/definitions/request.ReportWorkList'
+ type: integer
produces:
- application/json
responses:
--
Gitblit v1.8.0