From 2f856eaa7e46c884f1cb7ad721919a086d7f34a3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 13 六月 2024 15:57:45 +0800
Subject: [PATCH] 出入库明细列表和报表增加多单位
---
docs/docs.go | 307 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 236 insertions(+), 71 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index a334db6..3556fb5 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -468,6 +468,58 @@
}
}
},
+ "/api-wms/v1/forms/downloadHistory": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃"
+ ],
+ "summary": "涓嬭浇鍑哄叆搴撴槑缁嗘姤琛�",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetInventoryHistory"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.MoveHistory"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/forms/downloadInventoryForms": {
"post": {
"produces": [
@@ -572,6 +624,58 @@
}
}
},
+ "/api-wms/v1/forms/downloadMonthStats": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃"
+ ],
+ "summary": "涓嬭浇鏈堝害缁熻搴撳瓨鎶ヨ〃",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetMonthStats"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.MonthStats"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/forms/getHistory": {
"post": {
"produces": [
@@ -580,8 +684,15 @@
"tags": [
"鎶ヨ〃"
],
- "summary": "鑾峰彇鍘嗗彶淇℃伅",
+ "summary": "鑾峰彇鍑哄叆搴撴槑缁�",
"parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
{
"description": "鏌ヨ鍙傛暟",
"name": "object",
@@ -606,7 +717,7 @@
"data": {
"type": "array",
"items": {
- "$ref": "#/definitions/response.InventoryHistory"
+ "$ref": "#/definitions/models.MoveHistory"
}
}
}
@@ -3940,6 +4051,84 @@
}
}
},
+ "models.MoveHistory": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "鏁伴噺",
+ "type": "number"
+ },
+ "baseOperationType": {
+ "description": "鍩虹浣滀笟绫诲瀷",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.BaseOperationType"
+ }
+ ]
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "fromLocation": {
+ "description": "婧愪綅缃�",
+ "type": "string"
+ },
+ "fromLocationId": {
+ "description": "婧愪綅缃甶d",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "number": {
+ "description": "鍗曞彿",
+ "type": "string"
+ },
+ "operationId": {
+ "description": "鎿嶄綔id",
+ "type": "integer"
+ },
+ "operationTypeId": {
+ "description": "浣滀笟绫诲瀷id",
+ "type": "integer"
+ },
+ "operationTypeName": {
+ "description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
+ },
+ "operator": {
+ "description": "鎿嶄綔鑰�",
+ "type": "string"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "toLocation": {
+ "description": "鐩爣浣嶇疆",
+ "type": "string"
+ },
+ "toLocationId": {
+ "description": "鐩爣浣嶇疆id",
+ "type": "integer"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
+ },
+ "updateTime": {
+ "type": "string"
+ },
+ "weight": {
+ "description": "閲嶉噺",
+ "type": "number"
+ }
+ }
+ },
"models.Operation": {
"type": "object",
"properties": {
@@ -3960,6 +4149,12 @@
}
]
},
+ "checkedAt": {
+ "type": "string"
+ },
+ "checkedBy": {
+ "type": "string"
+ },
"comment": {
"type": "string"
},
@@ -3973,6 +4168,9 @@
"type": "integer"
},
"contacterName": {
+ "type": "string"
+ },
+ "createBy": {
"type": "string"
},
"createTime": {
@@ -4302,6 +4500,7 @@
"type": "number"
},
"floating": {
+ "description": "鏄惁娴姩鍒╃巼",
"type": "boolean"
},
"unit": {
@@ -5485,9 +5684,23 @@
"description": "鍦ㄥ簱鏁伴噺",
"type": "number"
},
+ "amountMoreUnits": {
+ "description": "鍦ㄥ簱鏁伴噺澶氬崟浣�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitItems"
+ }
+ },
"availableNumber": {
"description": "鍙敤搴撳瓨",
"type": "number"
+ },
+ "availableNumberMoreUnits": {
+ "description": "鍙敤搴撳瓨澶氬崟浣�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitItems"
+ }
},
"cost": {
"description": "鎴愭湰",
@@ -5497,9 +5710,23 @@
"description": "鍏ュ簱",
"type": "number"
},
+ "inMoreUnits": {
+ "description": "鍏ュ簱澶氬崟浣�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitItems"
+ }
+ },
"out": {
"description": "鍑哄簱",
"type": "number"
+ },
+ "outMoreUnits": {
+ "description": "鍑哄簱澶氬崟浣�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitItems"
+ }
},
"produceId": {
"description": "浜у搧id",
@@ -5523,75 +5750,6 @@
}
}
},
- "response.InventoryHistory": {
- "type": "object",
- "properties": {
- "amount": {
- "description": "鏁伴噺",
- "type": "number"
- },
- "baseOperationType": {
- "description": "鍩虹浣滀笟绫诲瀷",
- "allOf": [
- {
- "$ref": "#/definitions/constvar.BaseOperationType"
- }
- ]
- },
- "contactedName": {
- "description": "瀹屾垚鑰�",
- "type": "string"
- },
- "date": {
- "description": "鏃ユ湡",
- "type": "string"
- },
- "fromLocation": {
- "description": "婧愪綅缃�",
- "type": "string"
- },
- "fromLocationId": {
- "type": "integer"
- },
- "number": {
- "description": "鍗曞彿",
- "type": "string"
- },
- "operationId": {
- "type": "integer"
- },
- "operationTypeName": {
- "description": "浣滀笟绫诲瀷鍚嶇О",
- "type": "string"
- },
- "productId": {
- "type": "string"
- },
- "productName": {
- "description": "浜у搧鍚嶇О",
- "type": "string"
- },
- "status": {
- "description": "鐘舵��",
- "type": "string"
- },
- "toLocation": {
- "description": "鐩爣浣嶇疆",
- "type": "string"
- },
- "toLocationId": {
- "type": "integer"
- },
- "unit": {
- "description": "鍗曚綅",
- "type": "string"
- },
- "weight": {
- "description": "閲嶉噺",
- "type": "number"
- }
- }
- },
"response.LocationForms": {
"type": "object",
"properties": {
@@ -5599,6 +5757,13 @@
"description": "鏁伴噺",
"type": "number"
},
+ "amountMoreUnits": {
+ "description": "鍦ㄥ簱鏁伴噺澶氬崟浣�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitItems"
+ }
+ },
"locationId": {
"description": "浣嶇疆id",
"type": "integer"
--
Gitblit v1.8.0