From 47000c8d61e28bc590d085753c8b9ceff8546121 Mon Sep 17 00:00:00 2001 From: jiangshuai <291802688@qq.com> Date: 星期三, 08 十一月 2023 14:23:54 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS --- docs/swagger.yaml | 836 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 826 insertions(+), 10 deletions(-) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 81acff3..b2a6ba4 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -4,8 +4,12 @@ - 1 - 2 - 3 + - 4 + - 5 type: integer x-enum-comments: + BaseOperationTypeAdjust: 搴撳瓨鐩樼偣 + BaseOperationTypeDisuse: 鎶ュ簾 BaseOperationTypeIncoming: 鏀惰揣 BaseOperationTypeInternal: 鍐呴儴璋冩嫧 BaseOperationTypeOutgoing: 浜よ揣 @@ -13,6 +17,8 @@ - BaseOperationTypeIncoming - BaseOperationTypeOutgoing - BaseOperationTypeInternal + - BaseOperationTypeDisuse + - BaseOperationTypeAdjust constvar.CostingMethod: enum: - 1 @@ -78,9 +84,12 @@ - 6 - 7 - 8 + - 9 type: integer x-enum-comments: + LocationTypeAdjust: 搴撳瓨鐩樼偣 LocationTypeCustomer: 瀹㈡埛浣嶇疆 + LocationTypeDisuse: 鎶ュ簾浣嶇疆 LocationTypeInternal: 鍐呴儴浣嶇疆 LocationTypeInventoryLoss: 搴撳瓨鎹熷け LocationTypeProduction: 鐢熶骇 @@ -96,6 +105,7 @@ - LocationTypeProduction - LocationTypeTransit - LocationTypeDisuse + - LocationTypeAdjust constvar.MaterialMode: enum: - 鍘熸潗鏂� @@ -168,6 +178,17 @@ - ReservationMethodAtConfirm - ReservationMethodManual - ReservationMethodByDate + constvar.RuleType: + enum: + - 1 + - 2 + type: integer + x-enum-comments: + RuleType_Product: 浜у搧涓婃灦瑙勫垯 + RuleType_ProductCategory: 浜у搧绫诲埆涓婃灦瑙勫垯 + x-enum-varnames: + - RuleType_Product + - RuleType_ProductCategory constvar.WhetherType: enum: - 1 @@ -223,6 +244,10 @@ type: object models.Location: properties: + children: + items: + $ref: '#/definitions/models.Location' + type: array companyId: description: 鍏徃id type: integer @@ -257,7 +282,7 @@ type: string parentId: description: 涓婄骇id - type: string + type: integer recentlyCount: description: 鏈�杩戠洏鐐� type: string @@ -422,6 +447,10 @@ type: object models.Operation: properties: + baseOperationType: + allOf: + - $ref: '#/definitions/constvar.BaseOperationType' + description: 鍩虹浣滀笟绫诲瀷 comment: type: string companyID: @@ -515,7 +544,7 @@ - $ref: '#/definitions/constvar.InventoryValuation' description: 搴撳瓨璁′环 name: - description: 浣嶇疆鍚嶇О + description: 鍒嗙被鍚嶇О type: string parentId: description: 涓婄骇id @@ -525,6 +554,46 @@ type: integer routeName: description: 鍏徃 + type: string + type: object + models.ReorderRule: + properties: + amount: + description: 鍦ㄥ簱鏁伴噺 + type: number + createTime: + type: string + id: + type: integer + location: + $ref: '#/definitions/models.Location' + locationId: + description: 浣嶇疆id + type: integer + maxInventory: + description: 鏈�澶у簱瀛� + type: number + minInventory: + description: 鏈�灏忓簱瀛� + type: number + orderNumber: + description: 璁㈣喘鏁伴噺 + type: number + prediction: + description: 棰勬祴鏁伴噺 + type: number + product: + $ref: '#/definitions/models.Material' + productId: + description: 浜у搧id + type: string + route: + description: 璺嚎 + type: string + unit: + description: 鍗曚綅 + type: string + updateTime: type: string type: object models.Warehouse: @@ -619,6 +688,25 @@ toLocationId: type: integer type: object + request.AddLocationProduct: + properties: + areaId: + description: 鍖哄煙id + type: integer + locationId: + description: 浣嶇疆id + type: integer + productCategoryId: + description: 浜у搧绉嶇被id + type: integer + productId: + description: 浜у搧id + type: string + ruleType: + allOf: + - $ref: '#/definitions/constvar.RuleType' + description: 涓婃灦瑙勫垯绫诲瀷 1锛氫骇鍝佺被鍨嬶紱2锛氫骇鍝佺被鍒被鍨� + type: object request.AddOperation: properties: comment: @@ -695,6 +783,9 @@ name: description: 浠撳簱鍚嶇О type: string + prefix: + description: 鍓嶇紑 + type: string printLabel: description: 鏄惁鎵撳嵃鏍囩 type: boolean @@ -754,6 +845,101 @@ required: - code type: object + request.FinishLocationProductAmount: + properties: + locationProductAmountId: + description: 搴撳瓨鐩樼偣id + type: integer + operationId: + description: 鍑哄叆搴搃d + type: integer + productId: + description: 浜у搧id + type: string + type: object + request.GetAmountAndPrediction: + properties: + locationId: + type: integer + productId: + type: string + type: object + request.GetInventoryForms: + properties: + categoryIds: + description: 浜у搧绫诲瀷id + items: + type: integer + type: array + keyWord: + description: 鎼滅储鏉′欢 + type: string + page: + description: 椤电爜 + type: integer + pageSize: + description: 姣忛〉澶у皬 + type: integer + warehouseCode: + description: 浠撳簱缂╁啓 + type: string + type: object + request.GetInventoryHistory: + properties: + baseOperationType: + allOf: + - $ref: '#/definitions/constvar.BaseOperationType' + description: 鍩虹浣滀笟绫诲瀷 + keyWord: + description: 鎼滅储鏉′欢 + type: string + page: + description: 椤电爜 + type: integer + pageSize: + description: 姣忛〉澶у皬 + type: integer + produceId: + description: 浜у搧id + type: string + productName: + description: 浜у搧鍚嶇О + type: string + unit: + description: 鍗曚綅 + type: string + type: object + request.GetLocationForms: + properties: + keyWord: + type: string + page: + description: 椤电爜 + type: integer + pageSize: + description: 姣忛〉澶у皬 + type: integer + productId: + type: string + wareHouseCode: + type: string + type: object + request.GetLocationList: + properties: + jointName: + description: 鎷兼帴鍚嶇О + type: string + keyWord: + type: string + page: + description: 椤电爜 + type: integer + pageSize: + description: 姣忛〉澶у皬 + type: integer + type: + type: integer + type: object request.GetProductList: properties: categoryId: @@ -766,6 +952,33 @@ pageSize: description: 姣忛〉澶у皬 type: integer + type: object + request.GetReorderRuleList: + properties: + keyWord: + type: string + locationId: + type: integer + page: + description: 椤电爜 + type: integer + pageSize: + description: 姣忛〉澶у皬 + type: integer + productId: + type: string + type: + description: 绫诲瀷:bh=琛ヨ揣 + type: string + type: object + request.GetRuleList: + properties: + locationId: + description: 浣嶇疆id + type: integer + productId: + description: 浜у搧id + type: string type: object request.OperationAllList: properties: @@ -805,8 +1018,17 @@ pageSize: description: 姣忛〉澶у皬 type: integer - sourceNumber: - type: string + status: + $ref: '#/definitions/constvar.OperationStatus' + type: object + request.PageInfo: + properties: + page: + description: 椤电爜 + type: integer + pageSize: + description: 姣忛〉澶у皬 + type: integer type: object request.QueryDisuseList: properties: @@ -818,7 +1040,18 @@ pageSize: description: 姣忛〉澶у皬 type: integer - sourceNumber: + type: object + request.QueryOperationHistory: + properties: + locationId: + type: integer + page: + description: 椤电爜 + type: integer + pageSize: + description: 姣忛〉澶у皬 + type: integer + productId: type: string type: object request.QueryOperationList: @@ -860,14 +1093,14 @@ request.UpdateDisuse: properties: amount: - description: ProductName string `json:"productName"` type: number + baseOperationType: + $ref: '#/definitions/constvar.BaseOperationType' fromLocationId: type: integer id: type: integer number: - description: Unit string `json:"unit"` type: string operationDate: type: string @@ -880,8 +1113,58 @@ toLocationId: type: integer type: object + request.UpdateLocationProduct: + properties: + areaId: + description: 鍖哄煙id + type: integer + id: + type: integer + locationId: + description: 浣嶇疆id + type: integer + productCategoryId: + description: 浜у搧绉嶇被id + type: integer + productId: + description: 浜у搧id + type: string + ruleType: + allOf: + - $ref: '#/definitions/constvar.RuleType' + description: 涓婃灦瑙勫垯绫诲瀷 1锛氫骇鍝佺被鍨嬶紱2锛氫骇鍝佺被鍒被鍨� + type: object + request.UpdateLocationProductAmount: + properties: + adjustAmount: + description: LocationProductAmountId int `json:"locationProductAmountId"` + //搴撳瓨鐩樼偣id + type: number + amount: + description: 搴撳瓨鏁伴噺 + type: number + differenceAmount: + description: 璁℃暟鏁伴噺 + type: number + locationId: + description: 浣嶇疆id + type: integer + operationId: + description: 鍑哄叆搴搃d + type: integer + productCategoryId: + description: 浜у搧绉嶇被id + type: integer + productId: + description: 浜у搧id + type: string + type: object request.UpdateOperation: properties: + baseOperationType: + allOf: + - $ref: '#/definitions/constvar.BaseOperationType' + description: 鍩虹浣滀笟绫诲瀷 comment: description: 澶囨敞 type: string @@ -956,6 +1239,9 @@ name: description: 浠撳簱鍚嶇О type: string + prefix: + description: 鍓嶇紑 + type: string printLabel: description: 鏄惁鎵撳嵃鏍囩 type: boolean @@ -975,6 +1261,110 @@ warehouseId: description: 浠撳簱id type: integer + type: object + response.InventoryForms: + 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 + type: object + response.InventoryHistory: + properties: + amount: + description: 鏁伴噺 + type: number + baseOperationType: + allOf: + - $ref: '#/definitions/constvar.BaseOperationType' + description: 鍩虹浣滀笟绫诲瀷 + 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 + type: object + response.LocationForms: + 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 + type: object + response.RuleList: + properties: + locationList: + description: 浣嶇疆鍒楄〃 + items: + $ref: '#/definitions/models.Location' + type: array + productList: + description: 浜у搧鍒楄〃 + items: + $ref: '#/definitions/models.Material' + type: array type: object util.Response: properties: @@ -1174,6 +1564,84 @@ summary: 缂栬緫鍏徃 tags: - 鍏徃 + /api-wms/v1/forms/getHistory: + post: + parameters: + - description: 鏌ヨ鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.GetInventoryHistory' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.ResponseList' + - properties: + data: + items: + $ref: '#/definitions/response.InventoryHistory' + type: array + type: object + summary: 鑾峰彇鍘嗗彶淇℃伅 + tags: + - 鎶ヨ〃 + /api-wms/v1/forms/getInventoryForms: + post: + parameters: + - description: 鏌ヨ鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.GetInventoryForms' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.ResponseList' + - properties: + data: + items: + $ref: '#/definitions/response.InventoryForms' + type: array + type: object + summary: 鑾峰彇搴撳瓨鎶ヨ〃 + tags: + - 鎶ヨ〃 + /api-wms/v1/forms/getLocationForms: + post: + parameters: + - description: 鏌ヨ鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.GetLocationForms' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.ResponseList' + - properties: + data: + items: + $ref: '#/definitions/response.LocationForms' + type: array + type: object + summary: 鑾峰彇浣嶇疆鎶ヨ〃 + tags: + - 鎶ヨ〃 /api-wms/v1/location/addLocation: post: parameters: @@ -1242,7 +1710,7 @@ name: object required: true schema: - $ref: '#/definitions/request.GetProductList' + $ref: '#/definitions/request.GetLocationList' produces: - application/json responses: @@ -1258,6 +1726,25 @@ type: array type: object summary: 鑾峰彇浣嶇疆鍒楄〃 + tags: + - 浣嶇疆 + /api-wms/v1/location/getLocationTreeList: + get: + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.ResponseList' + - properties: + data: + items: + $ref: '#/definitions/models.Location' + type: array + type: object + summary: 鑾峰彇浣嶇疆鍒楄〃鏍� tags: - 浣嶇疆 /api-wms/v1/location/updateLocation: @@ -1279,6 +1766,183 @@ summary: 淇敼浣嶇疆 tags: - 浣嶇疆 + /api-wms/v1/locationProduct/add: + post: + parameters: + - description: 鏂板涓婃灦瑙勫垯 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.AddLocationProduct' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 娣诲姞涓婃灦瑙勫垯 + tags: + - 涓婃灦瑙勫垯 + /api-wms/v1/locationProduct/delete/{id}: + delete: + parameters: + - description: id + in: path + name: id + required: true + type: integer + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 鍒犻櫎涓婃灦瑙勫垯 + tags: + - 涓婃灦瑙勫垯 + /api-wms/v1/locationProduct/list: + post: + parameters: + - description: 鏌ヨ鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.PageInfo' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 涓婃灦瑙勫垯鍒楄〃 + tags: + - 涓婃灦瑙勫垯 + /api-wms/v1/locationProduct/update: + post: + parameters: + - description: 淇敼鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.UpdateLocationProduct' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 淇敼涓婃灦瑙勫垯 + tags: + - 涓婃灦瑙勫垯 + /api-wms/v1/locationProductAmount/add: + post: + parameters: + - description: 鍏ュ簱/鍑哄簱淇℃伅 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.UpdateLocationProductAmount' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 娣诲姞搴撳瓨鐩樼偣淇℃伅 + tags: + - 搴撳瓨鐩樼偣 + /api-wms/v1/locationProductAmount/finish: + post: + parameters: + - description: 鍏ュ弬 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.FinishLocationProductAmount' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 搴旂敤銆侀獙璇� + tags: + - 搴撳瓨鐩樼偣 + /api-wms/v1/locationProductAmount/getRuleList: + post: + parameters: + - description: 鏌ヨ淇℃伅 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.GetRuleList' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.ResponseList' + - properties: + data: + items: + $ref: '#/definitions/response.RuleList' + type: array + type: object + summary: 鑾峰彇涓婃灦瑙勫垯 + tags: + - 搴撳瓨鐩樼偣 + /api-wms/v1/locationProductAmount/list: + post: + parameters: + - description: 鏌ヨ鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.PageInfo' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 搴撳瓨鐩樼偣鍒楄〃 + tags: + - 搴撳瓨鐩樼偣 + /api-wms/v1/locationProductAmount/update: + post: + parameters: + - description: 鍏ュ簱/鍑哄簱淇℃伅 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.UpdateLocationProductAmount' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 淇敼搴撳瓨鐩樼偣淇℃伅 + tags: + - 搴撳瓨鐩樼偣 /api-wms/v1/operation/finish/{id}: put: parameters: @@ -1316,7 +1980,7 @@ summary: 鍏ュ簱/鍑哄簱鍒楄〃 tags: - 鍏ュ簱/鍑哄簱 - /api-wms/v1/operation/listAll: + /api-wms/v1/operation/listTransfer: post: parameters: - description: 鍙傛暟 @@ -1332,7 +1996,7 @@ description: 鎴愬姛 schema: $ref: '#/definitions/util.Response' - summary: 璋冩嫧 + summary: 搴撳瓨璋冩嫧鍒楄〃 tags: - 鍏ュ簱/鍑哄簱 /api-wms/v1/operation/operation: @@ -1391,6 +2055,22 @@ summary: 淇敼鍏ュ簱/鍑哄簱淇℃伅 tags: - 鍏ュ簱/鍑哄簱 + /api-wms/v1/operationType/listTransfer: + get: + parameters: + - in: query + name: keyword + type: string + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.ResponseList' + summary: 璋冩嫧绫诲瀷鍒楄〃 + tags: + - 涓氬姟绫诲瀷 /api-wms/v1/operationType/operationType: get: parameters: @@ -1702,6 +2382,32 @@ summary: 鎶ュ簾鍒楄〃 tags: - 浜у搧 + /api-wms/v1/product/listHistory: + post: + parameters: + - description: 鏌ヨ鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.QueryOperationHistory' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.ResponseList' + - properties: + data: + items: + $ref: '#/definitions/models.Operation' + type: array + type: object + summary: 浜у搧浣嶇疆鍘嗗彶淇℃伅 + tags: + - 浜у搧 /api-wms/v1/product/listOperaton: post: parameters: @@ -1785,6 +2491,116 @@ summary: 淇敼浜у搧绫诲瀷 tags: - 浜у搧绫诲瀷 + /api-wms/v1/reorderRule/addReorderRule: + post: + parameters: + - description: 閲嶈璐ц鍒� + in: body + name: object + required: true + schema: + $ref: '#/definitions/models.ReorderRule' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 娣诲姞閲嶈璐ц鍒� + tags: + - 閲嶈璐ц鍒� + /api-wms/v1/reorderRule/getAmountAndPrediction: + post: + parameters: + - description: 閲嶈璐ц鍒� + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.GetAmountAndPrediction' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.ResponseList' + - properties: + data: + items: + additionalProperties: true + type: object + type: array + type: object + summary: 鑾峰彇鍦ㄥ簱涓庨娴嬫暟閲� + tags: + - 閲嶈璐ц鍒� + /api-wms/v1/reorderRule/getReorderRuleList: + post: + parameters: + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.GetReorderRuleList' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.ResponseList' + - properties: + data: + items: + $ref: '#/definitions/models.ReorderRule' + type: array + type: object + summary: 鑾峰彇閲嶈璐ц鍒欏垪琛� + tags: + - 閲嶈璐ц鍒� + /api-wms/v1/reorderRule/orderAgain: + post: + parameters: + - description: 閲嶈璐ц鍒� + in: body + name: object + required: true + schema: + $ref: '#/definitions/models.ReorderRule' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 鍐嶈涓�娆� + tags: + - 閲嶈璐ц鍒� + /api-wms/v1/reorderRule/updateReorderRule: + post: + parameters: + - description: 閲嶈璐ц鍒� + in: body + name: object + required: true + schema: + $ref: '#/definitions/models.ReorderRule' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 鏇存柊閲嶈璐ц鍒� + tags: + - 閲嶈璐ц鍒� /api-wms/v1/warehouse/getWarehouseDetails/{id}: get: parameters: -- Gitblit v1.8.0