From b97b0ba40ae012e59cd3bba0960f485aae86bb13 Mon Sep 17 00:00:00 2001 From: liujiandao <274878379@qq.com> Date: 星期二, 26 九月 2023 09:31:04 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS --- docs/swagger.yaml | 116 ++++++---------------------------------------------------- 1 files changed, 12 insertions(+), 104 deletions(-) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index d43edc4..81acff3 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -478,7 +478,8 @@ models.OperationDetails: properties: amount: - description: 鏁伴噺 + description: ProductName string `json:"productName" gorm:"type:varchar(255);not + null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О type: number createTime: type: string @@ -487,92 +488,15 @@ operationId: description: 鎿嶄綔id type: integer + product: + allOf: + - $ref: '#/definitions/models.Material' + description: Unit string `json:"unit" gorm:"type:varchar(31);comment:鍗曚綅"` //鍗曚綅 productId: description: 浜у搧id type: string - productName: - description: 浜у搧鍚嶇О - type: string - unit: - type: string updateTime: type: string - type: object - models.OperationType: - properties: - ReservationDaysBeforePriority: - description: 鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ - type: integer - baseOperationType: - allOf: - - $ref: '#/definitions/constvar.BaseOperationType' - description: 鍩虹浣滀笟绫诲瀷 - company: - allOf: - - $ref: '#/definitions/models.Company' - description: 鍏徃 - companyId: - description: 鍏徃id - type: integer - createBackorder: - allOf: - - $ref: '#/definitions/constvar.WhetherType' - description: 鍒涘缓娆犲崟 - createTime: - type: string - defaultLocationDest: - allOf: - - $ref: '#/definitions/models.Location' - description: 榛樿鐩爣浣嶇疆 - defaultLocationDestId: - description: 榛樿鐩爣浣嶇疆id - type: integer - defaultLocationSrc: - allOf: - - $ref: '#/definitions/models.Location' - description: 榛樿婧愪綅缃� - defaultLocationSrcId: - description: 榛樿婧愪綅缃甶d - type: integer - earlyOperations: - description: 棰勫~鍐欎綔涓氳鎯� - type: boolean - id: - type: integer - name: - description: 浠撳簱鍚嶇О - type: string - prefix: - description: 鍓嶇紑 - type: string - printLabel: - description: 鏄惁鎵撳嵃鏍囩 - type: boolean - reservationDaysBefore: - description: 鏀惰揣鍓嶅嚑澶� - type: integer - reservationMethod: - allOf: - - $ref: '#/definitions/constvar.ReservationMethod' - description: 淇濈暀鏂瑰紡 - returnOperationType: - description: 閫�璐х被鍨嬪悕绉� - type: string - returnOperationTypeID: - description: 閫�璐х被鍨婭D - type: integer - showOperations: - description: 鏄剧ず浣滀笟璇︽儏 - type: boolean - updateTime: - type: string - warehouse: - allOf: - - $ref: '#/definitions/models.Warehouse' - description: 浠撳簱 - warehouseId: - description: 浠撳簱id - type: integer type: object models.ProductCategory: properties: @@ -684,19 +608,16 @@ request.AddDisuse: properties: amount: + description: ProductName string `json:"productName"` type: number fromLocationId: type: integer productId: type: string - productName: - type: string sourceNumber: type: string toLocationId: type: integer - unit: - type: string type: object request.AddOperation: properties: @@ -865,15 +786,11 @@ description: 鎿嶄綔id type: integer amount: - description: 鏁伴噺 + description: ProductName string `json:"productName" gorm:"type:varchar(255);not + null;comment:浜у搧鍚嶇О"` //浜у搧鍚嶇О type: number productId: description: 浜у搧id - type: string - productName: - description: 浜у搧鍚嶇О - type: string - unit: type: string type: object request.OperationList: @@ -943,18 +860,18 @@ request.UpdateDisuse: properties: amount: + description: ProductName string `json:"productName"` type: number fromLocationId: type: integer id: type: integer number: + description: Unit string `json:"unit"` type: string operationDate: type: string productId: - type: string - productName: type: string sourceNumber: type: string @@ -962,8 +879,6 @@ $ref: '#/definitions/constvar.OperationStatus' toLocationId: type: integer - unit: - type: string type: object request.UpdateOperation: properties: @@ -1496,14 +1411,7 @@ "200": description: 鎴愬姛 schema: - allOf: - - $ref: '#/definitions/util.ResponseList' - - properties: - data: - items: - $ref: '#/definitions/models.OperationType' - type: array - type: object + $ref: '#/definitions/util.ResponseList' summary: 鏌ヨ浣滀笟绫诲瀷鍒楄〃 tags: - 涓氬姟绫诲瀷 -- Gitblit v1.8.0