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.json | 350 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 346 insertions(+), 4 deletions(-)
diff --git a/docs/swagger.json b/docs/swagger.json
index e2c314e..93d6dd4 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -155,7 +155,7 @@
}
},
"/api-wms/v1/attribute/attribute": {
- "post": {
+ "get": {
"produces": [
"application/json"
],
@@ -172,6 +172,41 @@
"schema": {
"$ref": "#/definitions/request.AttributeList"
}
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ },
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "灞炴��"
+ ],
+ "summary": "娣诲姞灞炴��",
+ "parameters": [
+ {
+ "description": "灞炴�т俊鎭�",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddAttribute"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
}
],
"responses": {
@@ -2344,12 +2379,40 @@
"tags": [
"浜у搧"
],
- "summary": "鍒犻櫎浜у搧",
+ "summary": "閫氳繃浜у搧/鍟嗗搧/鐗╂枡 ID鍒犻櫎浜у搧",
"parameters": [
{
"type": "string",
"description": "id",
"name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/product/deleteProductByBarCode/{barCode}": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "閫氳繃浜у搧/鍟嗗搧/鐗╂枡 鏉″舰鐮佸垹闄や骇鍝�",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "barCode",
+ "name": "barCode",
"in": "path",
"required": true
}
@@ -2513,12 +2576,66 @@
"tags": [
"浜у搧"
],
- "summary": "鑾峰彇浜у搧璇︽儏",
+ "summary": "閫氳繃浜у搧/鍟嗗搧/鐗╂枡 ID鑾峰彇浜у搧璇︽儏",
"parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
{
"type": "string",
"description": "id",
"name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/models.Material"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/product/getProductDetailsByBarCode/{barCode}": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "閫氳繃浜у搧/鍟嗗搧/鐗╂枡 鏉″舰鐮� 鑾峰彇浜у搧璇︽儏",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
+ "type": "string",
+ "description": "barCode",
+ "name": "barCode",
"in": "path",
"required": true
}
@@ -2658,6 +2775,9 @@
},
"/api-wms/v1/product/inputProduct": {
"post": {
+ "consumes": [
+ "multipart/form-data"
+ ],
"produces": [
"application/xlsx"
],
@@ -2665,6 +2785,22 @@
"鐗╂枡绠＄悊"
],
"summary": "瀵煎叆鐗╂枡",
+ "parameters": [
+ {
+ "type": "file",
+ "description": "file",
+ "name": "file",
+ "in": "formData",
+ "required": true
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
"responses": {
"200": {
"description": "鎴愬姛",
@@ -3126,6 +3262,99 @@
}
}
},
+ "/api-wms/v1/systemConfig/get": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺璁剧疆"
+ ],
+ "summary": "鏍规嵁璁剧疆绫诲瀷鏌ヨ绯荤粺璁剧疆",
+ "parameters": [
+ {
+ "enum": [
+ 1
+ ],
+ "type": "integer",
+ "x-enum-comments": {
+ "SystemConfigTypeInventoryCutOffPoint": "搴撳瓨缁撶畻鏃堕棿鐐�"
+ },
+ "x-enum-varnames": [
+ "SystemConfigTypeInventoryCutOffPoint"
+ ],
+ "description": "1 姣忔湀搴撳瓨缁撶畻鏃堕棿鐐�",
+ "name": "configType",
+ "in": "query",
+ "required": true
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/models.SystemConfig"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/systemConfig/save": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺璁剧疆"
+ ],
+ "summary": "淇濆瓨绯荤粺璁剧疆",
+ "parameters": [
+ {
+ "description": "绯荤粺璁剧疆淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.SystemConfig"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/warehouse/getWarehouseDetails/{id}": {
"get": {
"produces": [
@@ -3412,6 +3641,21 @@
"CostingMethodAverageCost"
]
},
+ "constvar.FileTemplateCategory": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "FileTemplateCategory_Output": "鍑哄簱",
+ "FileTemplateCategory_Selfmade": "鍏ュ簱-鑷埗"
+ },
+ "x-enum-varnames": [
+ "FileTemplateCategory_Selfmade",
+ "FileTemplateCategory_Output"
+ ]
+ },
"constvar.FileType": {
"type": "string",
"enum": [
@@ -3684,6 +3928,18 @@
"x-enum-varnames": [
"RuleType_Product",
"RuleType_ProductCategory"
+ ]
+ },
+ "constvar.SystemConfigType": {
+ "type": "integer",
+ "enum": [
+ 1
+ ],
+ "x-enum-comments": {
+ "SystemConfigTypeInventoryCutOffPoint": "搴撳瓨缁撶畻鏃堕棿鐐�"
+ },
+ "x-enum-varnames": [
+ "SystemConfigTypeInventoryCutOffPoint"
]
},
"constvar.WhetherType": {
@@ -4035,7 +4291,7 @@
"autoIncr": {
"type": "integer"
},
- "barcode": {
+ "barCode": {
"description": "鏉＄爜",
"type": "string"
},
@@ -4575,6 +4831,9 @@
"receiverPhone": {
"type": "string"
},
+ "remark": {
+ "type": "string"
+ },
"salesDetailsNumber": {
"type": "string"
},
@@ -4607,6 +4866,9 @@
},
"updateTime": {
"type": "string"
+ },
+ "warehouseId": {
+ "type": "integer"
},
"waybillNumber": {
"description": "杩愬崟鍙�",
@@ -4817,6 +5079,36 @@
}
}
},
+ "models.SystemConfig": {
+ "type": "object",
+ "properties": {
+ "configType": {
+ "description": "姣忔湀搴撳瓨缁撶畻鏃堕棿鐐�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.SystemConfigType"
+ }
+ ]
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "璁剧疆鍚嶇О",
+ "type": "string"
+ },
+ "updateTime": {
+ "type": "string"
+ },
+ "val": {
+ "description": "璁剧疆鍊�",
+ "type": "string"
+ }
+ }
+ },
"models.UnitDict": {
"type": "object",
"properties": {
@@ -4877,6 +5169,12 @@
},
"createTime": {
"type": "string"
+ },
+ "fileTemplateCategoryIn": {
+ "$ref": "#/definitions/constvar.FileTemplateCategory"
+ },
+ "fileTemplateCategoryOut": {
+ "$ref": "#/definitions/constvar.FileTemplateCategory"
},
"id": {
"type": "integer"
@@ -5054,6 +5352,14 @@
"accountantId": {
"type": "string"
},
+ "baseOperationType": {
+ "description": "鍩虹浣滀笟绫诲瀷 5搴撳瓨鐩樼偣",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.BaseOperationType"
+ }
+ ]
+ },
"comment": {
"description": "澶囨敞",
"type": "string"
@@ -5145,6 +5451,10 @@
},
"toLocationId": {
"description": "鐩爣浣嶇疆id",
+ "type": "integer"
+ },
+ "warehouseId": {
+ "description": "浠撳簱id",
"type": "integer"
},
"waybillNumber": {
@@ -5657,6 +5967,14 @@
"request.OperationList": {
"type": "object",
"properties": {
+ "baseOperationType": {
+ "description": "1 鍏ュ簱 2 鍑哄簱 3 鍐呴儴璋冩嫧 4 鎶ュ簾 5 搴撳瓨鐩樼偣",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.BaseOperationType"
+ }
+ ]
+ },
"number": {
"type": "string"
},
@@ -5751,6 +6069,30 @@
}
}
},
+ "request.SystemConfig": {
+ "type": "object",
+ "properties": {
+ "ID": {
+ "type": "integer"
+ },
+ "configType": {
+ "description": "1 姣忔湀搴撳瓨缁撶畻鏃堕棿鐐�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.SystemConfigType"
+ }
+ ]
+ },
+ "name": {
+ "description": "璁剧疆鍚嶇О",
+ "type": "string"
+ },
+ "val": {
+ "description": "璁剧疆鍊�",
+ "type": "string"
+ }
+ }
+ },
"request.UnitDict": {
"type": "object",
"properties": {
--
Gitblit v1.8.0