From 96844c22ef3fba86a55e0af1b51bc1009d6fa950 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期五, 20 十月 2023 11:57:48 +0800
Subject: [PATCH] 1.库存盘点bug修改
---
docs/docs.go | 615 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 584 insertions(+), 31 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 531b4e8..d6dafcd 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -294,6 +294,141 @@
}
}
},
+ "/api-wms/v1/forms/getHistory": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃"
+ ],
+ "summary": "鑾峰彇鍘嗗彶淇℃伅",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetInventoryHistory"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.InventoryHistory"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/forms/getInventoryForms": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃"
+ ],
+ "summary": "鑾峰彇搴撳瓨鎶ヨ〃",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetInventoryForms"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.InventoryForms"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/forms/getLocationForms": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃"
+ ],
+ "summary": "鑾峰彇浣嶇疆鎶ヨ〃",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetLocationForms"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.LocationForms"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/location/addLocation": {
"post": {
"produces": [
@@ -585,7 +720,7 @@
}
}
},
- "/api-wms/v1/locationProductamount/add": {
+ "/api-wms/v1/locationProductAmount/add": {
"post": {
"produces": [
"application/json"
@@ -601,7 +736,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.AddLocationProductAmount"
+ "$ref": "#/definitions/request.UpdateLocationProductAmount"
}
}
],
@@ -615,7 +750,82 @@
}
}
},
- "/api-wms/v1/locationProductamount/list": {
+ "/api-wms/v1/locationProductAmount/finish": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "搴撳瓨鐩樼偣"
+ ],
+ "summary": "搴旂敤銆侀獙璇�",
+ "parameters": [
+ {
+ "description": "鍏ュ弬",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.FinishLocationProductAmount"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/locationProductAmount/getRuleList": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "搴撳瓨鐩樼偣"
+ ],
+ "summary": "鑾峰彇涓婃灦瑙勫垯",
+ "parameters": [
+ {
+ "description": "鏌ヨ淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetRuleList"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.RuleList"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/locationProductAmount/list": {
"post": {
"produces": [
"application/json"
@@ -632,6 +842,36 @@
"required": true,
"schema": {
"$ref": "#/definitions/request.PageInfo"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/locationProductAmount/update": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "搴撳瓨鐩樼偣"
+ ],
+ "summary": "淇敼搴撳瓨鐩樼偣淇℃伅",
+ "parameters": [
+ {
+ "description": "鍏ュ簱/鍑哄簱淇℃伅",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdateLocationProductAmount"
}
}
],
@@ -1319,6 +1559,51 @@
"description": "鎴愬姛",
"schema": {
"$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/product/listHistory": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "浜у搧浣嶇疆鍘嗗彶淇℃伅",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.QueryOperationHistory"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Operation"
+ }
+ }
+ }
+ }
+ ]
}
}
}
@@ -2360,7 +2645,7 @@
]
},
"name": {
- "description": "浣嶇疆鍚嶇О",
+ "description": "鍒嗙被鍚嶇О",
"type": "string"
},
"parentId": {
@@ -2528,29 +2813,6 @@
}
}
},
- "request.AddLocationProductAmount": {
- "type": "object",
- "properties": {
- "adjustAmount": {
- "description": "宸��",
- "type": "number"
- },
- "decimal": {
- "description": "搴撳瓨鏁伴噺",
- "type": "number"
- },
- "difference_amount": {
- "description": "璁℃暟鏁伴噺",
- "type": "number"
- },
- "locationId": {
- "type": "integer"
- },
- "productId": {
- "type": "string"
- }
- }
- },
"request.AddOperation": {
"type": "object",
"properties": {
@@ -2663,6 +2925,10 @@
"description": "浠撳簱鍚嶇О",
"type": "string"
},
+ "prefix": {
+ "description": "鍓嶇紑",
+ "type": "string"
+ },
"printLabel": {
"description": "鏄惁鎵撳嵃鏍囩",
"type": "boolean"
@@ -2746,6 +3012,96 @@
}
}
},
+ "request.FinishLocationProductAmount": {
+ "type": "object",
+ "properties": {
+ "locationProductAmountId": {
+ "description": "搴撳瓨鐩樼偣id",
+ "type": "integer"
+ },
+ "operationId": {
+ "description": "鍑哄叆搴搃d",
+ "type": "integer"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
+ }
+ }
+ },
+ "request.GetInventoryForms": {
+ "type": "object",
+ "properties": {
+ "categoryIds": {
+ "description": "浜у搧绫诲瀷id",
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
+ "keyWord": {
+ "description": "鎼滅储鏉′欢",
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "warehouseCode": {
+ "description": "浠撳簱缂╁啓",
+ "type": "string"
+ }
+ }
+ },
+ "request.GetInventoryHistory": {
+ "type": "object",
+ "properties": {
+ "keyWord": {
+ "description": "鎼滅储鏉′欢",
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "produceId": {
+ "description": "浜у搧id",
+ "type": "string"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
+ }
+ }
+ },
+ "request.GetLocationForms": {
+ "type": "object",
+ "properties": {
+ "keyWord": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ }
+ }
+ },
"request.GetProductList": {
"type": "object",
"properties": {
@@ -2762,6 +3118,19 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ }
+ }
+ },
+ "request.GetRuleList": {
+ "type": "object",
+ "properties": {
+ "locationId": {
+ "description": "浣嶇疆id",
+ "type": "integer"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
}
}
},
@@ -2817,9 +3186,6 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
- },
- "sourceNumber": {
- "type": "string"
}
}
},
@@ -2849,8 +3215,24 @@
"pageSize": {
"description": "姣忛〉澶у皬",
"type": "integer"
+ }
+ }
+ },
+ "request.QueryOperationHistory": {
+ "type": "object",
+ "properties": {
+ "locationId": {
+ "type": "integer"
},
- "sourceNumber": {
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "productId": {
"type": "string"
}
}
@@ -2958,6 +3340,35 @@
},
"productCategoryId": {
"description": "浜у搧绉嶇被id",
+ "type": "integer"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
+ }
+ }
+ },
+ "request.UpdateLocationProductAmount": {
+ "type": "object",
+ "properties": {
+ "adjustAmount": {
+ "description": "LocationProductAmountId int ` + "`" + `json:\"locationProductAmountId\"` + "`" + ` //搴撳瓨鐩樼偣id",
+ "type": "number"
+ },
+ "amount": {
+ "description": "搴撳瓨鏁伴噺",
+ "type": "number"
+ },
+ "differenceAmount": {
+ "description": "璁℃暟鏁伴噺",
+ "type": "number"
+ },
+ "locationId": {
+ "description": "浣嶇疆id",
+ "type": "integer"
+ },
+ "operationId": {
+ "description": "鍑哄叆搴搃d",
"type": "integer"
},
"productId": {
@@ -3086,6 +3497,10 @@
"description": "浠撳簱鍚嶇О",
"type": "string"
},
+ "prefix": {
+ "description": "鍓嶇紑",
+ "type": "string"
+ },
"printLabel": {
"description": "鏄惁鎵撳嵃鏍囩",
"type": "boolean"
@@ -3116,6 +3531,144 @@
}
}
},
+ "response.InventoryForms": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "鍦ㄥ簱鏁伴噺",
+ "type": "number"
+ },
+ "availableNumber": {
+ "description": "鍙敤搴撳瓨",
+ "type": "number"
+ },
+ "cost": {
+ "description": "鎴愭湰",
+ "type": "number"
+ },
+ "in": {
+ "description": "鍏ュ簱",
+ "type": "number"
+ },
+ "out": {
+ "description": "鍑哄簱",
+ "type": "number"
+ },
+ "produceId": {
+ "description": "浜у搧id",
+ "type": "string"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productType": {
+ "description": "浜у搧绫诲瀷",
+ "type": "string"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
+ },
+ "value": {
+ "description": "鎬讳环鍊�",
+ "type": "number"
+ }
+ }
+ },
+ "response.InventoryHistory": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "鏁伴噺",
+ "type": "number"
+ },
+ "contactedName": {
+ "description": "瀹屾垚鑰�",
+ "type": "string"
+ },
+ "date": {
+ "description": "鏃ユ湡",
+ "type": "string"
+ },
+ "fromLocation": {
+ "description": "婧愪綅缃�",
+ "type": "string"
+ },
+ "number": {
+ "description": "鍗曞彿",
+ "type": "string"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "status": {
+ "description": "鐘舵��",
+ "type": "string"
+ },
+ "toLocation": {
+ "description": "鐩爣浣嶇疆",
+ "type": "string"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
+ }
+ }
+ },
+ "response.LocationForms": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "鏁伴噺",
+ "type": "number"
+ },
+ "locationName": {
+ "description": "浣嶇疆鍚嶇О",
+ "type": "string"
+ },
+ "produceId": {
+ "description": "浜у搧id",
+ "type": "string"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "productTypeName": {
+ "description": "浜у搧绫诲埆",
+ "type": "string"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
+ },
+ "value": {
+ "description": "鎬讳环鍊�",
+ "type": "number"
+ }
+ }
+ },
+ "response.RuleList": {
+ "type": "object",
+ "properties": {
+ "locationList": {
+ "description": "浣嶇疆鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Location"
+ }
+ },
+ "productList": {
+ "description": "浜у搧鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Material"
+ }
+ }
+ }
+ },
"util.Response": {
"type": "object",
"properties": {
--
Gitblit v1.8.0