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 | 667 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 607 insertions(+), 60 deletions(-) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 7c2ffd4..ebfef94 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -184,6 +184,29 @@ - MaterialModeConsumables - MaterialModeOther - MaterialModeVirtual + constvar.OperationSource: + enum: + - 1 + - 2 + - 3 + - 4 + - 5 + - 6 + type: integer + x-enum-comments: + OperationSourceOutsourcing: 濮斿鍏ュ簱 + OperationSourceOutsourcingApply: 濮斿棰嗘枡 + OperationSourceProduction: 鐢熶骇鍏ュ簱 + OperationSourceProductionApply: 鐢熶骇棰嗘枡 + OperationSourcePurchase: 閲囪喘鍏ュ簱 + OperationSourceSaleDelivery: 閿�鍞彂璐� + x-enum-varnames: + - OperationSourcePurchase + - OperationSourceProduction + - OperationSourceOutsourcing + - OperationSourceProductionApply + - OperationSourceOutsourcingApply + - OperationSourceSaleDelivery constvar.OperationStatus: enum: - 1 @@ -288,6 +311,13 @@ - WhetherTypeAsk - WhetherTypeAlways - ReservationNever + inventory_order.WorkerInfo: + properties: + id: + type: string + name: + type: string + type: object models.Attachment: properties: FileUrl: @@ -394,6 +424,45 @@ gorm:"foreignKey:CompanyId"` //鍏徃 updateTime: type: string + warehouse: + allOf: + - $ref: '#/definitions/models.Warehouse' + description: 浠撳簱 + warehouseId: + description: 浠撳簱ID + type: integer + type: object + models.LocationProductAmount: + properties: + amount: + description: 搴撳瓨鏁伴噺 + type: number + createDate: + description: 鏃ユ湡 + type: string + createTime: + type: string + id: + type: integer + location: + $ref: '#/definitions/models.Location' + locationId: + description: |- + LocationProductId int `json:"locationProductId" gorm:"type:int;not null;comment:涓婃灦瑙勫垯id"` //涓婃灦瑙勫垯id + LocationProduct LocationProduct `json:"locationProduct" gorm:"foreignKey:LocationProductId;references:Id"` + type: integer + product: + $ref: '#/definitions/models.Material' + productCategory: + $ref: '#/definitions/models.ProductCategory' + productCategoryId: + description: 浜у搧绉嶇被id + type: integer + productId: + description: 浜у搧id + type: string + updateTime: + type: string type: object models.LogisticCompany: properties: @@ -471,6 +540,10 @@ deliveryAdvanceTime: description: 瀹㈡埛鍓嶇疆鏃堕棿(澶�) type: number + grossUnit: + type: string + grossWeight: + type: number id: type: string inStorageExplain: @@ -528,9 +601,19 @@ - $ref: '#/definitions/constvar.MaterialMode' description: MaterialType constvar.ProductType `gorm:"index;type:int(11);comment:鐗╂枡绫诲瀷(鏁板瓧)" json:"materialType"` + moreUnit: + type: boolean + moreUnitList: + items: + $ref: '#/definitions/models.UnitItems' + type: array name: description: 鐗╂枡鍚嶇О type: string + netUnit: + type: string + netWeight: + type: number note: type: string orderAdvanceTime: @@ -603,8 +686,123 @@ description: 閲嶉噺 type: number type: object + models.MonthStats: + properties: + MoreUnitsArr: + description: 鏈熸湯鍏朵粬鍗曚綅鏁扮粍 + items: + $ref: '#/definitions/models.UnitItems' + type: array + amount: + description: 鏈熸湯缁撲綑鏁伴噺 + type: number + beginAmount: + description: 鏈熷垵鏁伴噺 + type: number + beginMoreUnitsArr: + description: 鏈熷垵鍏朵粬鍗曚綅鏁扮粍 + items: + $ref: '#/definitions/models.UnitItems' + type: array + createTime: + type: string + date: + description: 鏃ユ湡 2024-04 + type: string + id: + type: integer + inputAmount: + description: 鍏ュ簱鏁伴噺 + type: number + inputMoreUnitsArr: + description: 鍏ュ簱鍏朵粬鍗曚綅鏁扮粍 + items: + $ref: '#/definitions/models.UnitItems' + type: array + outputAmount: + description: 鍑哄簱鏁伴噺 + type: number + outputMoreUnitsArr: + description: 鍑哄簱鍏朵粬鍗曚綅鏁扮粍 + items: + $ref: '#/definitions/models.UnitItems' + type: array + productId: + description: 浜у搧id + type: string + productName: + description: 浜у搧鍚嶇О + type: string + unit: + description: 鍗曚綅 + type: string + updateTime: + type: string + weight: + 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: + type: string + accountantId: + type: string auditDate: type: string baseOperationType: @@ -614,7 +812,7 @@ comment: type: string companyID: - type: integer + type: string companyName: type: string contacterID: @@ -622,6 +820,10 @@ contacterName: type: string createTime: + type: string + custodian: + type: string + custodianId: type: string details: items: @@ -643,6 +845,10 @@ logisticWeight: description: 鐗╂祦閲嶉噺 type: number + manager: + type: string + managerId: + type: string number: description: 鍗曞彿 type: string @@ -653,6 +859,10 @@ ToLocationID int `json:"toLocationId" gorm:"type:int;not null;comment:鐩爣浣嶇疆id"` //鐩爣浣嶇疆id ToLocation Location `json:"toLocation" gorm:"foreignKey:ToLocationID;references:Id"` //鐩爣浣嶇疆 type: string + operationSource: + allOf: + - $ref: '#/definitions/constvar.OperationSource' + description: 鎿嶄綔鏉ユ簮 operationTypeId: description: 浣滀笟绫诲瀷id type: integer @@ -664,6 +874,8 @@ receiverName: type: string receiverPhone: + type: string + salesDetailsNumber: type: string source: type: string @@ -696,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: @@ -724,6 +940,10 @@ toLocationId: description: 鐩爣浣嶇疆id type: integer + totalGrossWeight: + type: number + totalNetWeight: + type: number updateTime: type: string type: object @@ -812,6 +1032,16 @@ name: type: string type: object + models.UnitItems: + properties: + amount: + type: number + floating: + description: 鏄惁娴姩鍒╃巼 + type: boolean + unit: + type: string + type: object models.Warehouse: properties: active: @@ -825,8 +1055,6 @@ type: boolean code: description: 浠撳簱缂栫爜 - maxLength: 5 - minLength: 1 type: string company: $ref: '#/definitions/models.Company' @@ -843,7 +1071,7 @@ description: 鍏ュ悜杩愯緭 type: integer locationId: - description: 浣嶇疆id + description: 榛樿浣嶇疆id type: integer name: description: 浠撳簱鍚嶇О @@ -869,8 +1097,6 @@ warehouseLocation: description: 搴撳瓨浣嶇疆 type: string - required: - - code type: object request.AddCompany: properties: @@ -931,12 +1157,16 @@ type: object request.AddOperation: properties: + accountant: + type: string + accountantId: + type: string comment: description: 澶囨敞 type: string companyID: description: 鍏徃ID-瀹㈡埛 - type: integer + type: string companyName: description: 鍏徃鍚嶇О-瀹㈡埛鍚嶇О type: string @@ -945,6 +1175,10 @@ type: integer contacterName: description: 鑱旂郴浜哄鍚�-闈炲繀濉� + type: string + custodian: + type: string + custodianId: type: string details: items: @@ -960,6 +1194,10 @@ logisticWeight: description: 鐗╂祦閲嶉噺 type: number + manager: + type: string + managerId: + type: string number: description: 鍗曞彿 type: string @@ -1089,6 +1327,11 @@ required: - code type: object + request.DoMonthStats: + properties: + token: + type: string + type: object request.FinishLocationProductAmount: properties: locationProductAmountId: @@ -1153,6 +1396,17 @@ description: 鍗曚綅 type: string type: object + request.GetList: + properties: + keyword: + type: string + page: + description: 椤电爜 + type: integer + pageSize: + description: 姣忛〉澶у皬 + type: integer + type: object request.GetLocationForms: properties: keyWord: @@ -1187,6 +1441,19 @@ description: 姣忛〉澶у皬 type: integer type: + type: integer + type: object + request.GetMonthStats: + properties: + date: + type: string + keyword: + type: string + page: + description: 椤电爜 + type: integer + pageSize: + description: 姣忛〉澶у皬 type: integer type: object request.GetProductList: @@ -1262,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:鍗曚綅"` //鍗曚綅 @@ -1273,6 +1546,12 @@ toLocationId: description: 鐩爣浣嶇疆id type: integer + totalGrossWeight: + description: 鎬绘瘺閲� + type: number + totalNetWeight: + description: 鎬诲噣閲� + type: number type: object request.OperationList: properties: @@ -1331,6 +1610,20 @@ description: 姣忛〉澶у皬 type: integer productId: + type: string + type: object + request.SaveUnitDict: + properties: + data: + items: + $ref: '#/definitions/request.UnitDict' + type: array + type: object + request.UnitDict: + properties: + isDefault: + type: boolean + name: type: string type: object request.UpdateCompany: @@ -1429,6 +1722,10 @@ type: object request.UpdateOperation: properties: + accountant: + type: string + accountantId: + type: string baseOperationType: allOf: - $ref: '#/definitions/constvar.BaseOperationType' @@ -1438,7 +1735,7 @@ type: string companyID: description: 鍏徃ID-瀹㈡埛 - type: integer + type: string companyName: description: 鍏徃鍚嶇О-瀹㈡埛鍚嶇О type: string @@ -1447,6 +1744,10 @@ type: integer contacterName: description: 鑱旂郴浜哄鍚�-闈炲繀濉� + type: string + custodian: + type: string + custodianId: type: string details: items: @@ -1462,6 +1763,10 @@ logisticWeight: description: 鐗╂祦閲嶉噺 type: number + manager: + type: string + managerId: + type: string number: description: 鍗曞彿 type: string @@ -1554,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 @@ -1580,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: @@ -1940,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 @@ -1960,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 @@ -1995,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 @@ -2016,6 +2463,37 @@ type: array type: object summary: 鑾峰彇浣嶇疆鎶ヨ〃 + tags: + - 鎶ヨ〃 + /api-wms/v1/forms/monthStats: + 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/location/addLocation: @@ -2255,6 +2733,30 @@ summary: 搴旂敤銆侀獙璇� tags: - 搴撳瓨鐩樼偣 + /api-wms/v1/locationProductAmount/getLocationProductAmount: + 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.Response' + - properties: + data: + $ref: '#/definitions/models.LocationProductAmount' + type: object + summary: 鑾峰彇浣嶇疆浜у搧淇℃伅 + tags: + - 搴撳瓨鐩樼偣 /api-wms/v1/locationProductAmount/getRuleList: post: parameters: @@ -2289,7 +2791,7 @@ name: object required: true schema: - $ref: '#/definitions/request.PageInfo' + $ref: '#/definitions/request.GetList' produces: - application/json responses: @@ -2402,6 +2904,32 @@ schema: $ref: '#/definitions/util.Response' summary: 鍏ュ簱/鍑哄簱鍒楄〃 + tags: + - 鍏ュ簱/鍑哄簱 + /api-wms/v1/operation/getPersonnelList: + get: + parameters: + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.OperationCondition' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.ResponseList' + - properties: + data: + items: + $ref: '#/definitions/inventory_order.WorkerInfo' + type: array + type: object + summary: 鑾峰彇浜哄憳鍒楄〃 tags: - 鍏ュ簱/鍑哄簱 /api-wms/v1/operation/getSupplierList: @@ -2981,6 +3509,25 @@ summary: 浜у搧鍘嗗彶鍑哄叆搴撲俊鎭� tags: - 浜у搧 + /api-wms/v1/product/saveUnitDict: + post: + parameters: + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.SaveUnitDict' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 鏇存柊璁¢噺鍗曚綅瀛楀吀 + tags: + - 鏁版嵁瀛楀吀 /api-wms/v1/product/updateDisuse: post: parameters: -- Gitblit v1.8.0