From c2d8e537bb18c0892c0df6686ee5f5b5023f5bbb Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期一, 25 九月 2023 17:58:41 +0800
Subject: [PATCH] 1.修改业务类型列表接口，增加已就绪和已完成数量的统计
---
docs/docs.go | 537 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 416 insertions(+), 121 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 81492dd..7e7b11a 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"
@@ -654,22 +675,7 @@
"200": {
"description": "鎴愬姛",
"schema": {
- "allOf": [
- {
- "$ref": "#/definitions/util.ResponseList"
- },
- {
- "type": "object",
- "properties": {
- "data": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/models.OperationType"
- }
- }
- }
- }
- ]
+ "$ref": "#/definitions/util.ResponseList"
}
}
}
@@ -754,6 +760,36 @@
"name": "id",
"in": "path",
"required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/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": {
@@ -866,6 +902,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",
@@ -1047,6 +1111,111 @@
}
}
]
+ }
+ }
+ }
+ }
+ },
+ "/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": [
+ "application/json"
+ ],
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "浜у搧鍘嗗彶鍑哄叆搴撲俊鎭�",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.QueryOperationList"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Operation"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/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"
}
}
}
@@ -1390,7 +1559,8 @@
4,
5,
6,
- 7
+ 7,
+ 8
],
"x-enum-comments": {
"LocationTypeCustomer": "瀹㈡埛浣嶇疆",
@@ -1408,7 +1578,8 @@
"LocationTypeCustomer",
"LocationTypeInventoryLoss",
"LocationTypeProduction",
- "LocationTypeTransit"
+ "LocationTypeTransit",
+ "LocationTypeDisuse"
]
},
"constvar.MaterialMode": {
@@ -1608,6 +1779,10 @@
"isScrapLocation": {
"description": "鏄惁鎶ュ簾浣嶇疆",
"type": "boolean"
+ },
+ "jointName": {
+ "description": "鎷兼帴鍚嶇О",
+ "type": "string"
},
"name": {
"description": "浣嶇疆鍚嶇О",
@@ -1838,125 +2013,123 @@
}
}
},
- "models.OperationType": {
+ "models.Operation": {
"type": "object",
"properties": {
- "ReservationDaysBeforePriority": {
- "description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
+ "comment": {
+ "type": "string"
+ },
+ "companyID": {
"type": "integer"
},
- "baseOperationType": {
- "description": "鍩虹浣滀笟绫诲瀷",
- "allOf": [
- {
- "$ref": "#/definitions/constvar.BaseOperationType"
- }
- ]
+ "companyName": {
+ "type": "string"
},
- "company": {
- "description": "鍏徃",
- "allOf": [
- {
- "$ref": "#/definitions/models.Company"
- }
- ]
- },
- "companyId": {
- "description": "鍏徃id",
+ "contacterID": {
"type": "integer"
},
- "createBackorder": {
- "description": "鍒涘缓娆犲崟",
- "allOf": [
- {
- "$ref": "#/definitions/constvar.WhetherType"
- }
- ]
+ "contacterName": {
+ "type": "string"
},
"createTime": {
"type": "string"
},
- "defaultLocationDest": {
- "description": "榛樿鐩爣浣嶇疆",
+ "details": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.OperationDetails"
+ }
+ },
+ "fromLocation": {
+ "description": "婧愪綅缃�",
"allOf": [
{
"$ref": "#/definitions/models.Location"
}
]
},
- "defaultLocationDestId": {
- "description": "榛樿鐩爣浣嶇疆id",
+ "fromLocationId": {
+ "description": "婧愪綅缃甶d",
"type": "integer"
- },
- "defaultLocationSrc": {
- "description": "榛樿婧愪綅缃�",
- "allOf": [
- {
- "$ref": "#/definitions/models.Location"
- }
- ]
- },
- "defaultLocationSrcId": {
- "description": "榛樿婧愪綅缃甶d",
- "type": "integer"
- },
- "earlyOperations": {
- "description": "棰勫～鍐欎綔涓氳鎯�",
- "type": "boolean"
},
"id": {
"type": "integer"
},
- "name": {
- "description": "浠撳簱鍚嶇О",
+ "number": {
+ "description": "鍗曞彿",
"type": "string"
},
- "prefix": {
- "description": "鍓嶇紑",
+ "operationDate": {
"type": "string"
},
- "printLabel": {
- "description": "鏄惁鎵撳嵃鏍囩",
- "type": "boolean"
- },
- "reservationDaysBefore": {
- "description": "鏀惰揣鍓嶅嚑澶�",
+ "operationTypeId": {
+ "description": "浣滀笟绫诲瀷id",
"type": "integer"
},
- "reservationMethod": {
- "description": "淇濈暀鏂瑰紡",
+ "operationTypeName": {
+ "description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
+ },
+ "sourceNumber": {
+ "description": "婧愬崟鍙�",
+ "type": "string"
+ },
+ "status": {
+ "description": "鐘舵��",
"allOf": [
{
- "$ref": "#/definitions/constvar.ReservationMethod"
+ "$ref": "#/definitions/constvar.OperationStatus"
}
]
},
- "returnOperationType": {
- "description": "閫�璐х被鍨嬪悕绉�",
- "type": "string"
+ "toLocation": {
+ "description": "鐩爣浣嶇疆",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Location"
+ }
+ ]
},
- "returnOperationTypeID": {
- "description": "閫�璐х被鍨婭D",
+ "toLocationId": {
+ "description": "鐩爣浣嶇疆id",
"type": "integer"
- },
- "showOperations": {
- "description": "鏄剧ず浣滀笟璇︽儏",
- "type": "boolean"
},
"updateTime": {
"type": "string"
+ }
+ }
+ },
+ "models.OperationDetails": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "ProductName string ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` + "`" + ` //浜у搧鍚嶇О",
+ "type": "number"
},
- "warehouse": {
- "description": "浠撳簱",
+ "createTime": {
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "operationId": {
+ "description": "鎿嶄綔id",
+ "type": "integer"
+ },
+ "product": {
+ "description": "Unit string ` + "`" + `json:\"unit\" gorm:\"type:varchar(31);comment:鍗曚綅\"` + "`" + ` //鍗曚綅",
"allOf": [
{
- "$ref": "#/definitions/models.Warehouse"
+ "$ref": "#/definitions/models.Material"
}
]
},
- "warehouseId": {
- "description": "浠撳簱id",
- "type": "integer"
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
+ },
+ "updateTime": {
+ "type": "string"
}
}
},
@@ -2114,6 +2287,27 @@
"remark": {
"description": "澶囨敞",
"type": "string"
+ }
+ }
+ },
+ "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"
}
}
},
@@ -2328,6 +2522,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": {
@@ -2336,18 +2549,68 @@
"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"
+ }
+ }
+ },
+ "request.QueryOperationList": {
+ "type": "object",
+ "properties": {
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "productId": {
"type": "string"
}
}
@@ -2385,6 +2648,40 @@
"remark": {
"description": "澶囨敞",
"type": "string"
+ }
+ }
+ },
+ "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"
}
}
},
@@ -2576,8 +2873,6 @@
Description: "",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
- LeftDelim: "{{",
- RightDelim: "}}",
}
func init() {
--
Gitblit v1.8.0