From 541486c20ad74c2bcbb2e42137a116981b313787 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期一, 25 九月 2023 10:18:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
docs/docs.go | 322 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 286 insertions(+), 36 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 3bd0a03..20489c0 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -495,11 +495,8 @@
}
}
},
- "/api-wms/v1/operation/operation": {
- "get": {
- "consumes": [
- "application/json"
- ],
+ "/api-wms/v1/operation/list": {
+ "post": {
"produces": [
"application/json"
],
@@ -509,21 +506,13 @@
"summary": "鍏ュ簱/鍑哄簱鍒楄〃",
"parameters": [
{
- "type": "integer",
- "name": "operationTypeId",
- "in": "query"
- },
- {
- "type": "integer",
- "description": "椤电爜",
- "name": "page",
- "in": "query"
- },
- {
- "type": "integer",
- "description": "姣忛〉澶у皬",
- "name": "pageSize",
- "in": "query"
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.OperationList"
+ }
}
],
"responses": {
@@ -534,7 +523,39 @@
}
}
}
- },
+ }
+ },
+ "/api-wms/v1/operation/listAll": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍏ュ簱/鍑哄簱"
+ ],
+ "summary": "璋冩嫧",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.OperationAllList"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/operation/operation": {
"post": {
"produces": [
"application/json"
@@ -766,6 +787,36 @@
}
}
},
+ "/api-wms/v1/product/addDisuse": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "娣诲姞鎶ュ簾淇℃伅",
+ "parameters": [
+ {
+ "description": "鍏ュ簱/鍑哄簱淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddDisuse"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/product/addProduct": {
"post": {
"produces": [
@@ -866,6 +917,34 @@
"parameters": [
{
"type": "string",
+ "description": "id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/product/finishDisuse/{id}": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "楠岃瘉鎶ュ簾",
+ "parameters": [
+ {
+ "type": "integer",
"description": "id",
"name": "id",
"in": "path",
@@ -1052,6 +1131,36 @@
}
}
},
+ "/api-wms/v1/product/listDisuse": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "鎶ュ簾鍒楄〃",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.QueryDisuseList"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/product/listOperaton": {
"post": {
"produces": [
@@ -1092,6 +1201,36 @@
}
}
]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/product/updateDisuse": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "淇敼鎶ュ簾淇℃伅",
+ "parameters": [
+ {
+ "description": "鍏ュ簱/鍑哄簱淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateDisuse"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
}
}
}
@@ -1435,7 +1574,8 @@
4,
5,
6,
- 7
+ 7,
+ 8
],
"x-enum-comments": {
"LocationTypeCustomer": "瀹㈡埛浣嶇疆",
@@ -1453,7 +1593,8 @@
"LocationTypeCustomer",
"LocationTypeInventoryLoss",
"LocationTypeProduction",
- "LocationTypeTransit"
+ "LocationTypeTransit",
+ "LocationTypeDisuse"
]
},
"constvar.MaterialMode": {
@@ -1977,7 +2118,7 @@
"type": "object",
"properties": {
"amount": {
- "description": "鏁伴噺",
+ "description": "ProductName string ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` + "`" + ` //浜у搧鍚嶇О",
"type": "number"
},
"createTime": {
@@ -1990,15 +2131,16 @@
"description": "鎿嶄綔id",
"type": "integer"
},
+ "product": {
+ "description": "Unit string ` + "`" + `json:\"unit\" gorm:\"type:varchar(31);comment:鍗曚綅\"` + "`" + ` //鍗曚綅",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Material"
+ }
+ ]
+ },
"productId": {
"description": "浜у搧id",
- "type": "string"
- },
- "productName": {
- "description": "浜у搧鍚嶇О",
- "type": "string"
- },
- "unit": {
"type": "string"
},
"updateTime": {
@@ -2285,6 +2427,27 @@
}
}
},
+ "request.AddDisuse": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "ProductName string ` + "`" + `json:\"productName\"` + "`" + `",
+ "type": "number"
+ },
+ "fromLocationId": {
+ "type": "integer"
+ },
+ "productId": {
+ "type": "string"
+ },
+ "sourceNumber": {
+ "type": "string"
+ },
+ "toLocationId": {
+ "type": "integer"
+ }
+ }
+ },
"request.AddOperation": {
"type": "object",
"properties": {
@@ -2496,6 +2659,25 @@
}
}
},
+ "request.OperationAllList": {
+ "type": "object",
+ "properties": {
+ "number": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "sourceNumber": {
+ "type": "string"
+ }
+ }
+ },
"request.OperationDetails": {
"type": "object",
"properties": {
@@ -2504,18 +2686,52 @@
"type": "integer"
},
"amount": {
- "description": "鏁伴噺",
+ "description": "ProductName string ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` + "`" + ` //浜у搧鍚嶇О",
"type": "number"
},
"productId": {
"description": "浜у搧id",
"type": "string"
- },
- "productName": {
- "description": "浜у搧鍚嶇О",
+ }
+ }
+ },
+ "request.OperationList": {
+ "type": "object",
+ "properties": {
+ "number": {
"type": "string"
},
- "unit": {
+ "operationTypeId": {
+ "type": "integer"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "sourceNumber": {
+ "type": "string"
+ }
+ }
+ },
+ "request.QueryDisuseList": {
+ "type": "object",
+ "properties": {
+ "number": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "sourceNumber": {
"type": "string"
}
}
@@ -2572,6 +2788,40 @@
}
}
},
+ "request.UpdateDisuse": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "ProductName string ` + "`" + `json:\"productName\"` + "`" + `",
+ "type": "number"
+ },
+ "fromLocationId": {
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "number": {
+ "description": "Unit string ` + "`" + `json:\"unit\"` + "`" + `",
+ "type": "string"
+ },
+ "operationDate": {
+ "type": "string"
+ },
+ "productId": {
+ "type": "string"
+ },
+ "sourceNumber": {
+ "type": "string"
+ },
+ "status": {
+ "$ref": "#/definitions/constvar.OperationStatus"
+ },
+ "toLocationId": {
+ "type": "integer"
+ }
+ }
+ },
"request.UpdateOperation": {
"type": "object",
"properties": {
--
Gitblit v1.8.0