From 7d1b46b246613585acda03a2148db76ebea79de1 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期四, 18 四月 2024 18:16:17 +0800
Subject: [PATCH] 物料字段类型修改
---
docs/docs.go | 589 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 582 insertions(+), 7 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 5a2c468..fd049ed 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -551,6 +551,58 @@
}
}
},
+ "/api-wms/v1/forms/monthStats": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃"
+ ],
+ "summary": "鏈堝害缁熻搴撳瓨鎶ヨ〃",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetMonthStats"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.MonthStats"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/location/addLocation": {
"post": {
"produces": [
@@ -936,6 +988,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": [
@@ -1173,6 +1267,51 @@
"description": "鎴愬姛",
"schema": {
"$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/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"
+ }
+ }
+ }
+ }
+ ]
}
}
}
@@ -1930,6 +2069,40 @@
}
}
},
+ "/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": [
@@ -2077,6 +2250,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"
}
}
}
@@ -2802,6 +3005,33 @@
"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": {
"type": "integer",
"enum": [
@@ -2933,6 +3163,17 @@
"WhetherTypeAlways",
"ReservationNever"
]
+ },
+ "inventory_order.WorkerInfo": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
},
"models.Attachment": {
"type": "object",
@@ -3087,6 +3328,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"
}
}
},
@@ -3125,6 +3421,7 @@
"type": "number"
},
"attachmentIDs": {
+ "description": "浠ヤ笅涓轰笉瀛樺簱鐨勫瓧娈�",
"type": "array",
"items": {
"type": "integer"
@@ -3195,6 +3492,12 @@
"description": "瀹㈡埛鍓嶇疆鏃堕棿(澶�)",
"type": "number"
},
+ "grossUnit": {
+ "type": "string"
+ },
+ "grossWeight": {
+ "type": "number"
+ },
"id": {
"type": "string"
},
@@ -3229,6 +3532,14 @@
"description": "鏄惁閿�鍞�",
"type": "boolean"
},
+ "isStorage": {
+ "description": "鏃犲簱瀛樼殑鍦╳ms浠ュ強srm涓渶瑕佽繃婊ゆ帀",
+ "type": "integer"
+ },
+ "isVirtual": {
+ "description": "铏氭嫙鐗╂枡鍦∕RP璁＄畻鏃惰烦杩囪灞傜骇鐩存帴棰嗙敤涓嬬骇鐗╂枡锛岃櫄鎷熺墿鏂欎笉鐢熸垚宸ュ崟",
+ "type": "integer"
+ },
"makeAdvanceTime": {
"description": "鍒堕�犲墠缃椂闂�(澶�)",
"type": "number"
@@ -3261,9 +3572,24 @@
}
]
},
+ "moreUnit": {
+ "type": "boolean"
+ },
+ "moreUnitList": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitItems"
+ }
+ },
"name": {
"description": "鐗╂枡鍚嶇О",
"type": "string"
+ },
+ "netUnit": {
+ "type": "string"
+ },
+ "netWeight": {
+ "type": "number"
},
"note": {
"type": "string"
@@ -3317,6 +3643,12 @@
"purchaseType": {
"$ref": "#/definitions/constvar.PurchaseType"
},
+ "purchaseTypeList": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
"reorderRuleNum": {
"type": "integer"
},
@@ -3360,9 +3692,93 @@
}
}
},
+ "models.MonthStats": {
+ "type": "object",
+ "properties": {
+ "MoreUnitsArr": {
+ "description": "鏈熸湯鍏朵粬鍗曚綅鏁扮粍",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitItems"
+ }
+ },
+ "amount": {
+ "description": "鏈熸湯缁撲綑鏁伴噺",
+ "type": "number"
+ },
+ "beginAmount": {
+ "description": "鏈熷垵鏁伴噺",
+ "type": "number"
+ },
+ "beginMoreUnitsArr": {
+ "description": "鏈熷垵鍏朵粬鍗曚綅鏁扮粍",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitItems"
+ }
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "date": {
+ "description": "鏃ユ湡 2024-04",
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "inputAmount": {
+ "description": "鍏ュ簱鏁伴噺",
+ "type": "number"
+ },
+ "inputMoreUnitsArr": {
+ "description": "鍏ュ簱鍏朵粬鍗曚綅鏁扮粍",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitItems"
+ }
+ },
+ "outputAmount": {
+ "description": "鍑哄簱鏁伴噺",
+ "type": "number"
+ },
+ "outputMoreUnitsArr": {
+ "description": "鍑哄簱鍏朵粬鍗曚綅鏁扮粍",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitItems"
+ }
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
+ },
+ "updateTime": {
+ "type": "string"
+ },
+ "weight": {
+ "description": "閲嶉噺",
+ "type": "number"
+ }
+ }
+ },
"models.Operation": {
"type": "object",
"properties": {
+ "accountant": {
+ "type": "string"
+ },
+ "accountantId": {
+ "type": "string"
+ },
"auditDate": {
"type": "string"
},
@@ -3390,6 +3806,12 @@
"type": "string"
},
"createTime": {
+ "type": "string"
+ },
+ "custodian": {
+ "type": "string"
+ },
+ "custodianId": {
"type": "string"
},
"details": {
@@ -3423,6 +3845,12 @@
"description": "鐗╂祦閲嶉噺",
"type": "number"
},
+ "manager": {
+ "type": "string"
+ },
+ "managerId": {
+ "type": "string"
+ },
"number": {
"description": "鍗曞彿",
"type": "string"
@@ -3430,6 +3858,14 @@
"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",
@@ -3446,6 +3882,9 @@
"type": "string"
},
"receiverPhone": {
+ "type": "string"
+ },
+ "salesDetailsNumber": {
"type": "string"
},
"source": {
@@ -3495,6 +3934,12 @@
"description": "ProductName string ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` + "`" + ` //浜у搧鍚嶇О",
"type": "number"
},
+ "auxiliaryAmount": {
+ "type": "number"
+ },
+ "auxiliaryUnit": {
+ "type": "string"
+ },
"createTime": {
"type": "string"
},
@@ -3540,6 +3985,12 @@
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
+ },
+ "totalGrossWeight": {
+ "type": "number"
+ },
+ "totalNetWeight": {
+ "type": "number"
},
"updateTime": {
"type": "string"
@@ -3660,11 +4111,36 @@
}
}
},
+ "models.UnitDict": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "isDefault": {
+ "type": "boolean"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
+ },
+ "models.UnitItems": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "type": "number"
+ },
+ "floating": {
+ "type": "boolean"
+ },
+ "unit": {
+ "type": "string"
+ }
+ }
+ },
"models.Warehouse": {
"type": "object",
- "required": [
- "code"
- ],
"properties": {
"active": {
"description": "鏄惁鍚敤锛屼紶true灏辫",
@@ -3680,15 +4156,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"
@@ -3701,7 +4179,7 @@
"type": "integer"
},
"locationId": {
- "description": "浣嶇疆id",
+ "description": "榛樿浣嶇疆id",
"type": "integer"
},
"name": {
@@ -3826,6 +4304,12 @@
"request.AddOperation": {
"type": "object",
"properties": {
+ "accountant": {
+ "type": "string"
+ },
+ "accountantId": {
+ "type": "string"
+ },
"comment": {
"description": "澶囨敞",
"type": "string"
@@ -3844,6 +4328,12 @@
},
"contacterName": {
"description": "鑱旂郴浜哄鍚�-闈炲繀濉�",
+ "type": "string"
+ },
+ "custodian": {
+ "type": "string"
+ },
+ "custodianId": {
"type": "string"
},
"details": {
@@ -3865,6 +4355,12 @@
"logisticWeight": {
"description": "鐗╂祦閲嶉噺",
"type": "number"
+ },
+ "manager": {
+ "type": "string"
+ },
+ "managerId": {
+ "type": "string"
},
"number": {
"description": "鍗曞彿",
@@ -4016,6 +4512,10 @@
"type": "string",
"maxLength": 5,
"minLength": 1
+ },
+ "contacts": {
+ "description": "鑱旂郴浜�",
+ "type": "string"
},
"inboundTransportation": {
"description": "鍏ュ悜杩愯緭",
@@ -4191,6 +4691,25 @@
}
}
},
+ "request.GetMonthStats": {
+ "type": "object",
+ "properties": {
+ "date": {
+ "type": "string"
+ },
+ "keyword": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ }
+ }
+ },
"request.GetProductList": {
"type": "object",
"properties": {
@@ -4295,6 +4814,14 @@
"description": "ProductName string ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` + "`" + ` //浜у搧鍚嶇О",
"type": "number"
},
+ "auxiliaryAmount": {
+ "description": "杈呭姪鏁伴噺",
+ "type": "number"
+ },
+ "auxiliaryUnit": {
+ "description": "杈呭姪鍗曚綅",
+ "type": "string"
+ },
"fromLocationId": {
"description": "Unit string ` + "`" + `json:\"unit\" gorm:\"type:varchar(31);comment:鍗曚綅\"` + "`" + ` //鍗曚綅\nProduct models.Material ` + "`" + `json:\"product\" gorm:\"foreignKey:ProductId;references:ID\"` + "`" + `",
"type": "integer"
@@ -4306,6 +4833,14 @@
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
+ },
+ "totalGrossWeight": {
+ "description": "鎬绘瘺閲�",
+ "type": "number"
+ },
+ "totalNetWeight": {
+ "description": "鎬诲噣閲�",
+ "type": "number"
}
}
},
@@ -4391,6 +4926,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"
}
}
@@ -4534,6 +5091,12 @@
"request.UpdateOperation": {
"type": "object",
"properties": {
+ "accountant": {
+ "type": "string"
+ },
+ "accountantId": {
+ "type": "string"
+ },
"baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
@@ -4562,6 +5125,12 @@
"description": "鑱旂郴浜哄鍚�-闈炲繀濉�",
"type": "string"
},
+ "custodian": {
+ "type": "string"
+ },
+ "custodianId": {
+ "type": "string"
+ },
"details": {
"type": "array",
"items": {
@@ -4582,6 +5151,12 @@
"description": "鐗╂祦閲嶉噺",
"type": "number"
},
+ "manager": {
+ "type": "string"
+ },
+ "managerId": {
+ "type": "string"
+ },
"number": {
"description": "鍗曞彿",
"type": "string"
--
Gitblit v1.8.0