From 1115ba492bd6afe4b9ae07284accbaa3ad4e1596 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 16 四月 2024 11:35:41 +0800
Subject: [PATCH] 添加重量字段
---
docs/docs.go | 549 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 526 insertions(+), 23 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 3f4b27a..a9b4d8d 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -936,6 +936,48 @@
}
}
},
+ "/api-wms/v1/locationProductAmount/getLocationProductAmount": {
+ "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.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/models.LocationProductAmount"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/locationProductAmount/getRuleList": {
"post": {
"produces": [
@@ -1178,6 +1220,51 @@
}
}
},
+ "/api-wms/v1/operation/getPersonnelList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍏ュ簱/鍑哄簱"
+ ],
+ "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"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/operation/getSupplierList": {
"get": {
"produces": [
@@ -1214,6 +1301,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"
}
}
],
@@ -1900,6 +2017,72 @@
}
}
},
+ "/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
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/product/listDisuse": {
"post": {
"produces": [
@@ -2015,6 +2198,36 @@
}
}
]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/product/saveUnitDict": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鏁版嵁瀛楀吀"
+ ],
+ "summary": "鏇存柊璁￠噺鍗曚綅瀛楀吀",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.SaveUnitDict"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
}
}
}
@@ -2718,12 +2931,53 @@
"enum": [
"鍘熸潗鏂�",
"鍗婃垚鍝�",
- "鎴愬搧"
+ "鎴愬搧",
+ "杈呮枡",
+ "鑰楁潗",
+ "鍏朵粬",
+ "铏氭嫙浠�"
],
+ "x-enum-comments": {
+ "MaterialModeAuxiliary": "杈呮枡",
+ "MaterialModeConsumables": "鑰楁潗",
+ "MaterialModeOther": "鍏朵粬",
+ "MaterialModeVirtual": "铏氭嫙浠�, 涓嶈兘閿�鍞紝涓嶈兘鍑哄叆搴擄紝涓嶈兘閲囪喘"
+ },
"x-enum-varnames": [
"MaterialModeRaw",
"MaterialModeSemi",
- "MaterialModeFinished"
+ "MaterialModeFinished",
+ "MaterialModeAuxiliary",
+ "MaterialModeConsumables",
+ "MaterialModeOther",
+ "MaterialModeVirtual"
+ ]
+ },
+ "constvar.OperationSource": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6
+ ],
+ "x-enum-comments": {
+ "OperationSourceOutsourcing": "濮斿鍏ュ簱",
+ "OperationSourceOutsourcingApply": "濮斿棰嗘枡",
+ "OperationSourceProduction": "鐢熶骇鍏ュ簱",
+ "OperationSourceProductionApply": "鐢熶骇棰嗘枡",
+ "OperationSourcePurchase": "閲囪喘鍏ュ簱",
+ "OperationSourceSaleDelivery": "閿�鍞彂璐�"
+ },
+ "x-enum-varnames": [
+ "OperationSourcePurchase",
+ "OperationSourceProduction",
+ "OperationSourceOutsourcing",
+ "OperationSourceProductionApply",
+ "OperationSourceOutsourcingApply",
+ "OperationSourceSaleDelivery"
]
},
"constvar.OperationStatus": {
@@ -2736,7 +2990,7 @@
5
],
"x-enum-comments": {
- "OperationStatus_Cancel": "瀹屾垚",
+ "OperationStatus_Cancel": "鍙栨秷",
"OperationStatus_Draft": "鑽夌",
"OperationStatus_Finish": "瀹屾垚",
"OperationStatus_Ready": "灏辩华",
@@ -2857,6 +3111,17 @@
"WhetherTypeAlways",
"ReservationNever"
]
+ },
+ "inventory_order.WorkerInfo": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
},
"models.Attachment": {
"type": "object",
@@ -3011,6 +3276,61 @@
},
"updateTime": {
"type": "string"
+ },
+ "warehouse": {
+ "description": "浠撳簱",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Warehouse"
+ }
+ ]
+ },
+ "warehouseId": {
+ "description": "浠撳簱ID",
+ "type": "integer"
+ }
+ }
+ },
+ "models.LocationProductAmount": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "搴撳瓨鏁伴噺",
+ "type": "number"
+ },
+ "createDate": {
+ "description": "鏃ユ湡",
+ "type": "string"
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "location": {
+ "$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\"` + "`" + `",
+ "type": "integer"
+ },
+ "product": {
+ "$ref": "#/definitions/models.Material"
+ },
+ "productCategory": {
+ "$ref": "#/definitions/models.ProductCategory"
+ },
+ "productCategoryId": {
+ "description": "浜у搧绉嶇被id",
+ "type": "integer"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
+ },
+ "updateTime": {
+ "type": "string"
}
}
},
@@ -3049,6 +3369,7 @@
"type": "number"
},
"attachmentIDs": {
+ "description": "浠ヤ笅涓轰笉瀛樺簱鐨勫瓧娈�",
"type": "array",
"items": {
"type": "integer"
@@ -3153,6 +3474,14 @@
"description": "鏄惁閿�鍞�",
"type": "boolean"
},
+ "isStorage": {
+ "description": "鏃犲簱瀛樼殑鍦╳ms浠ュ強srm涓渶瑕佽繃婊ゆ帀",
+ "type": "integer"
+ },
+ "isVirtual": {
+ "description": "铏氭嫙鐗╂枡鍦∕RP璁＄畻鏃惰烦杩囪灞傜骇鐩存帴棰嗙敤涓嬬骇鐗╂枡锛岃櫄鎷熺墿鏂欎笉鐢熸垚宸ュ崟",
+ "type": "integer"
+ },
"makeAdvanceTime": {
"description": "鍒堕�犲墠缃椂闂�(澶�)",
"type": "number"
@@ -3241,6 +3570,12 @@
"purchaseType": {
"$ref": "#/definitions/constvar.PurchaseType"
},
+ "purchaseTypeList": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
"reorderRuleNum": {
"type": "integer"
},
@@ -3287,6 +3622,12 @@
"models.Operation": {
"type": "object",
"properties": {
+ "accountant": {
+ "type": "string"
+ },
+ "accountantId": {
+ "type": "string"
+ },
"auditDate": {
"type": "string"
},
@@ -3316,13 +3657,22 @@
"createTime": {
"type": "string"
},
+ "custodian": {
+ "type": "string"
+ },
+ "custodianId": {
+ "type": "string"
+ },
"details": {
"type": "array",
"items": {
"$ref": "#/definitions/models.OperationDetails"
}
},
- "fromLocation": {
+ "id": {
+ "type": "integer"
+ },
+ "location": {
"description": "婧愪綅缃�",
"allOf": [
{
@@ -3330,11 +3680,8 @@
}
]
},
- "fromLocationId": {
+ "locationID": {
"description": "婧愪綅缃甶d",
- "type": "integer"
- },
- "id": {
"type": "integer"
},
"logisticCompany": {
@@ -3347,12 +3694,27 @@
"description": "鐗╂祦閲嶉噺",
"type": "number"
},
+ "manager": {
+ "type": "string"
+ },
+ "managerId": {
+ "type": "string"
+ },
"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"
+ },
+ "operationSource": {
+ "description": "鎿嶄綔鏉ユ簮",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.OperationSource"
+ }
+ ]
},
"operationTypeId": {
"description": "浣滀笟绫诲瀷id",
@@ -3369,6 +3731,12 @@
"type": "string"
},
"receiverPhone": {
+ "type": "string"
+ },
+ "salesDetailsNumber": {
+ "type": "string"
+ },
+ "source": {
"type": "string"
},
"sourceNumber": {
@@ -3418,6 +3786,18 @@
"createTime": {
"type": "string"
},
+ "fromLocation": {
+ "description": "婧愪綅缃�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Location"
+ }
+ ]
+ },
+ "fromLocationId": {
+ "description": "婧愪綅缃甶d",
+ "type": "integer"
+ },
"id": {
"type": "integer"
},
@@ -3436,6 +3816,18 @@
"productId": {
"description": "浜у搧id",
"type": "string"
+ },
+ "toLocation": {
+ "description": "鐩爣浣嶇疆",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Location"
+ }
+ ]
+ },
+ "toLocationId": {
+ "description": "鐩爣浣嶇疆id",
+ "type": "integer"
},
"updateTime": {
"type": "string"
@@ -3556,11 +3948,22 @@
}
}
},
+ "models.UnitDict": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "isDefault": {
+ "type": "boolean"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
+ },
"models.Warehouse": {
"type": "object",
- "required": [
- "code"
- ],
"properties": {
"active": {
"description": "鏄惁鍚敤锛屼紶true灏辫",
@@ -3576,15 +3979,17 @@
},
"code": {
"description": "浠撳簱缂栫爜",
- "type": "string",
- "maxLength": 5,
- "minLength": 1
+ "type": "string"
},
"company": {
"$ref": "#/definitions/models.Company"
},
"companyId": {
"type": "integer"
+ },
+ "contacts": {
+ "description": "鑱旂郴浜�",
+ "type": "string"
},
"createTime": {
"type": "string"
@@ -3597,7 +4002,7 @@
"type": "integer"
},
"locationId": {
- "description": "浣嶇疆id",
+ "description": "榛樿浣嶇疆id",
"type": "integer"
},
"name": {
@@ -3675,6 +4080,10 @@
"fromLocationId": {
"type": "integer"
},
+ "number": {
+ "description": "Unit string ` + "`" + `json:\"unit\"` + "`" + `",
+ "type": "string"
+ },
"productId": {
"type": "string"
},
@@ -3718,6 +4127,12 @@
"request.AddOperation": {
"type": "object",
"properties": {
+ "accountant": {
+ "type": "string"
+ },
+ "accountantId": {
+ "type": "string"
+ },
"comment": {
"description": "澶囨敞",
"type": "string"
@@ -3738,17 +4153,23 @@
"description": "鑱旂郴浜哄鍚�-闈炲繀濉�",
"type": "string"
},
+ "custodian": {
+ "type": "string"
+ },
+ "custodianId": {
+ "type": "string"
+ },
"details": {
"type": "array",
"items": {
"$ref": "#/definitions/request.OperationDetails"
}
},
- "fromLocationId": {
- "description": "婧愪綅缃甶d",
+ "id": {
"type": "integer"
},
- "id": {
+ "locationId": {
+ "description": "婧愪綅缃甶d",
"type": "integer"
},
"logisticCompanyId": {
@@ -3758,12 +4179,18 @@
"description": "鐗╂祦閲嶉噺",
"type": "number"
},
+ "manager": {
+ "type": "string"
+ },
+ "managerId": {
+ "type": "string"
+ },
"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": {
@@ -3908,6 +4335,10 @@
"type": "string",
"maxLength": 5,
"minLength": 1
+ },
+ "contacts": {
+ "description": "鑱旂郴浜�",
+ "type": "string"
},
"inboundTransportation": {
"description": "鍏ュ悜杩愯緭",
@@ -4160,6 +4591,22 @@
}
}
},
+ "request.OperationCondition": {
+ "type": "object",
+ "properties": {
+ "condition": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ }
+ }
+ },
"request.OperationDetails": {
"type": "object",
"properties": {
@@ -4171,9 +4618,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"
}
}
},
@@ -4259,6 +4714,28 @@
"type": "integer"
},
"productId": {
+ "type": "string"
+ }
+ }
+ },
+ "request.SaveUnitDict": {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/request.UnitDict"
+ }
+ }
+ }
+ },
+ "request.UnitDict": {
+ "type": "object",
+ "properties": {
+ "isDefault": {
+ "type": "boolean"
+ },
+ "name": {
"type": "string"
}
}
@@ -4402,6 +4879,12 @@
"request.UpdateOperation": {
"type": "object",
"properties": {
+ "accountant": {
+ "type": "string"
+ },
+ "accountantId": {
+ "type": "string"
+ },
"baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
@@ -4430,17 +4913,23 @@
"description": "鑱旂郴浜哄鍚�-闈炲繀濉�",
"type": "string"
},
+ "custodian": {
+ "type": "string"
+ },
+ "custodianId": {
+ "type": "string"
+ },
"details": {
"type": "array",
"items": {
"$ref": "#/definitions/request.OperationDetails"
}
},
- "fromLocationId": {
- "description": "婧愪綅缃甶d",
+ "id": {
"type": "integer"
},
- "id": {
+ "locationId": {
+ "description": "婧愪綅缃甶d",
"type": "integer"
},
"logisticCompanyId": {
@@ -4450,12 +4939,18 @@
"description": "鐗╂祦閲嶉噺",
"type": "number"
},
+ "manager": {
+ "type": "string"
+ },
+ "managerId": {
+ "type": "string"
+ },
"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": {
@@ -4659,6 +5154,10 @@
"operationId": {
"type": "integer"
},
+ "operationTypeName": {
+ "description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
+ },
"productId": {
"type": "string"
},
@@ -4694,6 +5193,10 @@
"description": "鏁伴噺",
"type": "number"
},
+ "locationId": {
+ "description": "浣嶇疆id",
+ "type": "integer"
+ },
"locationName": {
"description": "浣嶇疆鍚嶇О",
"type": "string"
--
Gitblit v1.8.0