From 0ec0aef398704cd0219ed452f3aa96c8cdacd647 Mon Sep 17 00:00:00 2001 From: yinbentan <yinbentan@live.com> Date: 星期六, 06 七月 2024 15:27:51 +0800 Subject: [PATCH] 出库、入库、盘点涉及产品重复性检查调整(从【产品编号】变更为以【产品编号、出库库房编号、入库库房编号】作为唯一标识) --- docs/swagger.json | 1105 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 924 insertions(+), 181 deletions(-) diff --git a/docs/swagger.json b/docs/swagger.json index 93d6dd4..76cdd10 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -4,140 +4,6 @@ "contact": {} }, "paths": { - "/api-s/v1/organize/department": { - "get": { - "produces": [ - "application/json" - ], - "tags": [ - "閮ㄩ棬淇℃伅" - ], - "summary": "鏌ヨ閮ㄩ棬淇℃伅鍒楄〃", - "parameters": [ - { - "type": "integer", - "description": "椤电爜", - "name": "page", - "in": "query" - }, - { - "type": "integer", - "description": "姣忛〉澶у皬", - "name": "pageSize", - "in": "query" - } - ], - "responses": { - "200": { - "description": "鎴愬姛", - "schema": { - "allOf": [ - { - "$ref": "#/definitions/util.ResponseList" - }, - { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "$ref": "#/definitions/models.Department" - } - } - } - } - ] - } - } - } - }, - "post": { - "produces": [ - "application/json" - ], - "tags": [ - "閮ㄩ棬淇℃伅" - ], - "summary": "娣诲姞閮ㄩ棬淇℃伅", - "parameters": [ - { - "description": "閮ㄩ棬淇℃伅淇℃伅", - "name": "object", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/request.AddDepartment" - } - } - ], - "responses": { - "200": { - "description": "鎴愬姛", - "schema": { - "$ref": "#/definitions/util.Response" - } - } - } - } - }, - "/api-s/v1/organize/department/{id}": { - "put": { - "produces": [ - "application/json" - ], - "tags": [ - "閮ㄩ棬淇℃伅" - ], - "summary": "缂栬緫閮ㄩ棬淇℃伅", - "parameters": [ - { - "description": "閮ㄩ棬淇℃伅淇℃伅", - "name": "object", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/request.UpdateDepartment" - } - } - ], - "responses": { - "200": { - "description": "鎴愬姛", - "schema": { - "$ref": "#/definitions/util.Response" - } - } - } - }, - "delete": { - "produces": [ - "application/json" - ], - "tags": [ - "閮ㄩ棬淇℃伅" - ], - "summary": "缂栬緫閮ㄩ棬淇℃伅", - "parameters": [ - { - "description": "閮ㄩ棬淇℃伅淇℃伅", - "name": "object", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/request.UpdateDepartment" - } - } - ], - "responses": { - "200": { - "description": "鎴愬姛", - "schema": { - "$ref": "#/definitions/util.Response" - } - } - } - } - }, "/api-wms/v1/attachment/uploadFiles": { "post": { "tags": [ @@ -684,6 +550,166 @@ } } }, + "/api-wms/v1/dict/add": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "鏁版嵁瀛楀吀" + ], + "summary": "娣诲姞瀛楀吀淇℃伅", + "parameters": [ + { + "description": "鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.AddMiniDict" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/dict/delete/{id}": { + "delete": { + "tags": [ + "鏁版嵁瀛楀吀" + ], + "summary": "鍒犻櫎瀛楀吀淇℃伅", + "parameters": [ + { + "type": "string", + "description": "id", + "name": "id", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/dict/edit": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "鏁版嵁瀛楀吀" + ], + "summary": "缂栬緫瀛楀吀淇℃伅", + "parameters": [ + { + "description": "鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.EditMiniDict" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/dict/getDictList": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "鏁版嵁瀛楀吀" + ], + "summary": "鑾峰彇瀛楀吀淇℃伅鍒楄〃", + "parameters": [ + { + "description": "鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.GetMiniDictList" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/util.ResponseList" + }, + { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/models.MiniDict" + } + } + } + } + ] + } + } + } + } + }, + "/api-wms/v1/dict/save": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "鏁版嵁瀛楀吀" + ], + "summary": "鎵归噺鏇存柊杩蜂綘瀛楀吀(浼氬垹闄ゅ師鏁版嵁)", + "parameters": [ + { + "description": "鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.SaveMiniDict" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, "/api-wms/v1/forms/doMonthStats": { "post": { "produces": [ @@ -701,6 +727,58 @@ "required": true, "schema": { "$ref": "#/definitions/request.DoMonthStats" + } + }, + { + "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/doWarehouseMonthStats": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "鎶ヨ〃" + ], + "summary": "鎵嬪姩璺戞湀搴︾粺璁″簱瀛樻姤琛�", + "parameters": [ + { + "description": "鏌ヨ鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.DoWarehouseMonthStats" } }, { @@ -944,6 +1022,58 @@ } } }, + "/api-wms/v1/forms/downloadWarehouseMonthStats": { + "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": [ @@ -1142,6 +1272,58 @@ "type": "array", "items": { "$ref": "#/definitions/models.MonthStats" + } + } + } + } + ] + } + } + } + } + }, + "/api-wms/v1/forms/warehouseMonthStats": { + "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.WarehouseMonthStats" } } } @@ -1654,6 +1836,43 @@ } } }, + "/api-wms/v1/locationProductAmount/locationProductList": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "搴撳瓨鐩樼偣" + ], + "summary": "鑾峰彇浣嶇疆瀵瑰簲浜у搧鍒楄〃", + "parameters": [ + { + "description": "鏌ヨ鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.GetLocationProductList" + } + }, + { + "type": "string", + "description": "token", + "name": "Authorization", + "in": "header", + "required": true + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/util.ResponseList" + } + } + } + } + }, "/api-wms/v1/locationProductAmount/update": { "post": { "produces": [ @@ -1801,7 +2020,7 @@ "tags": [ "鍏ュ簱/鍑哄簱" ], - "summary": "鍏ュ簱/鍑哄簱鍒楄〃", + "summary": "鎿嶄綔璇︽儏鎺ュ彛", "parameters": [ { "type": "string", @@ -1809,13 +2028,32 @@ "name": "id", "in": "path", "required": true + }, + { + "type": "string", + "description": "token", + "name": "Authorization", + "in": "header", + "required": true } ], "responses": { "200": { "description": "鎴愬姛", "schema": { - "$ref": "#/definitions/util.Response" + "allOf": [ + { + "$ref": "#/definitions/util.Response" + }, + { + "type": "object", + "properties": { + "data": { + "$ref": "#/definitions/models.Operation" + } + } + } + ] } } } @@ -1830,37 +2068,11 @@ "鍏ュ簱/鍑哄簱" ], "summary": "鑾峰彇浜哄憳鍒楄〃", - "parameters": [ - { - "description": "鍙傛暟", - "name": "object", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/request.OperationCondition" - } - } - ], "responses": { "200": { "description": "鎴愬姛", "schema": { - "allOf": [ - { - "$ref": "#/definitions/util.ResponseList" - }, - { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "$ref": "#/definitions/inventory_order.WorkerInfo" - } - } - } - } - ] + "$ref": "#/definitions/util.Response" } } } @@ -1909,7 +2121,22 @@ "200": { "description": "鎴愬姛", "schema": { - "$ref": "#/definitions/util.Response" + "allOf": [ + { + "$ref": "#/definitions/util.ResponseList" + }, + { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/models.Operation" + } + } + } + } + ] } } } @@ -2146,9 +2373,9 @@ "in": "query" }, { - "type": "integer", + "type": "string", "description": "浠撳簱id", - "name": "warehouseId", + "name": "warehouseIds", "in": "query" } ], @@ -2241,6 +2468,140 @@ "name": "id", "in": "path", "required": true + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/organize/department": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "閮ㄩ棬淇℃伅" + ], + "summary": "鏌ヨ閮ㄩ棬淇℃伅鍒楄〃", + "parameters": [ + { + "type": "integer", + "description": "椤电爜", + "name": "page", + "in": "query" + }, + { + "type": "integer", + "description": "姣忛〉澶у皬", + "name": "pageSize", + "in": "query" + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/util.ResponseList" + }, + { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/models.Department" + } + } + } + } + ] + } + } + } + }, + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "閮ㄩ棬淇℃伅" + ], + "summary": "娣诲姞閮ㄩ棬淇℃伅", + "parameters": [ + { + "description": "閮ㄩ棬淇℃伅淇℃伅", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.AddDepartment" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/organize/department/{id}": { + "put": { + "produces": [ + "application/json" + ], + "tags": [ + "閮ㄩ棬淇℃伅" + ], + "summary": "缂栬緫閮ㄩ棬淇℃伅", + "parameters": [ + { + "description": "閮ㄩ棬淇℃伅淇℃伅", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.UpdateDepartment" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + }, + "delete": { + "produces": [ + "application/json" + ], + "tags": [ + "閮ㄩ棬淇℃伅" + ], + "summary": "缂栬緫閮ㄩ棬淇℃伅", + "parameters": [ + { + "description": "閮ㄩ棬淇℃伅淇℃伅", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.UpdateDepartment" + } } ], "responses": { @@ -2442,6 +2803,31 @@ "description": "id", "name": "id", "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/product/downloadInputFormat": { + "get": { + "tags": [ + "浜у搧" + ], + "summary": "涓嬭浇瀵煎叆鐗╂枡/浜у搧妯℃澘", + "parameters": [ + { + "type": "string", + "description": "token", + "name": "Authorization", + "in": "header", "required": true } ], @@ -2782,9 +3168,9 @@ "application/xlsx" ], "tags": [ - "鐗╂枡绠$悊" + "浜у搧" ], - "summary": "瀵煎叆鐗╂枡", + "summary": "瀵煎叆鐗╂枡/浜у搧", "parameters": [ { "type": "file", @@ -3623,6 +4009,21 @@ "BaseOperationTypeAdjust" ] }, + "constvar.BoolType": { + "type": "integer", + "enum": [ + 1, + 2 + ], + "x-enum-comments": { + "BoolTypeFalse": "false", + "BoolTypeTrue": "true" + }, + "x-enum-varnames": [ + "BoolTypeTrue", + "BoolTypeFalse" + ] + }, "constvar.CostingMethod": { "type": "integer", "enum": [ @@ -3787,6 +4188,30 @@ "MaterialModeConsumables", "MaterialModeOther", "MaterialModeVirtual" + ] + }, + "constvar.MiniDictType": { + "type": "integer", + "enum": [ + 1, + 2, + 3, + 4, + 5 + ], + "x-enum-comments": { + "DisuseType": "鎶ュ簾绫诲瀷", + "StockoutType": "鍑哄簱绫诲瀷", + "StorageType": "鍏ュ簱绫诲瀷", + "TakeStockType": "鐩樼偣绫诲瀷", + "TransferType": "璋冩嫧绫诲瀷" + }, + "x-enum-varnames": [ + "StorageType", + "StockoutType", + "TransferType", + "TakeStockType", + "DisuseType" ] }, "constvar.OperationSource": { @@ -3969,17 +4394,6 @@ "valid": { "description": "Valid is true if Time is not NULL", "type": "boolean" - } - } - }, - "inventory_order.WorkerInfo": { - "type": "object", - "properties": { - "id": { - "type": "string" - }, - "name": { - "type": "string" } } }, @@ -4212,7 +4626,7 @@ "$ref": "#/definitions/models.Location" }, "locationId": { - "description": "LocationProductId int `json:\"locationProductId\" gorm:\"type:int;not null;comment:涓婃灦瑙勫垯id\"` //涓婃灦瑙勫垯id\nLocationProduct LocationProduct `json:\"locationProduct\" gorm:\"foreignKey:LocationProductId;references:Id\"`", + "description": "浣嶇疆id", "type": "integer" }, "product": { @@ -4231,6 +4645,9 @@ }, "updateTime": { "type": "string" + }, + "warehouseId": { + "type": "integer" } } }, @@ -4551,6 +4968,38 @@ } } }, + "models.MiniDict": { + "type": "object", + "properties": { + "code": { + "description": "缂栫爜", + "type": "string" + }, + "id": { + "type": "integer" + }, + "isDefault": { + "description": "鏄惁榛樿", + "type": "boolean" + }, + "name": { + "description": "鍚嶇О", + "type": "string" + }, + "type": { + "description": "瀛楀吀绫诲瀷", + "allOf": [ + { + "$ref": "#/definitions/constvar.MiniDictType" + } + ] + }, + "value": { + "description": "鍊�", + "type": "string" + } + } + }, "models.MonthStats": { "type": "object", "properties": { @@ -4628,6 +5077,21 @@ "type": "number" } } + }, + "models.MonthStatsItemsType": { + "type": "integer", + "enum": [ + 1, + 2 + ], + "x-enum-comments": { + "MonthStatsItemsTypeInput": "鍏ュ簱", + "MonthStatsItemsTypeOutput": "鍑哄簱" + }, + "x-enum-varnames": [ + "MonthStatsItemsTypeInput", + "MonthStatsItemsTypeOutput" + ] }, "models.MoveHistory": { "type": "object", @@ -4757,6 +5221,9 @@ "custodianId": { "type": "string" }, + "dealerType": { + "type": "string" + }, "details": { "type": "array", "items": { @@ -4803,7 +5270,6 @@ "type": "string" }, "operationDate": { - "description": "FromLocationID int `json:\"fromLocationId\" gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` //婧愪綅缃甶d\nFromLocation Location `json:\"fromLocation\" gorm:\"foreignKey:FromLocationID;references:Id\"` //婧愪綅缃甛nToLocationID int `json:\"toLocationId\" gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` //鐩爣浣嶇疆id\nToLocation Location `json:\"toLocation\" gorm:\"foreignKey:ToLocationID;references:Id\"` //鐩爣浣嶇疆", "type": "string" }, "operationSource": { @@ -4867,6 +5333,9 @@ "updateTime": { "type": "string" }, + "warehouse": { + "$ref": "#/definitions/models.Warehouse" + }, "warehouseId": { "type": "integer" }, @@ -4893,11 +5362,23 @@ "auxiliaryUnit": { "type": "string" }, + "baseOperationType": { + "description": "鍩虹浣滀笟绫诲瀷", + "allOf": [ + { + "$ref": "#/definitions/constvar.BaseOperationType" + } + ] + }, "cost": { "description": "鎴愭湰鍗曚环", "type": "number" }, "createTime": { + "type": "string" + }, + "dealerType": { + "description": "鍑哄叆搴撶被鍨�", "type": "string" }, "fromLocation": { @@ -4940,6 +5421,10 @@ }, "salePrice": { "description": "閿�鍞崟浠�", + "type": "number" + }, + "stockAmount": { + "description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�", "type": "number" }, "toLocation": { @@ -5191,6 +5676,14 @@ "description": "浠撳簱鍚嶇О", "type": "string" }, + "openMonthStats": { + "description": "鏄惁寮�鍚湀搴︾粺璁�", + "allOf": [ + { + "$ref": "#/definitions/constvar.BoolType" + } + ] + }, "outboundTransportation": { "description": "鍑哄簱杩愯緭", "type": "integer" @@ -5219,6 +5712,93 @@ "warehouseLocation": { "description": "搴撳瓨浣嶇疆", "type": "string" + } + } + }, + "models.WarehouseMonthStats": { + "type": "object", + "properties": { + "amount": { + "description": "鏈熸湯缁撲綑鏁伴噺", + "type": "number" + }, + "beginAmount": { + "description": "鏈熷垵鏁伴噺", + "type": "number" + }, + "createTime": { + "type": "string" + }, + "date": { + "description": "鏃ユ湡 2024-04", + "type": "string" + }, + "id": { + "type": "integer" + }, + "inputAmount": { + "description": "鍏ュ簱鏁伴噺", + "type": "number" + }, + "inputItems": { + "description": "鍏ュ簱鏄庣粏", + "type": "array", + "items": { + "$ref": "#/definitions/models.WarehouseStatsItems" + } + }, + "outputAmount": { + "description": "鍑哄簱鏁伴噺", + "type": "number" + }, + "outputItems": { + "description": "鍑哄簱鏄庣粏", + "type": "array", + "items": { + "$ref": "#/definitions/models.WarehouseStatsItems" + } + }, + "productId": { + "description": "浜у搧id", + "type": "string" + }, + "productName": { + "description": "浜у搧鍚嶇О", + "type": "string" + }, + "salePrice": { + "description": "閿�鍞崟浠�", + "type": "number" + }, + "unit": { + "description": "鍗曚綅", + "type": "string" + }, + "updateTime": { + "type": "string" + }, + "warehouseId": { + "description": "浠撳簱ID", + "type": "integer" + } + } + }, + "models.WarehouseStatsItems": { + "type": "object", + "properties": { + "amount": { + "description": "鏁伴噺", + "type": "number" + }, + "name": { + "description": "鍏ュ簱鏉ユ簮锛屽嚭搴撳幓澶�", + "type": "string" + }, + "type": { + "$ref": "#/definitions/models.MonthStatsItemsType" + }, + "warehouseMonthStatsId": { + "type": "integer" } } }, @@ -5343,6 +5923,31 @@ } } }, + "request.AddMiniDict": { + "type": "object", + "properties": { + "isDefault": { + "description": "鏄惁榛樿", + "type": "boolean" + }, + "name": { + "description": "鍚嶇О", + "type": "string" + }, + "type": { + "description": "瀛楀吀绫诲瀷", + "allOf": [ + { + "$ref": "#/definitions/constvar.MiniDictType" + } + ] + }, + "value": { + "description": "鍊�", + "type": "string" + } + } + }, "request.AddOperation": { "type": "object", "properties": { @@ -5384,6 +5989,9 @@ "type": "string" }, "custodianId": { + "type": "string" + }, + "dealerType": { "type": "string" }, "details": { @@ -5627,6 +6235,43 @@ } } }, + "request.DoWarehouseMonthStats": { + "type": "object", + "properties": { + "token": { + "type": "string" + } + } + }, + "request.EditMiniDict": { + "type": "object", + "properties": { + "id": { + "description": "瀛楀吀绫诲瀷", + "type": "integer" + }, + "isDefault": { + "description": "鏄惁榛樿", + "type": "boolean" + }, + "name": { + "description": "鍚嶇О", + "type": "string" + }, + "type": { + "description": "瀛楀吀绫诲瀷", + "allOf": [ + { + "$ref": "#/definitions/constvar.MiniDictType" + } + ] + }, + "value": { + "description": "鍊�", + "type": "string" + } + } + }, "request.FinishLocationProductAmount": { "type": "object", "properties": { @@ -5745,6 +6390,12 @@ "locationId": { "type": "integer" }, + "locationIds": { + "type": "array", + "items": { + "type": "integer" + } + }, "page": { "description": "椤电爜", "type": "integer" @@ -5785,6 +6436,45 @@ }, "type": { "type": "integer" + }, + "warehouseId": { + "description": "浠撳簱ID", + "type": "integer" + } + } + }, + "request.GetLocationProductList": { + "type": "object", + "properties": { + "keyword": { + "type": "string" + }, + "locationId": { + "type": "integer" + }, + "page": { + "description": "椤电爜", + "type": "integer" + }, + "pageSize": { + "description": "姣忛〉澶у皬", + "type": "integer" + }, + "warehouseId": { + "type": "integer" + } + } + }, + "request.GetMiniDictList": { + "type": "object", + "properties": { + "type": { + "description": "瀛楀吀绫诲瀷", + "allOf": [ + { + "$ref": "#/definitions/constvar.MiniDictType" + } + ] } } }, @@ -5803,6 +6493,12 @@ }, "pageSize": { "description": "姣忛〉澶у皬", + "type": "integer" + }, + "preload": { + "type": "boolean" + }, + "warehouseID": { "type": "integer" } } @@ -5861,6 +6557,23 @@ }, "productId": { "description": "浜у搧id", + "type": "string" + } + } + }, + "request.MiniDict": { + "type": "object", + "properties": { + "isDefault": { + "description": "鏄惁榛樿", + "type": "boolean" + }, + "name": { + "description": "鍚嶇О", + "type": "string" + }, + "value": { + "description": "鍊�", "type": "string" } } @@ -5948,6 +6661,10 @@ }, "salePrice": { "description": "閿�鍞崟浠�", + "type": "number" + }, + "stockAmount": { + "description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�", "type": "number" }, "toLocationId": { @@ -6055,6 +6772,25 @@ }, "productId": { "type": "string" + } + } + }, + "request.SaveMiniDict": { + "type": "object", + "properties": { + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/request.MiniDict" + } + }, + "type": { + "description": "瀛楀吀绫诲瀷", + "allOf": [ + { + "$ref": "#/definitions/constvar.MiniDictType" + } + ] } } }, @@ -6335,6 +7071,9 @@ "id": { "type": "integer" }, + "inventoryDealerType": { + "type": "integer" + }, "locationId": { "description": "婧愪綅缃甶d", "type": "integer" @@ -6393,6 +7132,10 @@ "description": "鐩爣浣嶇疆id", "type": "integer" }, + "warehouseId": { + "description": "浠撳簱id", + "type": "integer" + }, "waybillNumber": { "description": "杩愬崟鍙�", "type": "string" -- Gitblit v1.8.0