From 9b60ddba27ef778419da5089e3b30ebe173afd7d Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期五, 28 六月 2024 14:24:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jialian' into jialian
---
docs/swagger.yaml | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 221 insertions(+), 4 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index f99e6fd..83f23c2 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -74,6 +74,17 @@
- CostingMethodStandardPrice
- CostingMethodFIFO
- CostingMethodAverageCost
+ constvar.FileTemplateCategory:
+ enum:
+ - 1
+ - 2
+ type: integer
+ x-enum-comments:
+ FileTemplateCategory_Output: 鍑哄簱
+ FileTemplateCategory_Selfmade: 鍏ュ簱-鑷埗
+ x-enum-varnames:
+ - FileTemplateCategory_Selfmade
+ - FileTemplateCategory_Output
constvar.FileType:
enum:
- file
@@ -297,6 +308,14 @@
x-enum-varnames:
- RuleType_Product
- RuleType_ProductCategory
+ constvar.SystemConfigType:
+ enum:
+ - 1
+ type: integer
+ x-enum-comments:
+ SystemConfigTypeInventoryCutOffPoint: 搴撳瓨缁撶畻鏃堕棿鐐�
+ x-enum-varnames:
+ - SystemConfigTypeInventoryCutOffPoint
constvar.WhetherType:
enum:
- 1
@@ -540,7 +559,7 @@
type: array
autoIncr:
type: integer
- barcode:
+ barCode:
description: 鏉＄爜
type: string
buyExplain:
@@ -926,6 +945,8 @@
type: string
receiverPhone:
type: string
+ remark:
+ type: string
salesDetailsNumber:
type: string
source:
@@ -946,6 +967,8 @@
type: integer
updateTime:
type: string
+ warehouseId:
+ type: integer
waybillNumber:
description: 杩愬崟鍙�
type: string
@@ -1085,6 +1108,25 @@
updateTime:
type: string
type: object
+ models.SystemConfig:
+ properties:
+ configType:
+ allOf:
+ - $ref: '#/definitions/constvar.SystemConfigType'
+ description: 姣忔湀搴撳瓨缁撶畻鏃堕棿鐐�
+ createTime:
+ type: string
+ id:
+ type: integer
+ name:
+ description: 璁剧疆鍚嶇О
+ type: string
+ updateTime:
+ type: string
+ val:
+ description: 璁剧疆鍊�
+ type: string
+ type: object
models.UnitDict:
properties:
id:
@@ -1127,6 +1169,10 @@
type: string
createTime:
type: string
+ fileTemplateCategoryIn:
+ $ref: '#/definitions/constvar.FileTemplateCategory'
+ fileTemplateCategoryOut:
+ $ref: '#/definitions/constvar.FileTemplateCategory'
id:
type: integer
inboundTransportation:
@@ -1248,6 +1294,10 @@
type: string
accountantId:
type: string
+ baseOperationType:
+ allOf:
+ - $ref: '#/definitions/constvar.BaseOperationType'
+ description: 鍩虹浣滀笟绫诲瀷 5搴撳瓨鐩樼偣
comment:
description: 澶囨敞
type: string
@@ -1314,6 +1364,9 @@
description: 鐘舵��
toLocationId:
description: 鐩爣浣嶇疆id
+ type: integer
+ warehouseId:
+ description: 浠撳簱id
type: integer
waybillNumber:
description: 杩愬崟鍙�
@@ -1672,6 +1725,10 @@
type: object
request.OperationList:
properties:
+ baseOperationType:
+ allOf:
+ - $ref: '#/definitions/constvar.BaseOperationType'
+ description: 1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣
number:
type: string
operationTypeId:
@@ -1735,6 +1792,21 @@
items:
$ref: '#/definitions/request.UnitDict'
type: array
+ type: object
+ request.SystemConfig:
+ properties:
+ ID:
+ type: integer
+ configType:
+ allOf:
+ - $ref: '#/definitions/constvar.SystemConfigType'
+ description: 1 姣忔湀搴撳瓨缁撶畻鏃堕棿鐐�
+ name:
+ description: 璁剧疆鍚嶇О
+ type: string
+ val:
+ description: 璁剧疆鍊�
+ type: string
type: object
request.UnitDict:
properties:
@@ -2217,7 +2289,7 @@
tags:
- 闄勪欢绠＄悊
/api-wms/v1/attribute/attribute:
- post:
+ get:
parameters:
- description: 灞炴�у�煎拰瀵硅薄淇℃伅
in: body
@@ -2235,6 +2307,29 @@
summary: 娣诲姞灞炴�у�煎拰瀵硅薄
tags:
- 灞炴�у�煎拰瀵硅薄
+ post:
+ parameters:
+ - description: 灞炴�т俊鎭�
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.AddAttribute'
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 娣诲姞灞炴��
+ tags:
+ - 灞炴��
/api-wms/v1/attribute/delete/{id}:
delete:
parameters:
@@ -3577,7 +3672,25 @@
description: 鎴愬姛
schema:
$ref: '#/definitions/util.Response'
- summary: 鍒犻櫎浜у搧
+ summary: 閫氳繃浜у搧/鍟嗗搧/鐗╂枡 ID鍒犻櫎浜у搧
+ tags:
+ - 浜у搧
+ /api-wms/v1/product/deleteProductByBarCode/{barCode}:
+ delete:
+ parameters:
+ - description: barCode
+ in: path
+ name: barCode
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 閫氳繃浜у搧/鍟嗗搧/鐗╂枡 鏉″舰鐮佸垹闄や骇鍝�
tags:
- 浜у搧
/api-wms/v1/product/deleteProductCategory/{id}:
@@ -3668,6 +3781,11 @@
/api-wms/v1/product/getProductDetails/{id}:
get:
parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
- description: id
in: path
name: id
@@ -3685,7 +3803,35 @@
data:
$ref: '#/definitions/models.Material'
type: object
- summary: 鑾峰彇浜у搧璇︽儏
+ summary: 閫氳繃浜у搧/鍟嗗搧/鐗╂枡 ID鑾峰彇浜у搧璇︽儏
+ tags:
+ - 浜у搧
+ /api-wms/v1/product/getProductDetailsByBarCode/{barCode}:
+ get:
+ parameters:
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ - description: barCode
+ in: path
+ name: barCode
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.Response'
+ - properties:
+ data:
+ $ref: '#/definitions/models.Material'
+ type: object
+ summary: 閫氳繃浜у搧/鍟嗗搧/鐗╂枡 鏉″舰鐮� 鑾峰彇浜у搧璇︽儏
tags:
- 浜у搧
/api-wms/v1/product/getProductList:
@@ -3753,6 +3899,19 @@
- 浜у搧
/api-wms/v1/product/inputProduct:
post:
+ consumes:
+ - multipart/form-data
+ parameters:
+ - description: file
+ in: formData
+ name: file
+ required: true
+ type: file
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
produces:
- application/xlsx
responses:
@@ -4039,6 +4198,64 @@
summary: 鏇存柊閲嶈璐ц鍒�
tags:
- 閲嶈璐ц鍒�
+ /api-wms/v1/systemConfig/get:
+ get:
+ parameters:
+ - description: 1 姣忔湀搴撳瓨缁撶畻鏃堕棿鐐�
+ enum:
+ - 1
+ in: query
+ name: configType
+ required: true
+ type: integer
+ x-enum-comments:
+ SystemConfigTypeInventoryCutOffPoint: 搴撳瓨缁撶畻鏃堕棿鐐�
+ x-enum-varnames:
+ - SystemConfigTypeInventoryCutOffPoint
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/util.Response'
+ - properties:
+ data:
+ $ref: '#/definitions/models.SystemConfig'
+ type: object
+ summary: 鏍规嵁璁剧疆绫诲瀷鏌ヨ绯荤粺璁剧疆
+ tags:
+ - 绯荤粺璁剧疆
+ /api-wms/v1/systemConfig/save:
+ post:
+ parameters:
+ - description: 绯荤粺璁剧疆淇℃伅
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.SystemConfig'
+ - description: token
+ in: header
+ name: Authorization
+ required: true
+ type: string
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/util.Response'
+ summary: 淇濆瓨绯荤粺璁剧疆
+ tags:
+ - 绯荤粺璁剧疆
/api-wms/v1/warehouse/getWarehouseDetails/{id}:
get:
parameters:
--
Gitblit v1.8.0