From 6becb6b281b34e17197a25af86acd35628e88811 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期三, 20 九月 2023 17:51:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
docs/swagger.yaml | 304 ++++++++++++++++++++++++++++++-------------------
1 files changed, 185 insertions(+), 119 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 2dc5f06..a30050d 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -138,6 +138,20 @@
- Task
- Object
- TaskAndObject
+ constvar.ProductType:
+ enum:
+ - 1
+ - 2
+ - 3
+ type: integer
+ x-enum-comments:
+ Consumables: 娑堣�楀搧
+ Server: 鏈嶅姟
+ StoredProduct: 鍙偍瀛樼殑浜у搧
+ x-enum-varnames:
+ - Consumables
+ - Server
+ - StoredProduct
constvar.ReservationMethod:
enum:
- 1
@@ -232,7 +246,7 @@
type: string
parentId:
description: 涓婄骇id
- type: integer
+ type: string
replenishLocation:
description: 鏄惁琛ュ厖浣嶇疆
type: boolean
@@ -246,13 +260,16 @@
models.Material:
properties:
HSCode:
+ description: HS缂栫爜
type: string
amount:
+ description: 鏁伴噺
type: number
barcode:
description: 鏉＄爜
type: string
buyExplain:
+ description: 閲囪喘璇存槑
type: string
canBePurchased:
description: 鏄惁鍙噰璐�
@@ -260,25 +277,35 @@
categoryId:
description: 浜у搧绫诲埆id
type: integer
+ categoryName:
+ description: 浜у搧绫诲埆鍚嶇О
+ type: string
companyId:
+ description: 鍏徃id
type: integer
companyName:
+ description: 鍏徃鍚嶇О
type: string
controlStrategy:
- $ref: '#/definitions/constvar.InvoicingStrategy'
+ allOf:
+ - $ref: '#/definitions/constvar.InvoicingStrategy'
+ description: 鎺у埗绛栫暐
cost:
description: 鎴愭湰
type: number
currencyName:
+ description: 甯佺鍚嶇О
type: string
customerTaxes:
description: 瀹㈡埛绋庣櫨鍒嗘瘮
type: number
deliveryAdvanceTime:
+ description: 浜よ揣鎻愬墠鏃堕棿(澶�)
type: integer
id:
type: string
inStorageExplain:
+ description: 鍏ュ簱璇存槑
type: string
internalNotes:
description: 鍐呴儴璇存槑
@@ -287,16 +314,18 @@
description: 鍐呴儴鍙傝��
type: string
internalTransferExplain:
+ description: 鍐呴儴璋冩嫧璇存槑
type: string
invoicingStrategy:
allOf:
- $ref: '#/definitions/constvar.InvoicingStrategy'
- description: wms娣诲姞瀛楁
+ description: 寮�绁ㄧ瓥鐣�
isSale:
description: PurchaseType constvar.PurchaseType `gorm:"type:int(11);comment:閲囪喘绫诲瀷"
json:"purchaseType"`
type: boolean
maxInventory:
+ description: 鏈�澶у簱瀛�
type: number
minInventory:
description: |-
@@ -316,35 +345,54 @@
description: MaterialType constvar.ProductType `gorm:"index;type:int(11);comment:鐗╂枡绫诲瀷(鏁板瓧)"
json:"materialType"`
name:
+ description: 鐗╂枡鍚嶇О
type: string
orderCreation:
- $ref: '#/definitions/constvar.OrderCreation'
+ allOf:
+ - $ref: '#/definitions/constvar.OrderCreation'
+ description: 璁㈠崟鍒涘缓
originCountryId:
+ description: 鍘熶骇鍦癷d
type: integer
originCountryName:
+ description: 鍘熶骇鍦板悕绉�
type: string
outStorageExplain:
+ description: 鍑哄簱璇存槑
type: string
principal:
description: 璐熻矗浜�
type: string
productTagId:
- description: 浜у搧鏍囩
+ description: 浜у搧鏍囩id
type: integer
productTagName:
+ description: 浜у搧鏍囩鍚嶇О
type: string
+ productType:
+ allOf:
+ - $ref: '#/definitions/constvar.ProductType'
+ description: wms娣诲姞瀛楁
purchasePrice:
+ description: 閲囪喘浠锋牸
type: number
salePrice:
+ description: 閿�鍞崟浠�
type: number
selectProduct:
+ description: 鍙�変骇鍝乮d
type: integer
sellExplain:
+ description: 閿�鍞鏄�
type: string
supplier:
description: |-
FSource string `gorm:"type:varchar(191);comment:鐢熶骇杞﹂棿" json:"-"`
Status constvar.MaterialStatus `gorm:"type:int(11);comment:鐘舵��" json:"status"`
+ type: string
+ templateID:
+ description: Note string `gorm:"type:varchar(1024);comment:澶囨敞"
+ json:"note"`
type: string
unit:
description: LockAmount decimal.Decimal `gorm:"type:decimal(35,18);default:0;comment:閿佸畾鏁伴噺"
@@ -450,6 +498,7 @@
description: 涓婄骇id
type: integer
routeId:
+ description: 璺嚎id
type: integer
routeName:
description: 鍏徃
@@ -460,6 +509,9 @@
active:
description: 鏄惁鍚敤锛屼紶true灏辫
type: boolean
+ address:
+ description: 鍦板潃
+ type: string
buyToResupply:
description: 鏄惁璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
type: boolean
@@ -476,9 +528,18 @@
type: string
id:
type: integer
+ inboundTransportation:
+ description: 鍏ュ悜杩愯緭
+ type: integer
+ locationId:
+ description: 浣嶇疆id
+ type: integer
name:
description: 浠撳簱鍚嶇О
type: string
+ outboundTransportation:
+ description: 鍑哄簱杩愯緭
+ type: integer
partnerId:
description: 鍚堜綔浼欎即id
type: integer
@@ -493,6 +554,9 @@
type: string
type: array
updateTime:
+ type: string
+ warehouseLocation:
+ description: 搴撳瓨浣嶇疆
type: string
required:
- code
@@ -618,6 +682,9 @@
active:
description: 鏄惁鍚敤锛屼紶true灏辫
type: boolean
+ address:
+ description: 鍦板潃
+ type: string
buyToResupply:
description: 璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
type: boolean
@@ -626,9 +693,18 @@
maxLength: 5
minLength: 1
type: string
+ inboundTransportation:
+ description: 鍏ュ悜杩愯緭
+ type: integer
+ locationId:
+ description: 浣嶇疆id
+ type: integer
name:
description: 浠撳簱鍚嶇О
type: string
+ outboundTransportation:
+ description: 鍑哄簱杩愯緭
+ type: integer
partnerId:
description: 鍚堜綔浼欎即id
type: integer
@@ -785,35 +861,6 @@
warehouseId:
description: 浠撳簱id
type: integer
- type: object
- request.UpdateWarehouse:
- properties:
- active:
- description: 鏄惁鍚敤锛屼紶true灏辫
- type: boolean
- buyToResupply:
- description: 璐拱琛ョ粰锛屽凡璐拱浜у搧鑳藉鍙戦�佸埌姝や粨搴�
- type: boolean
- code:
- description: 浠撳簱缂栫爜
- maxLength: 5
- minLength: 1
- type: string
- id:
- type: integer
- name:
- description: 浠撳簱鍚嶇О
- type: string
- partnerId:
- description: 鍚堜綔浼欎即id
- type: integer
- resupplyWhIds:
- description: 琛ョ粰鏉ユ簮浠撳簱ID
- items:
- type: string
- type: array
- required:
- - code
type: object
util.Response:
properties:
@@ -1098,6 +1145,96 @@
summary: 淇敼鍏ュ簱/鍑哄簱淇℃伅
tags:
- 鍏ュ簱/鍑哄簱
+ /api-wms/v1/operationType/operationType:
+ 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.OperationType'
+ type: array
+ type: object
+ summary: 鏌ヨ浣滀笟绫诲瀷鍒楄〃
+ tags:
+ - 浣滀笟绫诲瀷
+ post:
+ parameters:
+ - description: 浣滀笟绫诲瀷淇℃伅
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.AddOperationType'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 娣诲姞浣滀笟绫诲瀷
+ tags:
+ - 浣滀笟绫诲瀷
+ /api-wms/v1/operationType/operationType/{id}:
+ delete:
+ parameters:
+ - description: 浣滀笟绫诲瀷id
+ in: path
+ name: id
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鍒犻櫎浣滀笟绫诲瀷
+ tags:
+ - 浣滀笟绫诲瀷
+ put:
+ parameters:
+ - description: 浣滀笟绫诲瀷淇℃伅
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.UpdateOperationType'
+ - description: 浣滀笟绫诲瀷id
+ in: path
+ name: id
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 缂栬緫浣滀笟绫诲瀷
+ tags:
+ - 浣滀笟绫诲瀷
/api-wms/v1/product/addProduct:
post:
parameters:
@@ -1308,20 +1445,14 @@
summary: 淇敼浜у搧绫诲瀷
tags:
- 浜у搧绫诲瀷
- /api-wms/v1/warehouse/operationType:
+ /api-wms/v1/warehouse/getWarehouseDetails/{id}:
get:
parameters:
- - in: query
- name: keyword
+ - description: 浠撳簱id
+ in: path
+ name: id
+ required: true
type: string
- - description: 椤电爜
- in: query
- name: page
- type: integer
- - description: 姣忛〉澶у皬
- in: query
- name: pageSize
- type: integer
produces:
- application/json
responses:
@@ -1329,24 +1460,23 @@
description: 鎴愬姛
schema:
allOf:
- - $ref: '#/definitions/util.ResponseList'
+ - $ref: '#/definitions/util.Response'
- properties:
data:
- items:
- $ref: '#/definitions/models.OperationType'
- type: array
+ $ref: '#/definitions/models.Warehouse'
type: object
- summary: 鏌ヨ浣滀笟绫诲瀷鍒楄〃
+ summary: 鑾峰彇浠撳簱璇︽儏
tags:
- - 浣滀笟绫诲瀷
+ - 浠撳簱
+ /api-wms/v1/warehouse/updateWarehouse:
post:
parameters:
- - description: 浣滀笟绫诲瀷淇℃伅
+ - description: 浠撳簱淇℃伅
in: body
name: object
required: true
schema:
- $ref: '#/definitions/request.AddOperationType'
+ $ref: '#/definitions/models.Warehouse'
produces:
- application/json
responses:
@@ -1354,50 +1484,9 @@
description: 鎴愬姛
schema:
$ref: '#/definitions/util.Response'
- summary: 娣诲姞浣滀笟绫诲瀷
+ summary: 缂栬緫浠撳簱
tags:
- - 浣滀笟绫诲瀷
- /api-wms/v1/warehouse/operationType/{id}:
- delete:
- parameters:
- - description: 浣滀笟绫诲瀷id
- in: path
- name: id
- required: true
- type: string
- produces:
- - application/json
- responses:
- "200":
- description: 鎴愬姛
- schema:
- $ref: '#/definitions/util.Response'
- summary: 鍒犻櫎浣滀笟绫诲瀷
- tags:
- - 浣滀笟绫诲瀷
- put:
- parameters:
- - description: 浣滀笟绫诲瀷淇℃伅
- in: body
- name: object
- required: true
- schema:
- $ref: '#/definitions/request.UpdateOperationType'
- - description: 浣滀笟绫诲瀷id
- in: path
- name: id
- required: true
- type: string
- produces:
- - application/json
- responses:
- "200":
- description: 鎴愬姛
- schema:
- $ref: '#/definitions/util.Response'
- summary: 缂栬緫浣滀笟绫诲瀷
- tags:
- - 浣滀笟绫诲瀷
+ - 浠撳簱
/api-wms/v1/warehouse/warehouse:
get:
parameters:
@@ -1463,29 +1552,6 @@
schema:
$ref: '#/definitions/util.Response'
summary: 鍒犻櫎浠撳簱
- tags:
- - 浠撳簱
- put:
- parameters:
- - description: 浠撳簱淇℃伅
- in: body
- name: object
- required: true
- schema:
- $ref: '#/definitions/request.UpdateWarehouse'
- - description: 浠撳簱id
- in: path
- name: id
- required: true
- type: string
- produces:
- - application/json
- responses:
- "200":
- description: 鎴愬姛
- schema:
- $ref: '#/definitions/util.Response'
- summary: 缂栬緫浠撳簱
tags:
- 浠撳簱
swagger: "2.0"
--
Gitblit v1.8.0