From c278d736f5f9c0ab4a64540aa1a6b89984b0cd2c Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 19 十月 2023 15:52:37 +0800
Subject: [PATCH] 1.wms业务调整及bug修改
---
docs/swagger.json | 857 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 847 insertions(+), 10 deletions(-)
diff --git a/docs/swagger.json b/docs/swagger.json
index 1b041dd..b94892c 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -282,6 +282,141 @@
}
}
},
+ "/api-wms/v1/forms/getHistory": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃"
+ ],
+ "summary": "鑾峰彇鍘嗗彶淇℃伅",
+ "parameters": [
+ {
+ "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/response.InventoryHistory"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/forms/getInventoryForms": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃"
+ ],
+ "summary": "鑾峰彇搴撳瓨鎶ヨ〃",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetInventoryForms"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.InventoryForms"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/forms/getLocationForms": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃"
+ ],
+ "summary": "鑾峰彇浣嶇疆鎶ヨ〃",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.PageInfo"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.LocationForms"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/location/addLocation": {
"post": {
"produces": [
@@ -442,6 +577,289 @@
"required": true,
"schema": {
"$ref": "#/definitions/models.Location"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/locationProduct/add": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "涓婃灦瑙勫垯"
+ ],
+ "summary": "娣诲姞涓婃灦瑙勫垯",
+ "parameters": [
+ {
+ "description": "鏂板涓婃灦瑙勫垯",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddLocationProduct"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/locationProduct/delete/{id}": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "涓婃灦瑙勫垯"
+ ],
+ "summary": "鍒犻櫎涓婃灦瑙勫垯",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/locationProduct/list": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "涓婃灦瑙勫垯"
+ ],
+ "summary": "涓婃灦瑙勫垯鍒楄〃",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.PageInfo"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/locationProduct/update": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "涓婃灦瑙勫垯"
+ ],
+ "summary": "淇敼涓婃灦瑙勫垯",
+ "parameters": [
+ {
+ "description": "淇敼鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateLocationProduct"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/locationProductAmount/add": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "搴撳瓨鐩樼偣"
+ ],
+ "summary": "娣诲姞搴撳瓨鐩樼偣淇℃伅",
+ "parameters": [
+ {
+ "description": "鍏ュ簱/鍑哄簱淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddLocationProductAmount"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/locationProductAmount/finish": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "搴撳瓨鐩樼偣"
+ ],
+ "summary": "搴旂敤銆侀獙璇�",
+ "parameters": [
+ {
+ "description": "鍏ュ弬",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.FinishLocationProductAmount"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/locationProductAmount/getRuleList": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "搴撳瓨鐩樼偣"
+ ],
+ "summary": "鑾峰彇涓婃灦瑙勫垯",
+ "parameters": [
+ {
+ "description": "鏌ヨ淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetRuleList"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.RuleList"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/locationProductAmount/list": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "搴撳瓨鐩樼偣"
+ ],
+ "summary": "搴撳瓨鐩樼偣鍒楄〃",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.PageInfo"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/locationProductAmount/update": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "搴撳瓨鐩樼偣"
+ ],
+ "summary": "淇敼搴撳瓨鐩樼偣淇℃伅",
+ "parameters": [
+ {
+ "description": "鍏ュ簱/鍑哄簱淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateLocationProductAmount"
}
}
],
@@ -1134,6 +1552,51 @@
}
}
},
+ "/api-wms/v1/product/listHistory": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "浜у搧浣嶇疆鍘嗗彶淇℃伅",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.QueryOperationHistory"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Operation"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/product/listOperaton": {
"post": {
"produces": [
@@ -1455,9 +1918,13 @@
"enum": [
1,
2,
- 3
+ 3,
+ 4,
+ 5
],
"x-enum-comments": {
+ "BaseOperationTypeAdjust": "搴撳瓨鐩樼偣",
+ "BaseOperationTypeDisuse": "鎶ュ簾",
"BaseOperationTypeIncoming": "鏀惰揣",
"BaseOperationTypeInternal": "鍐呴儴璋冩嫧",
"BaseOperationTypeOutgoing": "浜よ揣"
@@ -1465,7 +1932,9 @@
"x-enum-varnames": [
"BaseOperationTypeIncoming",
"BaseOperationTypeOutgoing",
- "BaseOperationTypeInternal"
+ "BaseOperationTypeInternal",
+ "BaseOperationTypeDisuse",
+ "BaseOperationTypeAdjust"
]
},
"constvar.CostingMethod": {
@@ -1548,10 +2017,13 @@
5,
6,
7,
- 8
+ 8,
+ 9
],
"x-enum-comments": {
+ "LocationTypeAdjust": "搴撳瓨鐩樼偣",
"LocationTypeCustomer": "瀹㈡埛浣嶇疆",
+ "LocationTypeDisuse": "鎶ュ簾浣嶇疆",
"LocationTypeInternal": "鍐呴儴浣嶇疆",
"LocationTypeInventoryLoss": "搴撳瓨鎹熷け",
"LocationTypeProduction": "鐢熶骇",
@@ -1567,7 +2039,8 @@
"LocationTypeInventoryLoss",
"LocationTypeProduction",
"LocationTypeTransit",
- "LocationTypeDisuse"
+ "LocationTypeDisuse",
+ "LocationTypeAdjust"
]
},
"constvar.MaterialMode": {
@@ -1786,7 +2259,7 @@
},
"parentId": {
"description": "涓婄骇id",
- "type": "string"
+ "type": "integer"
},
"recentlyCount": {
"description": "鏈�杩戠洏鐐�",
@@ -2004,6 +2477,14 @@
"models.Operation": {
"type": "object",
"properties": {
+ "baseOperationType": {
+ "description": "鍩虹浣滀笟绫诲瀷",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.BaseOperationType"
+ }
+ ]
+ },
"comment": {
"type": "string"
},
@@ -2299,6 +2780,50 @@
}
}
},
+ "request.AddLocationProduct": {
+ "type": "object",
+ "properties": {
+ "areaId": {
+ "description": "鍖哄煙id",
+ "type": "integer"
+ },
+ "locationId": {
+ "description": "浣嶇疆id",
+ "type": "integer"
+ },
+ "productCategoryId": {
+ "description": "浜у搧绉嶇被id",
+ "type": "integer"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
+ }
+ }
+ },
+ "request.AddLocationProductAmount": {
+ "type": "object",
+ "properties": {
+ "Amount": {
+ "description": "搴撳瓨鏁伴噺",
+ "type": "number"
+ },
+ "adjustAmount": {
+ "description": "宸��",
+ "type": "number"
+ },
+ "differenceAmount": {
+ "description": "璁℃暟鏁伴噺",
+ "type": "number"
+ },
+ "locationId": {
+ "type": "integer"
+ },
+ "productId": {
+ "type": "string"
+ }
+ }
+ },
"request.AddOperation": {
"type": "object",
"properties": {
@@ -2411,6 +2936,10 @@
"description": "浠撳簱鍚嶇О",
"type": "string"
},
+ "prefix": {
+ "description": "鍓嶇紑",
+ "type": "string"
+ },
"printLabel": {
"description": "鏄惁鎵撳嵃鏍囩",
"type": "boolean"
@@ -2494,9 +3023,78 @@
}
}
},
+ "request.FinishLocationProductAmount": {
+ "type": "object",
+ "properties": {
+ "locationProductAmountId": {
+ "description": "搴撳瓨鐩樼偣id",
+ "type": "integer"
+ },
+ "operationId": {
+ "description": "鍑哄叆搴搃d",
+ "type": "integer"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
+ }
+ }
+ },
+ "request.GetInventoryForms": {
+ "type": "object",
+ "properties": {
+ "categoryIds": {
+ "description": "浜у搧绫诲瀷id",
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "warehouseCode": {
+ "description": "浠撳簱缂╁啓",
+ "type": "string"
+ }
+ }
+ },
+ "request.GetInventoryHistory": {
+ "type": "object",
+ "properties": {
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "produceId": {
+ "description": "浜у搧id",
+ "type": "string"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
+ }
+ }
+ },
"request.GetProductList": {
"type": "object",
"properties": {
+ "categoryId": {
+ "type": "integer"
+ },
"keyWord": {
"type": "string"
},
@@ -2507,6 +3105,19 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ }
+ }
+ },
+ "request.GetRuleList": {
+ "type": "object",
+ "properties": {
+ "locationId": {
+ "description": "浣嶇疆id",
+ "type": "integer"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
}
}
},
@@ -2562,9 +3173,19 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ }
+ }
+ },
+ "request.PageInfo": {
+ "type": "object",
+ "properties": {
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
},
- "sourceNumber": {
- "type": "string"
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
}
}
},
@@ -2581,8 +3202,24 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ }
+ }
+ },
+ "request.QueryOperationHistory": {
+ "type": "object",
+ "properties": {
+ "locationId": {
+ "type": "integer"
},
- "sourceNumber": {
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "productId": {
"type": "string"
}
}
@@ -2643,8 +3280,10 @@
"type": "object",
"properties": {
"amount": {
- "description": "ProductName string `json:\"productName\"`",
"type": "number"
+ },
+ "baseOperationType": {
+ "$ref": "#/definitions/constvar.BaseOperationType"
},
"fromLocationId": {
"type": "integer"
@@ -2653,7 +3292,6 @@
"type": "integer"
},
"number": {
- "description": "Unit string `json:\"unit\"`",
"type": "string"
},
"operationDate": {
@@ -2673,9 +3311,66 @@
}
}
},
+ "request.UpdateLocationProduct": {
+ "type": "object",
+ "properties": {
+ "areaId": {
+ "description": "鍖哄煙id",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "locationId": {
+ "description": "浣嶇疆id",
+ "type": "integer"
+ },
+ "productCategoryId": {
+ "description": "浜у搧绉嶇被id",
+ "type": "integer"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
+ }
+ }
+ },
+ "request.UpdateLocationProductAmount": {
+ "type": "object",
+ "properties": {
+ "adjustAmount": {
+ "description": "LocationProductAmountId int `json:\"locationProductAmountId\"` //搴撳瓨鐩樼偣id",
+ "type": "number"
+ },
+ "amount": {
+ "description": "搴撳瓨鏁伴噺",
+ "type": "number"
+ },
+ "differenceAmount": {
+ "description": "璁℃暟鏁伴噺",
+ "type": "number"
+ },
+ "operationId": {
+ "description": "鍑哄叆搴搃d",
+ "type": "integer"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
+ }
+ }
+ },
"request.UpdateOperation": {
"type": "object",
"properties": {
+ "baseOperationType": {
+ "description": "鍩虹浣滀笟绫诲瀷",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.BaseOperationType"
+ }
+ ]
+ },
"comment": {
"description": "澶囨敞",
"type": "string"
@@ -2785,6 +3480,10 @@
"description": "浠撳簱鍚嶇О",
"type": "string"
},
+ "prefix": {
+ "description": "鍓嶇紑",
+ "type": "string"
+ },
"printLabel": {
"description": "鏄惁鎵撳嵃鏍囩",
"type": "boolean"
@@ -2815,6 +3514,144 @@
}
}
},
+ "response.InventoryForms": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "鍦ㄥ簱鏁伴噺",
+ "type": "number"
+ },
+ "availableNumber": {
+ "description": "鍙敤搴撳瓨",
+ "type": "number"
+ },
+ "cost": {
+ "description": "鎴愭湰",
+ "type": "number"
+ },
+ "in": {
+ "description": "鍏ュ簱",
+ "type": "number"
+ },
+ "out": {
+ "description": "鍑哄簱",
+ "type": "number"
+ },
+ "produceId": {
+ "description": "浜у搧id",
+ "type": "string"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productType": {
+ "description": "浜у搧绫诲瀷",
+ "type": "string"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
+ },
+ "value": {
+ "description": "鎬讳环鍊�",
+ "type": "number"
+ }
+ }
+ },
+ "response.InventoryHistory": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "鏁伴噺",
+ "type": "number"
+ },
+ "contactedName": {
+ "description": "瀹屾垚鑰�",
+ "type": "string"
+ },
+ "date": {
+ "description": "鏃ユ湡",
+ "type": "string"
+ },
+ "fromLocation": {
+ "description": "婧愪綅缃�",
+ "type": "string"
+ },
+ "number": {
+ "description": "鍗曞彿",
+ "type": "string"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "status": {
+ "description": "鐘舵��",
+ "type": "string"
+ },
+ "toLocation": {
+ "description": "鐩爣浣嶇疆",
+ "type": "string"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
+ }
+ }
+ },
+ "response.LocationForms": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "鏁伴噺",
+ "type": "number"
+ },
+ "locationName": {
+ "description": "浣嶇疆鍚嶇О",
+ "type": "string"
+ },
+ "produceId": {
+ "description": "浜у搧id",
+ "type": "string"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productTypeName": {
+ "description": "浜у搧绫诲埆",
+ "type": "string"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
+ },
+ "value": {
+ "description": "鎬讳环鍊�",
+ "type": "number"
+ }
+ }
+ },
+ "response.RuleList": {
+ "type": "object",
+ "properties": {
+ "locationList": {
+ "description": "浣嶇疆鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Location"
+ }
+ },
+ "productList": {
+ "description": "浜у搧鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Material"
+ }
+ }
+ }
+ },
"util.Response": {
"type": "object",
"properties": {
--
Gitblit v1.8.0