From 0ec0aef398704cd0219ed452f3aa96c8cdacd647 Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期六, 06 七月 2024 15:27:51 +0800
Subject: [PATCH] 出库、入库、盘点涉及产品重复性检查调整（从【产品编号】变更为以【产品编号、出库库房编号、入库库房编号】作为唯一标识）
---
docs/swagger.json | 216 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 160 insertions(+), 56 deletions(-)
diff --git a/docs/swagger.json b/docs/swagger.json
index 0f87c8f..76cdd10 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -1836,6 +1836,43 @@
}
}
},
+ "/api-wms/v1/locationProductAmount/locationProductList": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "搴撳瓨鐩樼偣"
+ ],
+ "summary": "鑾峰彇浣嶇疆瀵瑰簲浜у搧鍒楄〃",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetLocationProductList"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/util.ResponseList"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/locationProductAmount/update": {
"post": {
"produces": [
@@ -1983,7 +2020,7 @@
"tags": [
"鍏ュ簱/鍑哄簱"
],
- "summary": "鍏ュ簱/鍑哄簱鍒楄〃",
+ "summary": "鎿嶄綔璇︽儏鎺ュ彛",
"parameters": [
{
"type": "string",
@@ -1991,13 +2028,32 @@
"name": "id",
"in": "path",
"required": true
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
}
],
"responses": {
"200": {
"description": "鎴愬姛",
"schema": {
- "$ref": "#/definitions/util.Response"
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/models.Operation"
+ }
+ }
+ }
+ ]
}
}
}
@@ -2012,37 +2068,11 @@
"鍏ュ簱/鍑哄簱"
],
"summary": "鑾峰彇浜哄憳鍒楄〃",
- "parameters": [
- {
- "description": "鍙傛暟",
- "name": "object",
- "in": "body",
- "required": true,
- "schema": {
- "$ref": "#/definitions/request.OperationCondition"
- }
- }
- ],
"responses": {
"200": {
"description": "鎴愬姛",
"schema": {
- "allOf": [
- {
- "$ref": "#/definitions/util.ResponseList"
- },
- {
- "type": "object",
- "properties": {
- "data": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/inventory_order.WorkerInfo"
- }
- }
- }
- }
- ]
+ "$ref": "#/definitions/util.Response"
}
}
}
@@ -2786,6 +2816,31 @@
}
}
},
+ "/api-wms/v1/product/downloadInputFormat": {
+ "get": {
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "涓嬭浇瀵煎叆鐗╂枡/浜у搧妯℃澘",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/product/finishDisuse/{id}": {
"put": {
"produces": [
@@ -3113,9 +3168,9 @@
"application/xlsx"
],
"tags": [
- "鐗╂枡绠＄悊"
+ "浜у搧"
],
- "summary": "瀵煎叆鐗╂枡",
+ "summary": "瀵煎叆鐗╂枡/浜у搧",
"parameters": [
{
"type": "file",
@@ -4141,19 +4196,22 @@
1,
2,
3,
- 4
+ 4,
+ 5
],
"x-enum-comments": {
+ "DisuseType": "鎶ュ簾绫诲瀷",
"StockoutType": "鍑哄簱绫诲瀷",
"StorageType": "鍏ュ簱绫诲瀷",
- "TakeStock": "鐩樼偣绫诲瀷",
+ "TakeStockType": "鐩樼偣绫诲瀷",
"TransferType": "璋冩嫧绫诲瀷"
},
"x-enum-varnames": [
"StorageType",
"StockoutType",
"TransferType",
- "TakeStock"
+ "TakeStockType",
+ "DisuseType"
]
},
"constvar.OperationSource": {
@@ -4336,17 +4394,6 @@
"valid": {
"description": "Valid is true if Time is not NULL",
"type": "boolean"
- }
- }
- },
- "inventory_order.WorkerInfo": {
- "type": "object",
- "properties": {
- "id": {
- "type": "string"
- },
- "name": {
- "type": "string"
}
}
},
@@ -4579,7 +4626,7 @@
"$ref": "#/definitions/models.Location"
},
"locationId": {
- "description": "LocationProductId int `json:\"locationProductId\" gorm:\"type:int;not null;comment:涓婃灦瑙勫垯id\"` //涓婃灦瑙勫垯id\nLocationProduct LocationProduct `json:\"locationProduct\" gorm:\"foreignKey:LocationProductId;references:Id\"`",
+ "description": "浣嶇疆id",
"type": "integer"
},
"product": {
@@ -4598,6 +4645,9 @@
},
"updateTime": {
"type": "string"
+ },
+ "warehouseId": {
+ "type": "integer"
}
}
},
@@ -5028,6 +5078,21 @@
}
}
},
+ "models.MonthStatsItemsType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "MonthStatsItemsTypeInput": "鍏ュ簱",
+ "MonthStatsItemsTypeOutput": "鍑哄簱"
+ },
+ "x-enum-varnames": [
+ "MonthStatsItemsTypeInput",
+ "MonthStatsItemsTypeOutput"
+ ]
+ },
"models.MoveHistory": {
"type": "object",
"properties": {
@@ -5156,6 +5221,9 @@
"custodianId": {
"type": "string"
},
+ "dealerType": {
+ "type": "string"
+ },
"details": {
"type": "array",
"items": {
@@ -5163,12 +5231,6 @@
}
},
"id": {
- "type": "integer"
- },
- "inventoryDealer": {
- "$ref": "#/definitions/models.MiniDict"
- },
- "inventoryDealerType": {
"type": "integer"
},
"isInternalOutput": {
@@ -5208,7 +5270,6 @@
"type": "string"
},
"operationDate": {
- "description": "FromLocationID int `json:\"fromLocationId\" gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` //婧愪綅缃甶d\nFromLocation Location `json:\"fromLocation\" gorm:\"foreignKey:FromLocationID;references:Id\"` //婧愪綅缃甛nToLocationID int `json:\"toLocationId\" gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` //鐩爣浣嶇疆id\nToLocation Location `json:\"toLocation\" gorm:\"foreignKey:ToLocationID;references:Id\"` //鐩爣浣嶇疆",
"type": "string"
},
"operationSource": {
@@ -5360,6 +5421,10 @@
},
"salePrice": {
"description": "閿�鍞崟浠�",
+ "type": "number"
+ },
+ "stockAmount": {
+ "description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�",
"type": "number"
},
"toLocation": {
@@ -5729,6 +5794,9 @@
"description": "鍏ュ簱鏉ユ簮锛屽嚭搴撳幓澶�",
"type": "string"
},
+ "type": {
+ "$ref": "#/definitions/models.MonthStatsItemsType"
+ },
"warehouseMonthStatsId": {
"type": "integer"
}
@@ -5923,6 +5991,9 @@
"custodianId": {
"type": "string"
},
+ "dealerType": {
+ "type": "string"
+ },
"details": {
"type": "array",
"items": {
@@ -5930,9 +6001,6 @@
}
},
"id": {
- "type": "integer"
- },
- "inventoryDealerType": {
"type": "integer"
},
"locationId": {
@@ -6322,6 +6390,12 @@
"locationId": {
"type": "integer"
},
+ "locationIds": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -6361,6 +6435,32 @@
"type": "integer"
},
"type": {
+ "type": "integer"
+ },
+ "warehouseId": {
+ "description": "浠撳簱ID",
+ "type": "integer"
+ }
+ }
+ },
+ "request.GetLocationProductList": {
+ "type": "object",
+ "properties": {
+ "keyword": {
+ "type": "string"
+ },
+ "locationId": {
+ "type": "integer"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "warehouseId": {
"type": "integer"
}
}
@@ -6563,6 +6663,10 @@
"description": "閿�鍞崟浠�",
"type": "number"
},
+ "stockAmount": {
+ "description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�",
+ "type": "number"
+ },
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
--
Gitblit v1.8.0