From 73a3d53bfcfa0fde7b9ea2a14c8bcfea42ebf3ad Mon Sep 17 00:00:00 2001 From: lishihai <dslsh@dscom> Date: 星期四, 13 六月 2024 10:50:00 +0800 Subject: [PATCH] 概述(一级模块)-入库(二级模块)-新建时保存新建单据人信息;验证时保存验证人信息 --- docs/swagger.yaml | 334 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 279 insertions(+), 55 deletions(-) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index d32b9c0..ebfef94 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -742,6 +742,61 @@ description: 閲嶉噺 type: number type: object + models.MoveHistory: + properties: + amount: + description: 鏁伴噺 + type: number + baseOperationType: + allOf: + - $ref: '#/definitions/constvar.BaseOperationType' + description: 鍩虹浣滀笟绫诲瀷 + createTime: + type: string + fromLocation: + description: 婧愪綅缃� + type: string + fromLocationId: + description: 婧愪綅缃甶d + type: integer + id: + type: integer + number: + description: 鍗曞彿 + type: string + operationId: + description: 鎿嶄綔id + type: integer + operationTypeId: + description: 浣滀笟绫诲瀷id + type: integer + operationTypeName: + description: 浣滀笟绫诲瀷鍚嶇О + type: string + operator: + description: 鎿嶄綔鑰� + type: string + productId: + description: 浜у搧id + type: string + productName: + description: 浜у搧鍚嶇О + type: string + toLocation: + description: 鐩爣浣嶇疆 + type: string + toLocationId: + description: 鐩爣浣嶇疆id + type: integer + unit: + description: 鍗曚綅 + type: string + updateTime: + type: string + weight: + description: 閲嶉噺 + type: number + type: object models.Operation: properties: accountant: @@ -757,7 +812,7 @@ comment: type: string companyID: - type: integer + type: string companyName: type: string contacterID: @@ -853,6 +908,10 @@ description: ProductName string `json:"productName" gorm:"type:varchar(255);not null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О type: number + auxiliaryAmount: + type: number + auxiliaryUnit: + type: string createTime: type: string fromLocation: @@ -978,6 +1037,7 @@ amount: type: number floating: + description: 鏄惁娴姩鍒╃巼 type: boolean unit: type: string @@ -1106,7 +1166,7 @@ type: string companyID: description: 鍏徃ID-瀹㈡埛 - type: integer + type: string companyName: description: 鍏徃鍚嶇О-瀹㈡埛鍚嶇О type: string @@ -1267,6 +1327,11 @@ required: - code type: object + request.DoMonthStats: + properties: + token: + type: string + type: object request.FinishLocationProductAmount: properties: locationProductAmountId: @@ -1330,6 +1395,17 @@ unit: description: 鍗曚綅 type: string + type: object + request.GetList: + properties: + keyword: + type: string + page: + description: 椤电爜 + type: integer + pageSize: + description: 姣忛〉澶у皬 + type: integer type: object request.GetLocationForms: properties: @@ -1453,6 +1529,12 @@ description: ProductName string `json:"productName" gorm:"type:varchar(255);not null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О type: number + auxiliaryAmount: + description: 杈呭姪鏁伴噺 + type: number + auxiliaryUnit: + description: 杈呭姪鍗曚綅 + type: string fromLocationId: description: |- Unit string `json:"unit" gorm:"type:varchar(31);comment:鍗曚綅"` //鍗曚綅 @@ -1653,7 +1735,7 @@ type: string companyID: description: 鍏徃ID-瀹㈡埛 - type: integer + type: string companyName: description: 鍏徃鍚嶇О-瀹㈡埛鍚嶇О type: string @@ -1777,18 +1859,38 @@ amount: description: 鍦ㄥ簱鏁伴噺 type: number + amountMoreUnits: + description: 鍦ㄥ簱鏁伴噺澶氬崟浣� + items: + $ref: '#/definitions/models.UnitItems' + type: array availableNumber: description: 鍙敤搴撳瓨 type: number + availableNumberMoreUnits: + description: 鍙敤搴撳瓨澶氬崟浣� + items: + $ref: '#/definitions/models.UnitItems' + type: array cost: description: 鎴愭湰 type: number in: description: 鍏ュ簱 type: number + inMoreUnits: + description: 鍏ュ簱澶氬崟浣� + items: + $ref: '#/definitions/models.UnitItems' + type: array out: description: 鍑哄簱 type: number + outMoreUnits: + description: 鍑哄簱澶氬崟浣� + items: + $ref: '#/definitions/models.UnitItems' + type: array produceId: description: 浜у搧id type: string @@ -1803,54 +1905,6 @@ 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 - fromLocationId: - type: integer - number: - description: 鍗曞彿 - type: string - operationId: - type: integer - operationTypeName: - description: 浣滀笟绫诲瀷鍚嶇О - type: string - productId: - type: string - productName: - description: 浜у搧鍚嶇О - type: string - status: - description: 鐘舵�� - type: string - toLocation: - description: 鐩爣浣嶇疆 - type: string - toLocationId: - type: integer - unit: - description: 鍗曚綅 - type: string - weight: - description: 閲嶉噺 type: number type: object response.LocationForms: @@ -2163,9 +2217,45 @@ summary: 缂栬緫鍏徃 tags: - 鍏徃 - /api-wms/v1/forms/getHistory: + /api-wms/v1/forms/doMonthStats: post: parameters: + - description: 鏌ヨ鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.DoMonthStats' + - description: token + in: header + name: Authorization + required: true + type: string + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.ResponseList' + - properties: + data: + items: + $ref: '#/definitions/models.MonthStats' + type: array + type: object + summary: 鎵嬪姩璺戞湀搴︾粺璁″簱瀛樻姤琛� + tags: + - 鎶ヨ〃 + /api-wms/v1/forms/downloadHistory: + post: + parameters: + - description: token + in: header + name: Authorization + required: true + type: string - description: 鏌ヨ鍙傛暟 in: body name: object @@ -2183,15 +2273,144 @@ - properties: data: items: - $ref: '#/definitions/response.InventoryHistory' + $ref: '#/definitions/models.MoveHistory' type: array type: object - summary: 鑾峰彇鍘嗗彶淇℃伅 + summary: 涓嬭浇鍑哄叆搴撴槑缁嗘姤琛� + tags: + - 鎶ヨ〃 + /api-wms/v1/forms/downloadInventoryForms: + post: + parameters: + - description: token + in: header + name: Authorization + required: true + type: string + - 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/downloadLocationForms: + post: + parameters: + - description: token + in: header + name: Authorization + required: true + type: string + - 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/forms/downloadMonthStats: + post: + parameters: + - description: 鏌ヨ鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.GetMonthStats' + - description: token + in: header + name: Authorization + required: true + type: string + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.ResponseList' + - properties: + data: + items: + $ref: '#/definitions/models.MonthStats' + type: array + type: object + summary: 涓嬭浇鏈堝害缁熻搴撳瓨鎶ヨ〃 + tags: + - 鎶ヨ〃 + /api-wms/v1/forms/getHistory: + post: + parameters: + - description: token + in: header + name: Authorization + required: true + type: string + - 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/models.MoveHistory' + type: array + type: object + summary: 鑾峰彇鍑哄叆搴撴槑缁� tags: - 鎶ヨ〃 /api-wms/v1/forms/getInventoryForms: post: parameters: + - description: token + in: header + name: Authorization + required: true + type: string - description: 鏌ヨ鍙傛暟 in: body name: object @@ -2218,6 +2437,11 @@ /api-wms/v1/forms/getLocationForms: post: parameters: + - description: token + in: header + name: Authorization + required: true + type: string - description: 鏌ヨ鍙傛暟 in: body name: object @@ -2567,7 +2791,7 @@ name: object required: true schema: - $ref: '#/definitions/request.PageInfo' + $ref: '#/definitions/request.GetList' produces: - application/json responses: -- Gitblit v1.8.0