From a8914a16b23e93f6bfd12bcfd5cbe8b24cf7eb84 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期日, 07 四月 2024 21:49:01 +0800 Subject: [PATCH] 发货支持仓库传参 --- docs/docs.go | 921 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 901 insertions(+), 20 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index fe9c170..07d8fc6 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -150,6 +150,128 @@ } } }, + "/api-wms/v1/attachment/uploadFiles": { + "post": { + "tags": [ + "闄勪欢绠$悊" + ], + "summary": "涓婁紶闄勪欢", + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/code/getAutoCode": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "缂栫爜" + ], + "summary": "鑾峰彇鑷姩缂栫爜", + "parameters": [ + { + "description": "鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/code.CodeStandard" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/util.ResponseList" + }, + { + "type": "object", + "properties": { + "data": { + "type": "object", + "additionalProperties": true + } + } + } + ] + } + } + } + } + }, + "/api-wms/v1/code/getCodeList": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "缂栫爜" + ], + "summary": "鑾峰彇缂栫爜鍒楄〃", + "parameters": [ + { + "type": "string", + "name": "codeStandID", + "in": "query" + }, + { + "type": "string", + "name": "name", + "in": "query" + }, + { + "type": "integer", + "description": "椤电爜", + "name": "page", + "in": "query" + }, + { + "type": "integer", + "description": "姣忛〉澶у皬", + "name": "pageSize", + "in": "query" + }, + { + "type": "string", + "name": "type", + "in": "query" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/util.ResponseList" + }, + { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/code.CodeStandard" + } + } + } + } + ] + } + } + } + } + }, "/api-wms/v1/company/company": { "get": { "produces": [ @@ -543,7 +665,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/request.GetProductList" + "$ref": "#/definitions/request.GetLocationList" } } ], @@ -919,6 +1041,34 @@ } } }, + "/api-wms/v1/operation/cancel/{id}": { + "put": { + "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/operation/finish/{id}": { "put": { "produces": [ @@ -947,6 +1097,106 @@ } } }, + "/api-wms/v1/operation/getClientList": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "鍏ュ簱/鍑哄簱" + ], + "summary": "鑾峰彇鐗╂祦鍏徃鍒楄〃", + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/operation/getLogisticCompanyList": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "鍏ュ簱/鍑哄簱" + ], + "summary": "鑾峰彇鐗╂祦鍏徃鍒楄〃", + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/util.ResponseList" + }, + { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/models.LogisticCompany" + } + } + } + } + ] + } + } + } + } + }, + "/api-wms/v1/operation/getOperationInfo/{id}": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "鍏ュ簱/鍑哄簱" + ], + "summary": "鍏ュ簱/鍑哄簱鍒楄〃", + "parameters": [ + { + "type": "string", + "description": "id", + "name": "id", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/operation/getSupplierList": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "鍏ュ簱/鍑哄簱" + ], + "summary": "鑾峰彇鐗╂祦鍏徃鍒楄〃", + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, "/api-wms/v1/operation/list": { "post": { "produces": [ @@ -964,6 +1214,36 @@ "required": true, "schema": { "$ref": "#/definitions/request.OperationList" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/operation/listByCondition": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "鍏ュ簱/鍑哄簱" + ], + "summary": "鍑哄叆搴撴槑缁�", + "parameters": [ + { + "description": "鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.OperationCondition" } } ], @@ -1046,6 +1326,34 @@ "鍏ュ簱/鍑哄簱" ], "summary": "鍒犻櫎鍏ュ簱/鍑哄簱淇℃伅", + "parameters": [ + { + "type": "integer", + "description": "id", + "name": "id", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, + "/api-wms/v1/operation/outputOperation/{id}": { + "put": { + "produces": [ + "application/json" + ], + "tags": [ + "鍏ュ簱/鍑哄簱" + ], + "summary": "鎵撳嵃", "parameters": [ { "type": "integer", @@ -1340,6 +1648,34 @@ } } }, + "/api-wms/v1/product/cancelDisuse/{id}": { + "put": { + "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/product/deleteProduct/{id}": { "delete": { "produces": [ @@ -1585,6 +1921,72 @@ "items": { "$ref": "#/definitions/models.Material" } + } + } + } + ] + } + } + } + } + }, + "/api-wms/v1/product/getUnitInfo": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "浜у搧" + ], + "summary": "鑾峰彇鍗曚綅淇℃伅", + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/util.ResponseList" + }, + { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/models.UnitDict" + } + } + } + } + ] + } + } + } + } + }, + "/api-wms/v1/product/getUserInfo": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "浜у搧" + ], + "summary": "鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅", + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/util.ResponseList" + }, + { + "type": "object", + "properties": { + "data": { + "type": "object", + "additionalProperties": true } } } @@ -1955,6 +2357,36 @@ } } }, + "/api-wms/v1/reorderRule/submitOrder": { + "post": { + "produces": [ + "application/json" + ], + "tags": [ + "閲嶈璐ц鍒�" + ], + "summary": "鍐嶈涓�娆�", + "parameters": [ + { + "description": "鍙傛暟", + "name": "object", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/models.ReorderRule" + } + } + ], + "responses": { + "200": { + "description": "鎴愬姛", + "schema": { + "$ref": "#/definitions/util.Response" + } + } + } + } + }, "/api-wms/v1/reorderRule/updateReorderRule": { "post": { "produces": [ @@ -2166,6 +2598,69 @@ } }, "definitions": { + "code.CodeAuto": { + "type": "object", + "properties": { + "AutoLength": { + "type": "integer" + }, + "Desc": { + "type": "string" + }, + "PrefixMethod": { + "type": "integer" + }, + "PrefixValue": { + "type": "string" + }, + "SuffixMethod": { + "type": "integer" + } + } + }, + "code.CodeRule": { + "type": "object", + "properties": { + "Desc": { + "type": "string" + }, + "Length": { + "type": "integer" + }, + "Name": { + "type": "string" + } + } + }, + "code.CodeStandard": { + "type": "object", + "properties": { + "AutoRule": { + "$ref": "#/definitions/code.CodeAuto" + }, + "ID": { + "type": "string" + }, + "List": { + "type": "array", + "items": { + "$ref": "#/definitions/code.CodeRule" + } + }, + "Method": { + "type": "integer" + }, + "Name": { + "type": "string" + }, + "Status": { + "type": "string" + }, + "Type": { + "type": "string" + } + } + }, "constvar.BaseOperationType": { "type": "integer", "enum": [ @@ -2206,6 +2701,24 @@ "CostingMethodStandardPrice", "CostingMethodFIFO", "CostingMethodAverageCost" + ] + }, + "constvar.FileType": { + "type": "string", + "enum": [ + "file", + "picture", + "thumbnail" + ], + "x-enum-comments": { + "FileType_File": "鏂囦欢", + "FileType_Picture": "鍥剧墖", + "FileType_Thumbnail": "缂╃暐鍥�" + }, + "x-enum-varnames": [ + "FileType_File", + "FileType_Picture", + "FileType_Thumbnail" ] }, "constvar.ForceRemovalStrategy": { @@ -2301,12 +2814,26 @@ "enum": [ "鍘熸潗鏂�", "鍗婃垚鍝�", - "鎴愬搧" + "鎴愬搧", + "杈呮枡", + "鑰楁潗", + "鍏朵粬", + "铏氭嫙浠�" ], + "x-enum-comments": { + "MaterialModeAuxiliary": "杈呮枡", + "MaterialModeConsumables": "鑰楁潗", + "MaterialModeOther": "鍏朵粬", + "MaterialModeVirtual": "铏氭嫙浠�, 涓嶈兘閿�鍞紝涓嶈兘鍑哄叆搴擄紝涓嶈兘閲囪喘" + }, "x-enum-varnames": [ "MaterialModeRaw", "MaterialModeSemi", - "MaterialModeFinished" + "MaterialModeFinished", + "MaterialModeAuxiliary", + "MaterialModeConsumables", + "MaterialModeOther", + "MaterialModeVirtual" ] }, "constvar.OperationStatus": { @@ -2315,9 +2842,11 @@ 1, 2, 3, - 4 + 4, + 5 ], "x-enum-comments": { + "OperationStatus_Cancel": "鍙栨秷", "OperationStatus_Draft": "鑽夌", "OperationStatus_Finish": "瀹屾垚", "OperationStatus_Ready": "灏辩华", @@ -2327,7 +2856,8 @@ "OperationStatus_Draft", "OperationStatus_Waiting", "OperationStatus_Ready", - "OperationStatus_Finish" + "OperationStatus_Finish", + "OperationStatus_Cancel" ] }, "constvar.OrderCreation": { @@ -2367,6 +2897,24 @@ "Consumables", "Server", "StoredProduct" + ] + }, + "constvar.PurchaseType": { + "type": "integer", + "enum": [ + 1, + 2, + 3 + ], + "x-enum-comments": { + "PurchaseTypeEntrust": "濮斿", + "PurchaseTypeOutSource": "閲囪喘", + "PurchaseTypeSelf": "鑷埗" + }, + "x-enum-varnames": [ + "PurchaseTypeOutSource", + "PurchaseTypeSelf", + "PurchaseTypeEntrust" ] }, "constvar.ReservationMethod": { @@ -2419,6 +2967,26 @@ "WhetherTypeAlways", "ReservationNever" ] + }, + "models.Attachment": { + "type": "object", + "properties": { + "FileUrl": { + "type": "string" + }, + "ext": { + "type": "string" + }, + "fileName": { + "type": "string" + }, + "fileType": { + "$ref": "#/definitions/constvar.FileType" + }, + "id": { + "type": "integer" + } + } }, "models.Company": { "type": "object", @@ -2556,12 +3124,55 @@ } } }, + "models.LogisticCompany": { + "type": "object", + "properties": { + "contact": { + "description": "鑱旂郴浜�", + "type": "string" + }, + "contact_phone": { + "description": "鑱旂郴鐢佃瘽", + "type": "string" + }, + "hidden": { + "description": "闅愯棌", + "type": "boolean" + }, + "id": { + "type": "string" + }, + "monthly_account": { + "description": "鏈堢粨璐﹀彿", + "type": "string" + }, + "name": { + "type": "string" + } + } + }, "models.Material": { "type": "object", "properties": { "amount": { "description": "鏁伴噺", "type": "number" + }, + "attachmentIDs": { + "description": "浠ヤ笅涓轰笉瀛樺簱鐨勫瓧娈�", + "type": "array", + "items": { + "type": "integer" + } + }, + "attachmentList": { + "type": "array", + "items": { + "$ref": "#/definitions/models.Attachment" + } + }, + "autoIncr": { + "type": "integer" }, "barcode": { "description": "鏉$爜", @@ -2581,6 +3192,10 @@ }, "categoryName": { "description": "浜у搧绫诲埆鍚嶇О", + "type": "string" + }, + "codeStandardID": { + "description": "Explain string ` + "`" + `gorm:\"type:varchar(512);comment:缂栧彿璇存槑\" json:\"explain\"` + "`" + `", "type": "string" }, "companyId": { @@ -2622,6 +3237,9 @@ "description": "HSCode string ` + "`" + `gorm:\"type:varchar(255);comment:HS缂栫爜\" json:\"HSCode\"` + "`" + ` //HS缂栫爜\nOriginCountryId int ` + "`" + `gorm:\"type:int(11);comment:鍘熶骇鍦癷d\" json:\"originCountryId\"` + "`" + ` //鍘熶骇鍦癷d\nOriginCountryName string ` + "`" + `gorm:\"type:varchar(255);comment:鍘熶骇鍦板悕绉癨" json:\"originCountryName\"` + "`" + ` //鍘熶骇鍦板悕绉�", "type": "string" }, + "inputAmount": { + "type": "number" + }, "internalNotes": { "description": "鍐呴儴璇存槑", "type": "string" @@ -2643,8 +3261,16 @@ ] }, "isSale": { - "description": "PurchaseType constvar.PurchaseType ` + "`" + `gorm:\"type:int(11);comment:閲囪喘绫诲瀷\" json:\"purchaseType\"` + "`" + `", + "description": "鏄惁閿�鍞�", "type": "boolean" + }, + "isStorage": { + "description": "鏃犲簱瀛樼殑鍦╳ms浠ュ強srm涓渶瑕佽繃婊ゆ帀", + "type": "integer" + }, + "isVirtual": { + "description": "铏氭嫙鐗╂枡鍦∕RP璁$畻鏃惰烦杩囪灞傜骇鐩存帴棰嗙敤涓嬬骇鐗╂枡锛岃櫄鎷熺墿鏂欎笉鐢熸垚宸ュ崟", + "type": "integer" }, "makeAdvanceTime": { "description": "鍒堕�犲墠缃椂闂�(澶�)", @@ -2654,8 +3280,16 @@ "description": "鏈�澶у簱瀛�", "type": "number" }, + "maxInventoryRule": { + "description": "鏈�澶у簱瀛�", + "type": "number" + }, "minInventory": { - "description": "Explain string ` + "`" + `gorm:\"type:varchar(512);comment:缂栧彿璇存槑\" json:\"explain\"` + "`" + `\nCodeStandardID string ` + "`" + `gorm:\"type:varchar(191);comment:缂栫爜瑙勮寖ID\" json:\"codeStandardID\"` + "`" + `\nSpecs string ` + "`" + `gorm:\"type:varchar(191);comment:鐗╂枡瑙勬牸\" json:\"specs\"` + "`" + `\nType string ` + "`" + `gorm:\"type:varchar(191);comment:鐗╂枡鍨嬪彿\" json:\"type\"` + "`" + `", + "description": "鏈�灏忓簱瀛�", + "type": "number" + }, + "minInventoryRule": { + "description": "鏈�灏忓簱瀛�", "type": "number" }, "minPurchaseAmount": { @@ -2674,6 +3308,9 @@ "description": "鐗╂枡鍚嶇О", "type": "string" }, + "note": { + "type": "string" + }, "orderAdvanceTime": { "description": "璁㈠崟鍑嗗澶╂暟(澶�)", "type": "number" @@ -2689,6 +3326,12 @@ "outStorageExplain": { "description": "鍑哄簱璇存槑", "type": "string" + }, + "outputAmount": { + "type": "number" + }, + "predictionAmount": { + "type": "number" }, "principal": { "description": "璐熻矗浜�", @@ -2714,6 +3357,18 @@ "description": "閲囪喘浠锋牸", "type": "number" }, + "purchaseType": { + "$ref": "#/definitions/constvar.PurchaseType" + }, + "purchaseTypeList": { + "type": "array", + "items": { + "type": "integer" + } + }, + "reorderRuleNum": { + "type": "integer" + }, "salePrice": { "description": "閿�鍞崟浠�", "type": "number" @@ -2726,12 +3381,18 @@ "description": "閿�鍞鏄�", "type": "string" }, + "specs": { + "type": "string" + }, "supplier": { "description": "FSource string ` + "`" + `gorm:\"type:varchar(191);comment:鐢熶骇杞﹂棿\" json:\"-\"` + "`" + `\nStatus constvar.MaterialStatus ` + "`" + `gorm:\"type:int(11);comment:鐘舵�乗" json:\"status\"` + "`" + `", "type": "string" }, "templateID": { - "description": "Note string ` + "`" + `gorm:\"type:varchar(1024);comment:澶囨敞\" json:\"note\"` + "`" + `", + "description": "妯℃澘ID", + "type": "string" + }, + "type": { "type": "string" }, "unit": { @@ -2751,6 +3412,9 @@ "models.Operation": { "type": "object", "properties": { + "auditDate": { + "type": "string" + }, "baseOperationType": { "description": "鍩虹浣滀笟绫诲瀷", "allOf": [ @@ -2783,7 +3447,10 @@ "$ref": "#/definitions/models.OperationDetails" } }, - "fromLocation": { + "id": { + "type": "integer" + }, + "location": { "description": "婧愪綅缃�", "allOf": [ { @@ -2791,18 +3458,26 @@ } ] }, - "fromLocationId": { + "locationID": { "description": "婧愪綅缃甶d", "type": "integer" }, - "id": { - "type": "integer" + "logisticCompany": { + "$ref": "#/definitions/models.LogisticCompany" + }, + "logisticCompanyId": { + "type": "string" + }, + "logisticWeight": { + "description": "鐗╂祦閲嶉噺", + "type": "number" }, "number": { "description": "鍗曞彿", "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" }, "operationTypeId": { @@ -2811,6 +3486,18 @@ }, "operationTypeName": { "description": "浣滀笟绫诲瀷鍚嶇О", + "type": "string" + }, + "receiverAddr": { + "type": "string" + }, + "receiverName": { + "type": "string" + }, + "receiverPhone": { + "type": "string" + }, + "source": { "type": "string" }, "sourceNumber": { @@ -2839,6 +3526,14 @@ }, "updateTime": { "type": "string" + }, + "waybillNumber": { + "description": "杩愬崟鍙�", + "type": "string" + }, + "weight": { + "description": "閲嶉噺", + "type": "number" } } }, @@ -2851,6 +3546,18 @@ }, "createTime": { "type": "string" + }, + "fromLocation": { + "description": "婧愪綅缃�", + "allOf": [ + { + "$ref": "#/definitions/models.Location" + } + ] + }, + "fromLocationId": { + "description": "婧愪綅缃甶d", + "type": "integer" }, "id": { "type": "integer" @@ -2871,6 +3578,18 @@ "description": "浜у搧id", "type": "string" }, + "toLocation": { + "description": "鐩爣浣嶇疆", + "allOf": [ + { + "$ref": "#/definitions/models.Location" + } + ] + }, + "toLocationId": { + "description": "鐩爣浣嶇疆id", + "type": "integer" + }, "updateTime": { "type": "string" } @@ -2886,6 +3605,9 @@ "$ref": "#/definitions/constvar.CostingMethod" } ] + }, + "createTime": { + "type": "string" }, "forceRemovalStrategy": { "description": "寮哄埗涓嬫灦绛栫暐", @@ -2920,6 +3642,9 @@ }, "routeName": { "description": "鍏徃", + "type": "string" + }, + "updateTime": { "type": "string" } } @@ -2971,11 +3696,29 @@ "description": "璺嚎", "type": "string" }, + "supplierId": { + "description": "渚涘簲鍟唅d", + "type": "integer" + }, "unit": { "description": "鍗曚綅", "type": "string" }, "updateTime": { + "type": "string" + } + } + }, + "models.UnitDict": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "isDefault": { + "type": "boolean" + }, + "name": { "type": "string" } } @@ -3009,6 +3752,10 @@ }, "companyId": { "type": "integer" + }, + "contacts": { + "description": "鑱旂郴浜�", + "type": "string" }, "createTime": { "type": "string" @@ -3099,6 +3846,10 @@ "fromLocationId": { "type": "integer" }, + "number": { + "description": "Unit string ` + "`" + `json:\"unit\"` + "`" + `", + "type": "string" + }, "productId": { "type": "string" }, @@ -3168,19 +3919,26 @@ "$ref": "#/definitions/request.OperationDetails" } }, - "fromLocationId": { + "id": { + "type": "integer" + }, + "locationId": { "description": "婧愪綅缃甶d", "type": "integer" }, - "id": { - "type": "integer" + "logisticCompanyId": { + "type": "string" + }, + "logisticWeight": { + "description": "鐗╂祦閲嶉噺", + "type": "number" }, "number": { "description": "鍗曞彿", "type": "string" }, "operationDate": { - "description": "瀹夋帓鏃ユ湡", + "description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` + "`" + ` //婧愪綅缃甶d\nToLocationId int ` + "`" + `json:\"toLocationId\" gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` + "`" + ` //鐩爣浣嶇疆id", "type": "string" }, "operationTypeId": { @@ -3189,6 +3947,15 @@ }, "operationTypeName": { "description": "浣滀笟绫诲瀷鍚嶇О", + "type": "string" + }, + "receiverAddr": { + "type": "string" + }, + "receiverName": { + "type": "string" + }, + "receiverPhone": { "type": "string" }, "sourceNumber": { @@ -3206,6 +3973,14 @@ "toLocationId": { "description": "鐩爣浣嶇疆id", "type": "integer" + }, + "waybillNumber": { + "description": "杩愬崟鍙�", + "type": "string" + }, + "weight": { + "description": "閲嶉噺", + "type": "number" } } }, @@ -3308,6 +4083,10 @@ "type": "string", "maxLength": 5, "minLength": 1 + }, + "contacts": { + "description": "鑱旂郴浜�", + "type": "string" }, "inboundTransportation": { "description": "鍏ュ悜杩愯緭", @@ -3437,6 +4216,9 @@ "keyWord": { "type": "string" }, + "locationId": { + "type": "integer" + }, "page": { "description": "椤电爜", "type": "integer" @@ -3450,6 +4232,33 @@ }, "wareHouseCode": { "type": "string" + } + } + }, + "request.GetLocationList": { + "type": "object", + "properties": { + "isScrapLocation": { + "description": "鏄惁鎶ュ簾", + "type": "boolean" + }, + "jointName": { + "description": "鎷兼帴鍚嶇О", + "type": "string" + }, + "keyWord": { + "type": "string" + }, + "page": { + "description": "椤电爜", + "type": "integer" + }, + "pageSize": { + "description": "姣忛〉澶у皬", + "type": "integer" + }, + "type": { + "type": "integer" } } }, @@ -3530,6 +4339,22 @@ } } }, + "request.OperationCondition": { + "type": "object", + "properties": { + "condition": { + "type": "string" + }, + "page": { + "description": "椤电爜", + "type": "integer" + }, + "pageSize": { + "description": "姣忛〉澶у皬", + "type": "integer" + } + } + }, "request.OperationDetails": { "type": "object", "properties": { @@ -3541,9 +4366,17 @@ "description": "ProductName string ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` + "`" + ` //浜у搧鍚嶇О", "type": "number" }, + "fromLocationId": { + "description": "Unit string ` + "`" + `json:\"unit\" gorm:\"type:varchar(31);comment:鍗曚綅\"` + "`" + ` //鍗曚綅\nProduct models.Material ` + "`" + `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"` + "`" + `", + "type": "integer" + }, "productId": { "description": "浜у搧id", "type": "string" + }, + "toLocationId": { + "description": "鐩爣浣嶇疆id", + "type": "integer" } } }, @@ -3806,19 +4639,26 @@ "$ref": "#/definitions/request.OperationDetails" } }, - "fromLocationId": { + "id": { + "type": "integer" + }, + "locationId": { "description": "婧愪綅缃甶d", "type": "integer" }, - "id": { - "type": "integer" + "logisticCompanyId": { + "type": "string" + }, + "logisticWeight": { + "description": "鐗╂祦閲嶉噺", + "type": "number" }, "number": { "description": "鍗曞彿", "type": "string" }, "operationDate": { - "description": "瀹夋帓鏃ユ湡", + "description": "FromLocationId int ` + "`" + `json:\"fromLocationId\" gorm:\"type:int;not null;comment:婧愪綅缃甶d\"` + "`" + ` //婧愪綅缃甶d\nToLocationId int ` + "`" + `json:\"toLocationId\" gorm:\"type:int;not null;comment:鐩爣浣嶇疆id\"` + "`" + ` //鐩爣浣嶇疆id", "type": "string" }, "operationTypeId": { @@ -3827,6 +4667,15 @@ }, "operationTypeName": { "description": "浣滀笟绫诲瀷鍚嶇О", + "type": "string" + }, + "receiverAddr": { + "type": "string" + }, + "receiverName": { + "type": "string" + }, + "receiverPhone": { "type": "string" }, "sourceNumber": { @@ -3844,6 +4693,14 @@ "toLocationId": { "description": "鐩爣浣嶇疆id", "type": "integer" + }, + "waybillNumber": { + "description": "杩愬崟鍙�", + "type": "string" + }, + "weight": { + "description": "閲嶉噺", + "type": "number" } } }, @@ -3995,8 +4852,21 @@ "description": "婧愪綅缃�", "type": "string" }, + "fromLocationId": { + "type": "integer" + }, "number": { "description": "鍗曞彿", + "type": "string" + }, + "operationId": { + "type": "integer" + }, + "operationTypeName": { + "description": "浣滀笟绫诲瀷鍚嶇О", + "type": "string" + }, + "productId": { "type": "string" }, "productName": { @@ -4011,9 +4881,16 @@ "description": "鐩爣浣嶇疆", "type": "string" }, + "toLocationId": { + "type": "integer" + }, "unit": { "description": "鍗曚綅", "type": "string" + }, + "weight": { + "description": "閲嶉噺", + "type": "number" } } }, @@ -4024,6 +4901,10 @@ "description": "鏁伴噺", "type": "number" }, + "locationId": { + "description": "浣嶇疆id", + "type": "integer" + }, "locationName": { "description": "浣嶇疆鍚嶇О", "type": "string" -- Gitblit v1.8.0