From 71659c0770605f8401cd484682b4b05ac3b58cd4 Mon Sep 17 00:00:00 2001 From: liujiandao <274878379@qq.com> Date: 星期四, 18 四月 2024 16:10:50 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/silk/silkServer --- docs/swagger.yaml | 952 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 946 insertions(+), 6 deletions(-) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 2370fa4..da57293 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -6,13 +6,33 @@ - 3 type: integer x-enum-comments: - AllCar: 鍏ㄨ溅 + AllCar: 鍏ㄨ溅缁撴潫 LeftHalfCar: 宸﹀崐杞� RightHalfCar: 鍙冲崐杞� x-enum-varnames: - LeftHalfCar - RightHalfCar - AllCar + constvar.CheckItem: + enum: + - 1 + - 2 + - 3 + - 4 + - 5 + type: integer + x-enum-comments: + CheckItemCleanliness: 娓呮磥鍒� + CheckItemDeviation: 绾ゅ害鍋忓樊 + CheckItemMaxDeviation: 鏈�澶у亸宸� + CheckItemPurity: 娲佸噣鍒� + CheckItemTwiceChange: 浜屾鍙樺寲 + x-enum-varnames: + - CheckItemDeviation + - CheckItemTwiceChange + - CheckItemCleanliness + - CheckItemPurity + - CheckItemMaxDeviation constvar.DictType: enum: - 0 @@ -62,6 +82,100 @@ updatedAt: type: string type: object + models.FinenessCheck: + properties: + averageFineness: + description: 骞冲潎绾ゅ害 + type: number + cleanliness: + description: 娓呮磥搴� + type: number + createdAt: + type: string + deletedAt: + $ref: '#/definitions/gorm.DeletedAt' + deviation: + description: 鍋忓樊 + type: number + finenessGrade: + description: 绾ゅ害绛夌骇 + type: string + finenessRegister: + allOf: + - $ref: '#/definitions/models.FinenessRegister' + description: 绾ゅ害鐧昏 + finenessRegisterID: + description: 绾ゅ害鐧昏琛↖D + type: integer + id: + type: integer + inspector: + description: 妫�楠屽憳 + type: string + marketProcessOrderNumber: + description: 搴勫彛宸ヨ壓鍗曠紪鍙� + type: string + measureFineness: + description: 鍏噺绾ゅ害 + type: number + purity: + description: 娲佸噣搴� + type: number + totalDeviation: + description: 鎬诲樊 + type: number + twiceChange: + description: 浜屽害鍙樺寲 + type: number + updatedAt: + type: string + type: object + models.FinenessCheckItem: + properties: + cleanliness: + description: 娓呮磥搴� + type: number + createdAt: + type: string + deletedAt: + $ref: '#/definitions/gorm.DeletedAt' + deviation: + description: 鍋忓樊 + type: number + finenessCheckID: + description: 绾ゅ害妫�楠岃〃ID + type: integer + finenessGrade: + description: 绾ゅ害绛夌骇 + type: string + finenessRegisterID: + description: 绾ゅ害鐧昏琛↖D + type: integer + finenessRoundingItems: + description: 绾ゅ害鍒楄〃 + items: + $ref: '#/definitions/models.FinenessRoundingItem' + type: array + id: + type: integer + position: + description: 杞﹀彿 + type: integer + purity: + description: 娲佸噣搴� + type: number + remark: + description: 澶囨敞 + type: string + totalDeviation: + description: 鎬诲樊 + type: number + twiceChange: + description: 浜屽害鍙樺寲 + type: number + updatedAt: + type: string + type: object models.FinenessItem: properties: createdAt: @@ -80,7 +194,7 @@ type: integer quantity: description: 鏁伴噺 - type: number + type: integer sum: description: 绾ゅ害鍚堣 type: number @@ -96,6 +210,9 @@ type: string deletedAt: $ref: '#/definitions/gorm.DeletedAt' + finenessCheckID: + description: 绾ゅ害妫�楠岃〃ID + type: integer finenessList: items: $ref: '#/definitions/models.FinenessItem' @@ -114,6 +231,9 @@ number: description: 缂栧彿 type: string + position: + description: 鏈�鍚庝竴涓溅鍙� + type: integer spec: description: 瑙勬牸 type: string @@ -128,7 +248,16 @@ type: string workshopGroup: description: 杞︾粍 - type: string + type: integer + type: object + models.FinenessRoundingItem: + properties: + fineness: + description: 绾ゅ害 + type: number + quantity: + description: 鏁伴噺 + type: integer type: object models.RawSilkPriceStandard: properties: @@ -138,13 +267,15 @@ $ref: '#/definitions/gorm.DeletedAt' id: type: integer - marketNumber: + marketId: + type: integer + marketName: type: string notes: type: string payStandard: type: number - rawSilkGradeNumber: + rawSilkGrade: type: string unit: type: string @@ -171,8 +302,141 @@ type: integer updatedAt: type: string + workshopName: + type: string workshopNumber: type: string + type: object + models.YieldRegister: + properties: + bucketCocoonNumber: + type: number + circle: + type: integer + circles: + items: + $ref: '#/definitions/models.YieldRegisterCircle' + type: array + createTime: + type: string + createdAt: + type: string + deletedAt: + $ref: '#/definitions/gorm.DeletedAt' + fallingSilkBucketOne: + type: number + fallingSilkBucketThree: + type: number + fallingSilkBucketTwo: + type: number + fallingSilkCocoonNumber: + type: number + groupNumber: + type: integer + groupReelingdiscount: + type: string + hourYield: + type: number + id: + type: integer + items: + items: + $ref: '#/definitions/models.YieldRegisterItem' + type: array + jieZhuang: + type: string + level: + type: string + marketId: + type: integer + marketName: + description: 搴勫彛鍚� + type: string + number: + type: string + oneBack: + type: string + record: + type: number + selectOne: + type: boolean + selectThree: + type: boolean + selectTwo: + type: boolean + spec: + type: string + theorySilkAmount: + type: number + threeBack: + type: string + timeJia: + type: string + timeYi: + type: string + total: + type: number + twoBack: + type: string + updatedAt: + type: string + vehicleSpeed: + type: number + workshopName: + description: 杞﹂棿鍚� + type: string + workshopNumber: + type: string + type: object + models.YieldRegisterCircle: + properties: + allYield: + type: number + carNumber: + type: integer + circle: + type: integer + createdAt: + type: string + deletedAt: + $ref: '#/definitions/gorm.DeletedAt' + id: + type: integer + oneYield: + type: number + pieceNumber: + type: integer + reelingdiscount: + type: string + updatedAt: + type: string + value: + type: number + yieldRegisterId: + type: integer + type: object + models.YieldRegisterItem: + properties: + carNumber: + type: integer + createdAt: + type: string + deletedAt: + $ref: '#/definitions/gorm.DeletedAt' + hourYield: + type: number + id: + type: integer + oneYield: + type: number + peopleYield: + type: number + personReelingdiscount: + type: string + updatedAt: + type: string + yieldRegisterId: + type: integer type: object request.AddDict: properties: @@ -215,6 +479,9 @@ number: description: 缂栧彿 type: string + position: + description: 鏈�鍚庝竴涓溅鍙� + type: integer spec: description: 瑙勬牸 type: string @@ -229,7 +496,37 @@ type: integer workshopGroup: description: 杞︾粍 + type: integer + type: object + request.ChangeYieldRegister: + properties: + createTime: + description: 鍒涘缓鏃堕棿 type: string + groupNumber: + description: 缁勫埆 + type: integer + marketId: + description: 搴勫彛id + type: integer + spec: + description: 瑙勬牸 + type: string + workshopNumber: + description: 杞﹂棿缂栫爜 + type: string + type: object + request.DynamicsRank: + properties: + rankName: + description: 绛夌骇鍚嶇О + type: string + rankProp: + description: 鍓嶇紑key + type: string + rankValue: + description: 绛夌骇鍊� + type: number type: object request.FinenessItem: properties: @@ -241,10 +538,79 @@ type: integer quantity: description: 鏁伴噺 - type: number + type: integer sum: description: 鍚堣 type: number + type: object + request.GetWorkshopManageCar: + properties: + groupNumber: + description: 缁勫埆 + type: integer + marketName: + description: /搴勫彛鍚� + type: string + workshopName: + description: 杞﹂棿鍚嶇О + type: string + type: object + request.GetYieldRegisterList: + properties: + keyWord: + type: string + number: + description: 浜ч噺鐧昏琛ㄧ紪鍙� + type: string + page: + description: 椤电爜 + type: integer + pageSize: + description: 姣忛〉澶у皬 + type: integer + type: object + request.PieceInfo: + properties: + pieceNumber: + type: integer + value: + type: number + type: object + request.RankStandard: + properties: + checkItem: + allOf: + - $ref: '#/definitions/constvar.CheckItem' + description: 妫�鏌ラ」鐩悕绉� + dynamicsRanks: + items: + $ref: '#/definitions/request.DynamicsRank' + type: array + endFineness: + description: 缁撴潫绾ゅ害 + type: number + lineId: + description: 琛宨d + type: string + rankA: + description: 閲庣氦 + type: number + rankB: + description: 澶ч噹 + type: number + rankC: + description: 鐗归噹 + type: number + startFineness: + description: 寮�濮嬬氦搴� + type: number + type: object + request.SaveRankStandard: + properties: + rankStandard: + items: + $ref: '#/definitions/request.RankStandard' + type: array type: object request.UpdateDict: properties: @@ -263,6 +629,211 @@ remark: description: 澶囨敞 type: string + type: object + request.YieldRegisterCircleInfo: + properties: + allYield: + description: 浜ч噺 + type: number + carNumber: + description: 杞﹀彿 + type: integer + circle: + description: 鍥炴暟 + type: integer + oneYield: + description: 鍙颁骇 + type: number + pieceNumbers: + description: 鐗囨暟淇℃伅 + items: + $ref: '#/definitions/request.PieceInfo' + type: array + reelingdiscount: + description: 缂姌 + type: string + yieldRegisterId: + description: 浜ч噺鐧昏琛╥d + type: integer + type: object + request.YieldRegisterInfo: + properties: + bucketCocoonNumber: + description: 姣忔《鑼ф暟 + type: number + circle: + description: 鍥炴暟 + type: integer + circles: + items: + $ref: '#/definitions/request.YieldRegisterCircleInfo' + type: array + createTime: + description: 鍒涘缓鏃堕棿 + type: string + fallingSilkBucketOne: + description: 钀戒笣妗舵暟1 + type: number + fallingSilkBucketThree: + description: 钀戒笣妗舵暟3 + type: number + fallingSilkBucketTwo: + description: 钀戒笣妗舵暟2 + type: number + fallingSilkCocoonNumber: + description: 钀戒笣鑼ф暟 + type: number + groupNumber: + description: 缁勫埆 + type: integer + groupReelingdiscount: + description: 杞︾粍缂姌 + type: string + hourYield: + description: 鍙版椂浜ч噺 + type: number + id: + type: integer + items: + items: + $ref: '#/definitions/request.YieldRegisterItemInfo' + type: array + jieZhuang: + description: 鏄惁缁撳簞 + type: string + level: + description: 绛夌骇 + type: string + marketId: + description: 搴勫彛id + type: integer + number: + description: 缂栧彿 + type: string + oneBack: + description: 绗竴鍥� + type: string + record: + description: 鐢熶骇鐢ㄦ椂 + type: number + selectOne: + description: 钀戒笣妗舵暟1閫変腑 + type: boolean + selectThree: + description: 钀戒笣妗舵暟3閫変腑 + type: boolean + selectTwo: + description: 钀戒笣妗舵暟2閫変腑 + type: boolean + spec: + description: 瑙勬牸 + type: string + theorySilkAmount: + description: 鐞嗚涓濋噺 + type: number + threeBack: + description: 绗笁鍥� + type: string + timeJia: + description: 鐢茬彮鏃堕棿 + type: string + timeYi: + description: 涔欑彮鏃堕棿 + type: string + total: + description: 鎬讳骇閲� + type: number + twoBack: + description: 绗簩鍥� + type: string + vehicleSpeed: + description: 瀹炴椂杞﹂�� + type: number + workshopNumber: + description: 杞﹂棿缂栫爜 + type: string + type: object + request.YieldRegisterItemInfo: + properties: + carNumber: + description: 杞﹀彿 + type: integer + hourYield: + description: 鍙版椂浜ч噺 + type: number + oneYield: + description: 鍙颁骇閲� + type: number + peopleYield: + description: 涓汉浜ч噺 + type: number + personReelingdiscount: + description: 涓汉缂姌 + type: string + yieldRegisterId: + description: 浜ч噺鐧昏琛╥d + type: integer + type: object + response.CarAndLevel: + properties: + car: + items: + items: + type: integer + type: array + type: array + level: + type: string + type: object + response.DynamicsRank: + properties: + rankName: + description: 绛夌骇鍚嶇О + type: string + rankProp: + description: 鍓嶇紑key + type: string + rankValue: + description: 绛夌骇鍊� + type: number + type: object + response.FinenessCheckInfo: + properties: + info: + $ref: '#/definitions/models.FinenessCheck' + items: + items: + $ref: '#/definitions/models.FinenessCheckItem' + type: array + type: object + response.RankStandard: + properties: + checkItem: + allOf: + - $ref: '#/definitions/constvar.CheckItem' + description: 妫�鏌ラ」鐩悕绉� + dynamicsRanks: + items: + $ref: '#/definitions/response.DynamicsRank' + type: array + endFineness: + description: 缁撴潫绾ゅ害 + type: number + lineId: + description: 琛宨d + type: string + rankA: + description: 閲庣氦 + type: number + rankB: + description: 澶ч噹 + type: number + rankC: + description: 鐗归噹 + type: number + startFineness: + description: 寮�濮嬬氦搴� + type: number type: object util.Response: properties: @@ -288,9 +859,193 @@ info: contact: {} paths: + /api-jl/v1/fineness/changeYieldRegister: + post: + parameters: + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.ChangeYieldRegister' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.Response' + - properties: + data: + $ref: '#/definitions/models.YieldRegister' + type: object + summary: 鍒囨崲浜ч噺鐧昏琛� + tags: + - 鐢熶骇绠$悊/浜ч噺鐧昏琛� + /api-jl/v1/fineness/check: + get: + parameters: + - in: query + name: keyword + type: string + - description: 椤电爜 + in: query + name: page + type: integer + - description: 姣忛〉澶у皬 + in: query + name: pageSize + type: integer + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.ResponseList' + - properties: + data: + items: + $ref: '#/definitions/models.FinenessCheck' + type: array + type: object + summary: 绾ゅ害妫�楠屽垪琛� + tags: + - 绾ゅ害妫�楠� + post: + parameters: + - description: 瀛楀吀淇℃伅 + in: body + name: object + required: true + schema: + $ref: '#/definitions/models.FinenessCheck' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 绾ゅ害妫�楠屼慨鏀� + tags: + - 绾ゅ害妫�楠� + /api-jl/v1/fineness/check/{id}: + delete: + parameters: + - description: 瀛楀吀淇℃伅 + in: path + name: id + required: true + type: string + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 绾ゅ害妫�楠屽垹闄� + tags: + - 绾ゅ害妫�楠� + get: + parameters: + - description: 瀛楀吀淇℃伅 + in: path + name: id + required: true + type: string + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.ResponseList' + - properties: + data: + $ref: '#/definitions/response.FinenessCheckInfo' + type: object + summary: 绾ゅ害妫�楠岃鎯� + tags: + - 绾ゅ害妫�楠� + /api-jl/v1/fineness/deleteYieldRegister/{number}: + delete: + parameters: + - description: number + in: path + name: number + required: true + type: string + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 鍒犻櫎浜ч噺鐧昏琛ㄨ褰� + tags: + - 鐢熶骇绠$悊/浜ч噺鐧昏琛� + /api-jl/v1/fineness/getYieldRegisterInfo: + post: + parameters: + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.GetYieldRegisterList' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.Response' + - properties: + data: + $ref: '#/definitions/request.YieldRegisterInfo' + type: object + summary: 鑾峰彇浜ч噺鐧昏琛ㄨ鎯� + tags: + - 鐢熶骇绠$悊/浜ч噺鐧昏琛� + /api-jl/v1/fineness/getYieldRegisterList: + post: + parameters: + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.GetYieldRegisterList' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.ResponseList' + - properties: + data: + items: + $ref: '#/definitions/models.YieldRegister' + type: array + type: object + summary: 鑾峰彇浜ч噺鐧昏琛� + tags: + - 鐢熶骇绠$悊/浜ч噺鐧昏琛� /api-jl/v1/fineness/register: get: parameters: + - in: query + name: keyword + type: string - description: 椤电爜 in: query name: page @@ -324,6 +1079,11 @@ required: true schema: $ref: '#/definitions/request.AddFinenessRegister' + - description: token + in: header + name: Authorization + required: true + type: string produces: - application/json responses: @@ -374,6 +1134,25 @@ summary: 绾ゅ害鐧昏璇︽儏 tags: - 绾ゅ害鐧昏 + /api-jl/v1/fineness/saveYieldRegister: + post: + parameters: + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.YieldRegisterInfo' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 淇濆瓨浜ч噺鐧昏琛� + tags: + - 鐢熶骇绠$悊/浜ч噺鐧昏琛� /api-jl/v1/system/deletePriceStandard/{id}: delete: parameters: @@ -432,6 +1211,10 @@ - DictTypeWorkshop - DictTypeColor - DictTypeSpec + - description: 鎼滅储鍏抽敭瀛� + in: query + name: keyword + type: string - description: 椤电爜 in: query name: page @@ -511,6 +1294,66 @@ summary: 鍒犻櫎瀛楀吀 tags: - 绯荤粺璁剧疆/瀛楀吀 + /api-jl/v1/system/getCarAndLevel: + post: + parameters: + - description: token + in: header + name: Authorization + required: true + type: string + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.GetWorkshopManageCar' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.Response' + - properties: + data: + $ref: '#/definitions/response.CarAndLevel' + type: object + summary: 鑾峰彇杞﹁締缂栧彿鍜岀瓑绾� + tags: + - 绯荤粺璁剧疆/杞﹂棿绠$悊 + /api-jl/v1/system/getCarNumber: + post: + parameters: + - description: token + in: header + name: Authorization + required: true + type: string + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.GetWorkshopManageCar' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.Response' + - properties: + data: + items: + type: integer + type: array + type: object + summary: 鑾峰彇杞﹁締缂栧彿 + tags: + - 绯荤粺璁剧疆/杞﹂棿绠$悊 /api-jl/v1/system/getPriceStandardList: get: parameters: @@ -542,9 +1385,82 @@ summary: 鑾峰彇鐢熶笣瀹氫环鏍囧噯 tags: - 绯荤粺璁剧疆/鐢熶笣瀹氫环鏍囧噯 + /api-jl/v1/system/getRankStandard: + get: + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.ResponseList' + - properties: + data: + items: + $ref: '#/definitions/response.RankStandard' + type: array + type: object + summary: 鑾峰彇鐢熶笣瀹氱骇鏍囧噯 + tags: + - 绯荤粺璁剧疆/鐢熶笣瀹氱骇鏍囧噯 + /api-jl/v1/system/getRankStandardGrade: + get: + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.Response' + - properties: + data: + additionalProperties: + type: string + type: object + type: object + summary: 鑾峰彇鐢熶笣绛夌骇 + tags: + - 绯荤粺璁剧疆/鐢熶笣瀹氱骇鏍囧噯 + /api-jl/v1/system/getWorkshopManageGroup/{number}: + get: + parameters: + - description: token + in: header + name: Authorization + required: true + type: string + - description: number + in: path + name: number + required: true + type: string + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + allOf: + - $ref: '#/definitions/util.Response' + - properties: + data: + additionalProperties: + type: integer + type: object + type: object + summary: 鑾峰彇杞﹂棿缁勫埆 + tags: + - 绯荤粺璁剧疆/杞﹂棿绠$悊 /api-jl/v1/system/getWorkshopManageList: get: parameters: + - description: token + in: header + name: Authorization + required: true + type: string - in: query name: keyWord type: string @@ -592,6 +1508,25 @@ summary: 淇濆瓨鐢熶笣瀹氫环鏍囧噯 tags: - 绯荤粺璁剧疆/鐢熶笣瀹氫环鏍囧噯 + /api-jl/v1/system/saveRankStandard: + post: + parameters: + - description: 鍙傛暟 + in: body + name: object + required: true + schema: + $ref: '#/definitions/request.SaveRankStandard' + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 淇濆瓨鐢熶笣瀹氱骇鏍囧噯 + tags: + - 绯荤粺璁剧疆/鐢熶笣瀹氱骇鏍囧噯 /api-jl/v1/system/saveWorkshopManage: post: parameters: @@ -601,6 +1536,11 @@ required: true schema: $ref: '#/definitions/models.WorkshopManage' + - description: token + in: header + name: Authorization + required: true + type: string produces: - application/json responses: -- Gitblit v1.8.0