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 | 1005 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 855 insertions(+), 150 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index 20489c0..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": [ @@ -454,6 +589,289 @@ "required": true, "schema": { "$ref": "#/definitions/models.Location" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/locationProduct/add": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "涓婃灦瑙勫垯" + ], + "summary": "娣诲姞涓婃灦瑙勫垯", + "parameters": [ + { + "description": "鏂板涓婃灦瑙勫垯", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.AddLocationProduct" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/locationProduct/delete/{id}": { + "delete": { + "produces": [ + "application/json" + ], + "tags": [ + "涓婃灦瑙勫垯" + ], + "summary": "鍒犻櫎涓婃灦瑙勫垯", + "parameters": [ + { + "type": "integer", + "description": "id", + "name": "id", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/locationProduct/list": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "涓婃灦瑙勫垯" + ], + "summary": "涓婃灦瑙勫垯鍒楄〃", + "parameters": [ + { + "description": "鏌ヨ鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.PageInfo" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/locationProduct/update": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "涓婃灦瑙勫垯" + ], + "summary": "淇敼涓婃灦瑙勫垯", + "parameters": [ + { + "description": "淇敼鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.UpdateLocationProduct" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/locationProductAmount/add": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "搴撳瓨鐩樼偣" + ], + "summary": "娣诲姞搴撳瓨鐩樼偣淇℃伅", + "parameters": [ + { + "description": "鍏ュ簱/鍑哄簱淇℃伅", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.UpdateLocationProductAmount" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/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" + ], + "tags": [ + "搴撳瓨鐩樼偣" + ], + "summary": "搴撳瓨鐩樼偣鍒楄〃", + "parameters": [ + { + "description": "鏌ヨ鍙傛暟", + "name": "object", + "in": "body", + "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" } } ], @@ -675,22 +1093,7 @@ "200": { "description": "鎴愬姛", "schema": { - "allOf": [ - { - "$ref": "#/definitions/util.ResponseList" - }, - { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "$ref": "#/definitions/models.OperationType" - } - } - } - } - ] + "$ref": "#/definitions/util.ResponseList" } } } @@ -1161,6 +1564,51 @@ } } }, + "/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" + } + } + } + } + ] + } + } + } + } + }, "/api-wms/v1/product/listOperaton": { "post": { "produces": [ @@ -1482,9 +1930,13 @@ "enum": [ 1, 2, - 3 + 3, + 4, + 5 ], "x-enum-comments": { + "BaseOperationTypeAdjust": "搴撳瓨鐩樼偣", + "BaseOperationTypeDisuse": "鎶ュ簾", "BaseOperationTypeIncoming": "鏀惰揣", "BaseOperationTypeInternal": "鍐呴儴璋冩嫧", "BaseOperationTypeOutgoing": "浜よ揣" @@ -1492,7 +1944,9 @@ "x-enum-varnames": [ "BaseOperationTypeIncoming", "BaseOperationTypeOutgoing", - "BaseOperationTypeInternal" + "BaseOperationTypeInternal", + "BaseOperationTypeDisuse", + "BaseOperationTypeAdjust" ] }, "constvar.CostingMethod": { @@ -1575,10 +2029,13 @@ 5, 6, 7, - 8 + 8, + 9 ], "x-enum-comments": { + "LocationTypeAdjust": "搴撳瓨鐩樼偣", "LocationTypeCustomer": "瀹㈡埛浣嶇疆", + "LocationTypeDisuse": "鎶ュ簾浣嶇疆", "LocationTypeInternal": "鍐呴儴浣嶇疆", "LocationTypeInventoryLoss": "搴撳瓨鎹熷け", "LocationTypeProduction": "鐢熶骇", @@ -1594,7 +2051,8 @@ "LocationTypeInventoryLoss", "LocationTypeProduction", "LocationTypeTransit", - "LocationTypeDisuse" + "LocationTypeDisuse", + "LocationTypeAdjust" ] }, "constvar.MaterialMode": { @@ -1813,7 +2271,7 @@ }, "parentId": { "description": "涓婄骇id", - "type": "string" + "type": "integer" }, "recentlyCount": { "description": "鏈�杩戠洏鐐�", @@ -2031,6 +2489,14 @@ "models.Operation": { "type": "object", "properties": { + "baseOperationType": { + "description": "鍩虹浣滀笟绫诲瀷", + "allOf": [ + { + "$ref": "#/definitions/constvar.BaseOperationType" + } + ] + }, "comment": { "type": "string" }, @@ -2148,128 +2614,6 @@ } } }, - "models.OperationType": { - "type": "object", - "properties": { - "ReservationDaysBeforePriority": { - "description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ", - "type": "integer" - }, - "baseOperationType": { - "description": "鍩虹浣滀笟绫诲瀷", - "allOf": [ - { - "$ref": "#/definitions/constvar.BaseOperationType" - } - ] - }, - "company": { - "description": "鍏徃", - "allOf": [ - { - "$ref": "#/definitions/models.Company" - } - ] - }, - "companyId": { - "description": "鍏徃id", - "type": "integer" - }, - "createBackorder": { - "description": "鍒涘缓娆犲崟", - "allOf": [ - { - "$ref": "#/definitions/constvar.WhetherType" - } - ] - }, - "createTime": { - "type": "string" - }, - "defaultLocationDest": { - "description": "榛樿鐩爣浣嶇疆", - "allOf": [ - { - "$ref": "#/definitions/models.Location" - } - ] - }, - "defaultLocationDestId": { - "description": "榛樿鐩爣浣嶇疆id", - "type": "integer" - }, - "defaultLocationSrc": { - "description": "榛樿婧愪綅缃�", - "allOf": [ - { - "$ref": "#/definitions/models.Location" - } - ] - }, - "defaultLocationSrcId": { - "description": "榛樿婧愪綅缃甶d", - "type": "integer" - }, - "earlyOperations": { - "description": "棰勫~鍐欎綔涓氳鎯�", - "type": "boolean" - }, - "id": { - "type": "integer" - }, - "name": { - "description": "浠撳簱鍚嶇О", - "type": "string" - }, - "prefix": { - "description": "鍓嶇紑", - "type": "string" - }, - "printLabel": { - "description": "鏄惁鎵撳嵃鏍囩", - "type": "boolean" - }, - "reservationDaysBefore": { - "description": "鏀惰揣鍓嶅嚑澶�", - "type": "integer" - }, - "reservationMethod": { - "description": "淇濈暀鏂瑰紡", - "allOf": [ - { - "$ref": "#/definitions/constvar.ReservationMethod" - } - ] - }, - "returnOperationType": { - "description": "閫�璐х被鍨嬪悕绉�", - "type": "string" - }, - "returnOperationTypeID": { - "description": "閫�璐х被鍨婭D", - "type": "integer" - }, - "showOperations": { - "description": "鏄剧ず浣滀笟璇︽儏", - "type": "boolean" - }, - "updateTime": { - "type": "string" - }, - "warehouse": { - "description": "浠撳簱", - "allOf": [ - { - "$ref": "#/definitions/models.Warehouse" - } - ] - }, - "warehouseId": { - "description": "浠撳簱id", - "type": "integer" - } - } - }, "models.ProductCategory": { "type": "object", "properties": { @@ -2301,7 +2645,7 @@ ] }, "name": { - "description": "浣嶇疆鍚嶇О", + "description": "鍒嗙被鍚嶇О", "type": "string" }, "parentId": { @@ -2448,6 +2792,27 @@ } } }, + "request.AddLocationProduct": { + "type": "object", + "properties": { + "areaId": { + "description": "鍖哄煙id", + "type": "integer" + }, + "locationId": { + "description": "浣嶇疆id", + "type": "integer" + }, + "productCategoryId": { + "description": "浜у搧绉嶇被id", + "type": "integer" + }, + "productId": { + "description": "浜у搧id", + "type": "string" + } + } + }, "request.AddOperation": { "type": "object", "properties": { @@ -2560,6 +2925,10 @@ "description": "浠撳簱鍚嶇О", "type": "string" }, + "prefix": { + "description": "鍓嶇紑", + "type": "string" + }, "printLabel": { "description": "鏄惁鎵撳嵃鏍囩", "type": "boolean" @@ -2643,7 +3012,81 @@ } } }, - "request.GetProductList": { + "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": { @@ -2656,6 +3099,38 @@ "pageSize": { "description": "姣忛〉澶у皬", "type": "integer" + } + } + }, + "request.GetProductList": { + "type": "object", + "properties": { + "categoryId": { + "type": "integer" + }, + "keyWord": { + "type": "string" + }, + "page": { + "description": "椤电爜", + "type": "integer" + }, + "pageSize": { + "description": "姣忛〉澶у皬", + "type": "integer" + } + } + }, + "request.GetRuleList": { + "type": "object", + "properties": { + "locationId": { + "description": "浣嶇疆id", + "type": "integer" + }, + "productId": { + "description": "浜у搧id", + "type": "string" } } }, @@ -2711,9 +3186,19 @@ "pageSize": { "description": "姣忛〉澶у皬", "type": "integer" + } + } + }, + "request.PageInfo": { + "type": "object", + "properties": { + "page": { + "description": "椤电爜", + "type": "integer" }, - "sourceNumber": { - "type": "string" + "pageSize": { + "description": "姣忛〉澶у皬", + "type": "integer" } } }, @@ -2730,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" } } @@ -2792,8 +3293,10 @@ "type": "object", "properties": { "amount": { - "description": "ProductName string ` + "`" + `json:\"productName\"` + "`" + `", "type": "number" + }, + "baseOperationType": { + "$ref": "#/definitions/constvar.BaseOperationType" }, "fromLocationId": { "type": "integer" @@ -2802,7 +3305,6 @@ "type": "integer" }, "number": { - "description": "Unit string ` + "`" + `json:\"unit\"` + "`" + `", "type": "string" }, "operationDate": { @@ -2822,9 +3324,70 @@ } } }, + "request.UpdateLocationProduct": { + "type": "object", + "properties": { + "areaId": { + "description": "鍖哄煙id", + "type": "integer" + }, + "id": { + "type": "integer" + }, + "locationId": { + "description": "浣嶇疆id", + "type": "integer" + }, + "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": { + "description": "浜у搧id", + "type": "string" + } + } + }, "request.UpdateOperation": { "type": "object", "properties": { + "baseOperationType": { + "description": "鍩虹浣滀笟绫诲瀷", + "allOf": [ + { + "$ref": "#/definitions/constvar.BaseOperationType" + } + ] + }, "comment": { "description": "澶囨敞", "type": "string" @@ -2934,6 +3497,10 @@ "description": "浠撳簱鍚嶇О", "type": "string" }, + "prefix": { + "description": "鍓嶇紑", + "type": "string" + }, "printLabel": { "description": "鏄惁鎵撳嵃鏍囩", "type": "boolean" @@ -2964,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