From 16e06252079d36be7686a3d006c8b73565973c68 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 18 十二月 2023 21:04:08 +0800
Subject: [PATCH] 全文搜索支持时间查询
---
docs/swagger.yaml | 456 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 446 insertions(+), 10 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index c318180..83761e3 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1,4 +1,45 @@
definitions:
+ code.CodeAuto:
+ properties:
+ AutoLength:
+ type: integer
+ Desc:
+ type: string
+ PrefixMethod:
+ type: integer
+ PrefixValue:
+ type: string
+ SuffixMethod:
+ type: integer
+ type: object
+ code.CodeRule:
+ properties:
+ Desc:
+ type: string
+ Length:
+ type: integer
+ Name:
+ type: string
+ type: object
+ code.CodeStandard:
+ properties:
+ AutoRule:
+ $ref: '#/definitions/code.CodeAuto'
+ ID:
+ type: string
+ List:
+ items:
+ $ref: '#/definitions/code.CodeRule'
+ type: array
+ Method:
+ type: integer
+ Name:
+ type: string
+ Status:
+ type: string
+ Type:
+ type: string
+ type: object
constvar.BaseOperationType:
enum:
- 1
@@ -33,6 +74,20 @@
- CostingMethodStandardPrice
- CostingMethodFIFO
- CostingMethodAverageCost
+ constvar.FileType:
+ enum:
+ - file
+ - picture
+ - thumbnail
+ type: string
+ x-enum-comments:
+ FileType_File: 鏂囦欢
+ FileType_Picture: 鍥剧墖
+ FileType_Thumbnail: 缂╃暐鍥�
+ x-enum-varnames:
+ - FileType_File
+ - FileType_Picture
+ - FileType_Thumbnail
constvar.ForceRemovalStrategy:
enum:
- 1
@@ -122,8 +177,10 @@
- 2
- 3
- 4
+ - 5
type: integer
x-enum-comments:
+ OperationStatus_Cancel: 瀹屾垚
OperationStatus_Draft: 鑽夌
OperationStatus_Finish: 瀹屾垚
OperationStatus_Ready: 灏辩华
@@ -133,6 +190,7 @@
- OperationStatus_Waiting
- OperationStatus_Ready
- OperationStatus_Finish
+ - OperationStatus_Cancel
constvar.OrderCreation:
enum:
- 1
@@ -164,6 +222,20 @@
- Consumables
- Server
- StoredProduct
+ constvar.PurchaseType:
+ enum:
+ - 1
+ - 2
+ - 3
+ type: integer
+ x-enum-comments:
+ PurchaseTypeEntrust: 濮斿
+ PurchaseTypeOutSource: 閲囪喘
+ PurchaseTypeSelf: 鑷埗
+ x-enum-varnames:
+ - PurchaseTypeOutSource
+ - PurchaseTypeSelf
+ - PurchaseTypeEntrust
constvar.ReservationMethod:
enum:
- 1
@@ -203,6 +275,19 @@
- WhetherTypeAsk
- WhetherTypeAlways
- ReservationNever
+ models.Attachment:
+ properties:
+ FileUrl:
+ type: string
+ ext:
+ type: string
+ fileName:
+ type: string
+ fileType:
+ $ref: '#/definitions/constvar.FileType'
+ id:
+ type: integer
+ type: object
models.Company:
properties:
createTime:
@@ -297,11 +382,40 @@
updateTime:
type: string
type: object
+ models.LogisticCompany:
+ properties:
+ contact:
+ description: 鑱旂郴浜�
+ type: string
+ contact_phone:
+ description: 鑱旂郴鐢佃瘽
+ type: string
+ hidden:
+ description: 闅愯棌
+ type: boolean
+ id:
+ type: string
+ monthly_account:
+ description: 鏈堢粨璐﹀彿
+ type: string
+ name:
+ type: string
+ type: object
models.Material:
properties:
amount:
description: 鏁伴噺
type: number
+ attachmentIDs:
+ items:
+ type: integer
+ type: array
+ attachmentList:
+ items:
+ $ref: '#/definitions/models.Attachment'
+ type: array
+ autoIncr:
+ type: integer
barcode:
description: 鏉＄爜
type: string
@@ -316,6 +430,10 @@
type: integer
categoryName:
description: 浜у搧绫诲埆鍚嶇О
+ type: string
+ codeStandardID:
+ description: Explain string `gorm:"type:varchar(512);comment:缂栧彿璇存槑"
+ json:"explain"`
type: string
companyId:
description: 鍏徃id
@@ -347,6 +465,8 @@
OriginCountryId int `gorm:"type:int(11);comment:鍘熶骇鍦癷d" json:"originCountryId"` //鍘熶骇鍦癷d
OriginCountryName string `gorm:"type:varchar(255);comment:鍘熶骇鍦板悕绉�" json:"originCountryName"` //鍘熶骇鍦板悕绉�
type: string
+ inputAmount:
+ type: number
internalNotes:
description: 鍐呴儴璇存槑
type: string
@@ -361,8 +481,7 @@
- $ref: '#/definitions/constvar.InvoicingStrategy'
description: 寮�绁ㄧ瓥鐣�
isSale:
- description: PurchaseType constvar.PurchaseType `gorm:"type:int(11);comment:閲囪喘绫诲瀷"
- json:"purchaseType"`
+ description: 鏄惁閿�鍞�
type: boolean
makeAdvanceTime:
description: 鍒堕�犲墠缃椂闂�(澶�)
@@ -370,12 +489,14 @@
maxInventory:
description: 鏈�澶у簱瀛�
type: number
+ maxInventoryRule:
+ description: 鏈�澶у簱瀛�
+ type: number
minInventory:
- description: |-
- Explain string `gorm:"type:varchar(512);comment:缂栧彿璇存槑" json:"explain"`
- CodeStandardID string `gorm:"type:varchar(191);comment:缂栫爜瑙勮寖ID" json:"codeStandardID"`
- Specs string `gorm:"type:varchar(191);comment:鐗╂枡瑙勬牸" json:"specs"`
- Type string `gorm:"type:varchar(191);comment:鐗╂枡鍨嬪彿" json:"type"`
+ description: 鏈�灏忓簱瀛�
+ type: number
+ minInventoryRule:
+ description: 鏈�灏忓簱瀛�
type: number
minPurchaseAmount:
description: |-
@@ -390,6 +511,8 @@
name:
description: 鐗╂枡鍚嶇О
type: string
+ note:
+ type: string
orderAdvanceTime:
description: 璁㈠崟鍑嗗澶╂暟(澶�)
type: number
@@ -400,6 +523,10 @@
outStorageExplain:
description: 鍑哄簱璇存槑
type: string
+ outputAmount:
+ type: number
+ predictionAmount:
+ type: number
principal:
description: 璐熻矗浜�
type: string
@@ -416,6 +543,10 @@
purchasePrice:
description: 閲囪喘浠锋牸
type: number
+ purchaseType:
+ $ref: '#/definitions/constvar.PurchaseType'
+ reorderRuleNum:
+ type: integer
salePrice:
description: 閿�鍞崟浠�
type: number
@@ -425,14 +556,17 @@
sellExplain:
description: 閿�鍞鏄�
type: string
+ specs:
+ 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"`
+ description: 妯℃澘ID
+ type: string
+ type:
type: string
unit:
description: LockAmount decimal.Decimal `gorm:"type:decimal(35,18);default:0;comment:閿佸畾鏁伴噺"
@@ -447,6 +581,8 @@
type: object
models.Operation:
properties:
+ auditDate:
+ type: string
baseOperationType:
allOf:
- $ref: '#/definitions/constvar.BaseOperationType'
@@ -476,6 +612,13 @@
type: integer
id:
type: integer
+ logisticCompany:
+ $ref: '#/definitions/models.LogisticCompany'
+ logisticCompanyId:
+ type: string
+ logisticWeight:
+ description: 鐗╂祦閲嶉噺
+ type: number
number:
description: 鍗曞彿
type: string
@@ -486,6 +629,12 @@
type: integer
operationTypeName:
description: 浣滀笟绫诲瀷鍚嶇О
+ type: string
+ receiverAddr:
+ type: string
+ receiverName:
+ type: string
+ receiverPhone:
type: string
sourceNumber:
description: 婧愬崟鍙�
@@ -503,6 +652,12 @@
type: integer
updateTime:
type: string
+ waybillNumber:
+ description: 杩愬崟鍙�
+ type: string
+ weight:
+ description: 閲嶉噺
+ type: number
type: object
models.OperationDetails:
properties:
@@ -533,6 +688,8 @@
allOf:
- $ref: '#/definitions/constvar.CostingMethod'
description: 鎴愭湰鏂规硶
+ createTime:
+ type: string
forceRemovalStrategy:
allOf:
- $ref: '#/definitions/constvar.ForceRemovalStrategy'
@@ -554,6 +711,8 @@
type: integer
routeName:
description: 鍏徃
+ type: string
+ updateTime:
type: string
type: object
models.ReorderRule:
@@ -590,6 +749,9 @@
route:
description: 璺嚎
type: string
+ supplierId:
+ description: 渚涘簲鍟唅d
+ type: integer
unit:
description: 鍗曚綅
type: string
@@ -733,6 +895,11 @@
type: integer
id:
type: integer
+ logisticCompanyId:
+ type: string
+ logisticWeight:
+ description: 鐗╂祦閲嶉噺
+ type: number
number:
description: 鍗曞彿
type: string
@@ -745,6 +912,12 @@
operationTypeName:
description: 浣滀笟绫诲瀷鍚嶇О
type: string
+ receiverAddr:
+ type: string
+ receiverName:
+ type: string
+ receiverPhone:
+ type: string
sourceNumber:
description: 婧愬崟鍙�
type: string
@@ -755,6 +928,12 @@
toLocationId:
description: 鐩爣浣嶇疆id
type: integer
+ waybillNumber:
+ description: 杩愬崟鍙�
+ type: string
+ weight:
+ description: 閲嶉噺
+ type: number
type: object
request.AddOperationType:
properties:
@@ -913,6 +1092,8 @@
properties:
keyWord:
type: string
+ locationId:
+ type: integer
page:
description: 椤电爜
type: integer
@@ -923,6 +1104,25 @@
type: string
wareHouseCode:
type: string
+ type: object
+ request.GetLocationList:
+ properties:
+ isScrapLocation:
+ description: 鏄惁鎶ュ簾
+ type: boolean
+ jointName:
+ description: 鎷兼帴鍚嶇О
+ type: string
+ keyWord:
+ type: string
+ page:
+ description: 椤电爜
+ type: integer
+ pageSize:
+ description: 姣忛〉澶у皬
+ type: integer
+ type:
+ type: integer
type: object
request.GetProductList:
properties:
@@ -949,6 +1149,8 @@
pageSize:
description: 姣忛〉澶у皬
type: integer
+ productId:
+ type: string
type:
description: 绫诲瀷:bh=琛ヨ揣
type: string
@@ -1171,6 +1373,11 @@
type: integer
id:
type: integer
+ logisticCompanyId:
+ type: string
+ logisticWeight:
+ description: 鐗╂祦閲嶉噺
+ type: number
number:
description: 鍗曞彿
type: string
@@ -1183,6 +1390,12 @@
operationTypeName:
description: 浣滀笟绫诲瀷鍚嶇О
type: string
+ receiverAddr:
+ type: string
+ receiverName:
+ type: string
+ receiverPhone:
+ type: string
sourceNumber:
description: 婧愬崟鍙�
type: string
@@ -1193,6 +1406,12 @@
toLocationId:
description: 鐩爣浣嶇疆id
type: integer
+ waybillNumber:
+ description: 杩愬崟鍙�
+ type: string
+ weight:
+ description: 閲嶉噺
+ type: number
type: object
request.UpdateOperationType:
properties:
@@ -1295,8 +1514,14 @@
fromLocation:
description: 婧愪綅缃�
type: string
+ fromLocationId:
+ type: integer
number:
description: 鍗曞彿
+ type: string
+ operationId:
+ type: integer
+ productId:
type: string
productName:
description: 浜у搧鍚嶇О
@@ -1307,9 +1532,14 @@
toLocation:
description: 鐩爣浣嶇疆
type: string
+ toLocationId:
+ type: integer
unit:
description: 鍗曚綅
type: string
+ weight:
+ description: 閲嶉噺
+ type: number
type: object
response.LocationForms:
properties:
@@ -1456,6 +1686,78 @@
summary: 缂栬緫閮ㄩ棬淇℃伅
tags:
- 閮ㄩ棬淇℃伅
+ /api-wms/v1/attachment/uploadFiles:
+ post:
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 涓婁紶闄勪欢
+ tags:
+ - 闄勪欢绠＄悊
+ /api-wms/v1/code/getAutoCode:
+ post:
+ parameters:
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/code.CodeStandard'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ additionalProperties: true
+ type: object
+ type: object
+ summary: 鑾峰彇鑷姩缂栫爜
+ tags:
+ - 缂栫爜
+ /api-wms/v1/code/getCodeList:
+ get:
+ parameters:
+ - in: query
+ name: codeStandID
+ type: string
+ - in: query
+ name: name
+ type: string
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ type: integer
+ - in: query
+ name: type
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/code.CodeStandard'
+ type: array
+ type: object
+ summary: 鑾峰彇缂栫爜鍒楄〃
+ tags:
+ - 缂栫爜
/api-wms/v1/company/company:
get:
parameters:
@@ -1692,7 +1994,7 @@
name: object
required: true
schema:
- $ref: '#/definitions/request.GetProductList'
+ $ref: '#/definitions/request.GetLocationList'
produces:
- application/json
responses:
@@ -1925,6 +2227,24 @@
summary: 淇敼搴撳瓨鐩樼偣淇℃伅
tags:
- 搴撳瓨鐩樼偣
+ /api-wms/v1/operation/cancel/{id}:
+ put:
+ parameters:
+ - description: id
+ in: path
+ name: id
+ required: true
+ type: integer
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鍙栨秷
+ tags:
+ - 鍏ュ簱/鍑哄簱
/api-wms/v1/operation/finish/{id}:
put:
parameters:
@@ -1941,6 +2261,67 @@
schema:
$ref: '#/definitions/util.Response'
summary: 鏇存敼璁板綍鐘舵��
+ tags:
+ - 鍏ュ簱/鍑哄簱
+ /api-wms/v1/operation/getClientList:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鑾峰彇鐗╂祦鍏徃鍒楄〃
+ tags:
+ - 鍏ュ簱/鍑哄簱
+ /api-wms/v1/operation/getLogisticCompanyList:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/models.LogisticCompany'
+ type: array
+ type: object
+ summary: 鑾峰彇鐗╂祦鍏徃鍒楄〃
+ tags:
+ - 鍏ュ簱/鍑哄簱
+ /api-wms/v1/operation/getOperationInfo/{id}:
+ get:
+ parameters:
+ - 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/operation/getSupplierList:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鑾峰彇鐗╂祦鍏徃鍒楄〃
tags:
- 鍏ュ簱/鍑哄簱
/api-wms/v1/operation/list:
@@ -2016,6 +2397,24 @@
schema:
$ref: '#/definitions/util.Response'
summary: 鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅
+ tags:
+ - 鍏ュ簱/鍑哄簱
+ /api-wms/v1/operation/outputOperation/{id}:
+ put:
+ parameters:
+ - description: id
+ in: path
+ name: id
+ required: true
+ type: integer
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鎵撳嵃
tags:
- 鍏ュ簱/鍑哄簱
/api-wms/v1/operation/update:
@@ -2193,6 +2592,24 @@
summary: 娣诲姞浜у搧绫诲瀷
tags:
- 浜у搧绫诲瀷
+ /api-wms/v1/product/cancelDisuse/{id}:
+ put:
+ parameters:
+ - description: id
+ in: path
+ name: id
+ required: true
+ type: integer
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鍙栨秷鎶ュ簾
+ tags:
+ - 浜у搧
/api-wms/v1/product/deleteProduct/{id}:
delete:
parameters:
@@ -2564,6 +2981,25 @@
summary: 鍐嶈涓�娆�
tags:
- 閲嶈璐ц鍒�
+ /api-wms/v1/reorderRule/submitOrder:
+ post:
+ parameters:
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/models.ReorderRule'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 鍐嶈涓�娆�
+ tags:
+ - 閲嶈璐ц鍒�
/api-wms/v1/reorderRule/updateReorderRule:
post:
parameters:
--
Gitblit v1.8.0