From d20acf38c36c11ee4428c3e74a17f5870dc61b51 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 16 十一月 2023 09:51:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/SRM
---
docs/swagger.yaml | 222 ++++++++++++++++++++-----------------------------------
1 files changed, 82 insertions(+), 140 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 227f6c2..2d47c09 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -496,7 +496,7 @@
type: number
productId:
description: 浜у搧id
- type: integer
+ type: string
purchaseId:
description: 閲囪喘id
type: integer
@@ -632,6 +632,12 @@
purchase:
$ref: '#/definitions/purchaserequest.Purchase'
type: object
+ request.GetById:
+ properties:
+ id:
+ description: 涓婚敭ID
+ type: integer
+ type: object
request.IdsReq:
properties:
ids:
@@ -646,11 +652,40 @@
$ref: '#/definitions/test.Industry'
type: array
type: object
+ request.Product:
+ properties:
+ categoryName:
+ type: string
+ deliveryTime:
+ type: integer
+ modelNumber:
+ type: string
+ name:
+ type: string
+ number:
+ type: string
+ purchasePrice:
+ type: number
+ shippingDuration:
+ type: integer
+ specifications:
+ type: string
+ supplier:
+ type: string
+ supplierId:
+ type: integer
+ supplierName:
+ type: string
+ supplierNumber:
+ type: string
+ unit:
+ type: string
+ type: object
request.ProductCreate:
properties:
list:
items:
- $ref: '#/definitions/test.Product'
+ $ref: '#/definitions/request.Product'
type: array
type: object
request.SupplierStatus:
@@ -777,46 +812,6 @@
uuid:
type: string
type: object
- test.Product:
- properties:
- created_at:
- type: string
- deliveryTime:
- type: integer
- id:
- description: 涓婚敭ID
- type: integer
- maximumStock:
- type: integer
- minimumStock:
- type: integer
- modelNumber:
- type: string
- name:
- type: string
- number:
- type: string
- productType:
- type: string
- purchasePrice:
- type: number
- remark:
- type: string
- shippingDuration:
- type: integer
- specifications:
- type: string
- supplier:
- $ref: '#/definitions/test.Supplier'
- supplierId:
- type: integer
- supplierName:
- type: string
- unit:
- type: string
- updated_at:
- type: string
- type: object
test.Supplier:
properties:
account:
@@ -857,6 +852,45 @@
updated_at:
type: string
url:
+ type: string
+ type: object
+ test.SupplierMaterial:
+ properties:
+ categoryName:
+ description: 浜у搧绫诲埆鍚嶇О
+ type: string
+ created_at:
+ type: string
+ deliveryTime:
+ description: 渚涜揣鏃堕暱
+ type: integer
+ id:
+ description: 涓婚敭ID
+ type: integer
+ maximumStock:
+ type: integer
+ minimumStock:
+ type: integer
+ modelNumber:
+ type: string
+ name:
+ type: string
+ number:
+ type: string
+ purchasePrice:
+ type: number
+ shippingDuration:
+ description: 鐗╂祦鏃堕暱
+ type: integer
+ specifications:
+ type: string
+ supplier:
+ $ref: '#/definitions/test.Supplier'
+ supplierId:
+ type: integer
+ unit:
+ type: string
+ updated_at:
type: string
type: object
test.SupplierType:
@@ -1562,7 +1596,7 @@
name: data
required: true
schema:
- $ref: '#/definitions/test.Product'
+ $ref: '#/definitions/request.GetById'
produces:
- application/json
responses:
@@ -1603,58 +1637,10 @@
consumes:
- application/json
parameters:
- - in: query
- name: created_at
- type: string
- - in: query
- name: deliveryTime
- type: integer
- description: 涓婚敭ID
in: query
name: id
type: integer
- - in: query
- name: maximumStock
- type: integer
- - in: query
- name: minimumStock
- type: integer
- - in: query
- name: modelNumber
- type: string
- - in: query
- name: name
- type: string
- - in: query
- name: number
- type: string
- - in: query
- name: productType
- type: string
- - in: query
- name: purchasePrice
- type: number
- - in: query
- name: remark
- type: string
- - in: query
- name: shippingDuration
- type: integer
- - in: query
- name: specifications
- type: string
- - in: query
- name: supplierId
- type: integer
- - in: query
- name: supplierName
- type: string
- - in: query
- name: unit
- type: string
- - in: query
- name: updated_at
- type: string
produces:
- application/json
responses:
@@ -1673,28 +1659,15 @@
- application/json
parameters:
- in: query
- name: created_at
+ name: categoryName
type: string
- in: query
name: deliveryTime
- type: integer
- - in: query
- name: endCreatedAt
- type: string
- - description: 涓婚敭ID
- in: query
- name: id
type: integer
- description: 鍏抽敭瀛�
in: query
name: keyword
type: string
- - in: query
- name: maximumStock
- type: integer
- - in: query
- name: minimumStock
- type: integer
- in: query
name: modelNumber
type: string
@@ -1713,14 +1686,8 @@
name: pageSize
type: integer
- in: query
- name: productType
- type: string
- - in: query
name: purchasePrice
type: number
- - in: query
- name: remark
- type: string
- in: query
name: shippingDuration
type: integer
@@ -1728,7 +1695,7 @@
name: specifications
type: string
- in: query
- name: startCreatedAt
+ name: supplier
type: string
- in: query
name: supplierId
@@ -1741,9 +1708,6 @@
type: string
- in: query
name: unit
- type: string
- - in: query
- name: updated_at
type: string
produces:
- application/json
@@ -1763,28 +1727,15 @@
- application/json
parameters:
- in: query
- name: created_at
+ name: categoryName
type: string
- in: query
name: deliveryTime
- type: integer
- - in: query
- name: endCreatedAt
- type: string
- - description: 涓婚敭ID
- in: query
- name: id
type: integer
- description: 鍏抽敭瀛�
in: query
name: keyword
type: string
- - in: query
- name: maximumStock
- type: integer
- - in: query
- name: minimumStock
- type: integer
- in: query
name: modelNumber
type: string
@@ -1803,14 +1754,8 @@
name: pageSize
type: integer
- in: query
- name: productType
- type: string
- - in: query
name: purchasePrice
type: number
- - in: query
- name: remark
- type: string
- in: query
name: shippingDuration
type: integer
@@ -1818,7 +1763,7 @@
name: specifications
type: string
- in: query
- name: startCreatedAt
+ name: supplier
type: string
- in: query
name: supplierId
@@ -1831,9 +1776,6 @@
type: string
- in: query
name: unit
- type: string
- - in: query
- name: updated_at
type: string
produces:
- application/json
@@ -1857,7 +1799,7 @@
name: data
required: true
schema:
- $ref: '#/definitions/test.Product'
+ $ref: '#/definitions/test.SupplierMaterial'
produces:
- application/json
responses:
--
Gitblit v1.8.0