From 0b7036989cbbe1073e5338dc57b395c6d10ee0d1 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 20 六月 2024 10:01:42 +0800
Subject: [PATCH] 物料导入保存动态属性代码逻辑修正
---
docs/docs.go | 1235 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 1,152 insertions(+), 83 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 3e5d8f7..56ac84f 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -416,7 +416,7 @@
}
}
},
- "/api-wms/v1/forms/getHistory": {
+ "/api-wms/v1/forms/doMonthStats": {
"post": {
"produces": [
"application/json"
@@ -424,8 +424,67 @@
"tags": [
"鎶ヨ〃"
],
- "summary": "鑾峰彇鍘嗗彶淇℃伅",
+ "summary": "鎵嬪姩璺戞湀搴︾粺璁″簱瀛樻姤琛�",
"parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.DoMonthStats"
+ }
+ },
+ {
+ "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/forms/downloadHistory": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃"
+ ],
+ "summary": "涓嬭浇鍑哄叆搴撴槑缁嗘姤琛�",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
{
"description": "鏌ヨ鍙傛暟",
"name": "object",
@@ -450,7 +509,215 @@
"data": {
"type": "array",
"items": {
- "$ref": "#/definitions/response.InventoryHistory"
+ "$ref": "#/definitions/models.MoveHistory"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/forms/downloadInventoryForms": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃"
+ ],
+ "summary": "涓嬭浇搴撳瓨鎶ヨ〃",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
+ "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/downloadLocationForms": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃"
+ ],
+ "summary": "涓嬭浇浣嶇疆鎶ヨ〃",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
+ "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/forms/downloadMonthStats": {
+ "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/forms/getHistory": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃"
+ ],
+ "summary": "鑾峰彇鍑哄叆搴撴槑缁�",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
+ "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/models.MoveHistory"
}
}
}
@@ -471,6 +738,13 @@
],
"summary": "鑾峰彇搴撳瓨鎶ヨ〃",
"parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
{
"description": "鏌ヨ鍙傛暟",
"name": "object",
@@ -517,6 +791,13 @@
"summary": "鑾峰彇浣嶇疆鎶ヨ〃",
"parameters": [
{
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ },
+ {
"description": "鏌ヨ鍙傛暟",
"name": "object",
"in": "body",
@@ -541,6 +822,58 @@
"type": "array",
"items": {
"$ref": "#/definitions/response.LocationForms"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/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"
}
}
}
@@ -936,6 +1269,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": [
@@ -997,7 +1372,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.PageInfo"
+ "$ref": "#/definitions/request.GetList"
}
}
],
@@ -1173,6 +1548,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"
+ }
+ }
+ }
+ }
+ ]
}
}
}
@@ -1441,6 +1861,7 @@
"parameters": [
{
"type": "string",
+ "description": "鍏抽敭瀛楁悳绱�",
"name": "keyword",
"in": "query"
},
@@ -1454,6 +1875,12 @@
"type": "integer",
"description": "姣忛〉澶у皬",
"name": "pageSize",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "浠撳簱id",
+ "name": "warehouseId",
"in": "query"
}
],
@@ -1930,6 +2357,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": [
@@ -2045,6 +2538,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"
}
}
}
@@ -2770,6 +3293,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": [
@@ -2902,6 +3452,29 @@
"ReservationNever"
]
},
+ "gorm.DeletedAt": {
+ "type": "object",
+ "properties": {
+ "time": {
+ "type": "string"
+ },
+ "valid": {
+ "description": "Valid is true if Time is not NULL",
+ "type": "boolean"
+ }
+ }
+ },
+ "inventory_order.WorkerInfo": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
+ },
"models.Attachment": {
"type": "object",
"properties": {
@@ -2919,6 +3492,46 @@
},
"id": {
"type": "integer"
+ }
+ }
+ },
+ "models.Attribute": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "dataType": {
+ "description": "鍊肩被鍨嬶紙1瀛楃涓� 2 int 3 涓嬫媺妗� 锛�",
+ "type": "integer"
+ },
+ "deletedAt": {
+ "$ref": "#/definitions/gorm.DeletedAt"
+ },
+ "entityType": {
+ "description": "缁欒皝鐢ㄧ殑 1 鐗╂枡锛堜骇鍝侊級",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "灞炴�у悕绉�",
+ "type": "string"
+ },
+ "selectValues": {
+ "description": "dateType=3鏃剁敤",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "updatedAt": {
+ "type": "string"
+ },
+ "value": {
+ "description": "浠嶢ttributeValue鍙栧埌鐨剉alue",
+ "type": "string"
}
}
},
@@ -3055,6 +3668,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"
}
}
},
@@ -3093,6 +3761,7 @@
"type": "number"
},
"attachmentIDs": {
+ "description": "浠ヤ笅涓轰笉瀛樺簱鐨勫瓧娈�",
"type": "array",
"items": {
"type": "integer"
@@ -3102,6 +3771,13 @@
"type": "array",
"items": {
"$ref": "#/definitions/models.Attachment"
+ }
+ },
+ "attributes": {
+ "description": "鍔ㄦ�佸睘鎬�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Attribute"
}
},
"autoIncr": {
@@ -3163,6 +3839,12 @@
"description": "瀹㈡埛鍓嶇疆鏃堕棿(澶�)",
"type": "number"
},
+ "grossUnit": {
+ "type": "string"
+ },
+ "grossWeight": {
+ "type": "number"
+ },
"id": {
"type": "string"
},
@@ -3197,6 +3879,14 @@
"description": "鏄惁閿�鍞�",
"type": "boolean"
},
+ "isStorage": {
+ "description": "鏃犲簱瀛樼殑鍦╳ms浠ュ強srm涓渶瑕佽繃婊ゆ帀",
+ "type": "integer"
+ },
+ "isVirtual": {
+ "description": "铏氭嫙鐗╂枡鍦∕RP璁＄畻鏃惰烦杩囪灞傜骇鐩存帴棰嗙敤涓嬬骇鐗╂枡锛岃櫄鎷熺墿鏂欎笉鐢熸垚宸ュ崟",
+ "type": "integer"
+ },
"makeAdvanceTime": {
"description": "鍒堕�犲墠缃椂闂�(澶�)",
"type": "number"
@@ -3229,9 +3919,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"
@@ -3285,6 +3990,12 @@
"purchaseType": {
"$ref": "#/definitions/constvar.PurchaseType"
},
+ "purchaseTypeList": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
"reorderRuleNum": {
"type": "integer"
},
@@ -3328,9 +4039,171 @@
}
}
},
+ "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.MoveHistory": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "鏁伴噺",
+ "type": "number"
+ },
+ "baseOperationType": {
+ "description": "鍩虹浣滀笟绫诲瀷",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.BaseOperationType"
+ }
+ ]
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "fromLocation": {
+ "description": "婧愪綅缃�",
+ "type": "string"
+ },
+ "fromLocationId": {
+ "description": "婧愪綅缃甶d",
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "number": {
+ "description": "鍗曞彿",
+ "type": "string"
+ },
+ "operationId": {
+ "description": "鎿嶄綔id",
+ "type": "integer"
+ },
+ "operationTypeId": {
+ "description": "浣滀笟绫诲瀷id",
+ "type": "integer"
+ },
+ "operationTypeName": {
+ "description": "浣滀笟绫诲瀷鍚嶇О",
+ "type": "string"
+ },
+ "operator": {
+ "description": "鎿嶄綔鑰�",
+ "type": "string"
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "toLocation": {
+ "description": "鐩爣浣嶇疆",
+ "type": "string"
+ },
+ "toLocationId": {
+ "description": "鐩爣浣嶇疆id",
+ "type": "integer"
+ },
+ "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"
},
@@ -3342,11 +4215,17 @@
}
]
},
+ "checkedAt": {
+ "type": "string"
+ },
+ "checkedBy": {
+ "type": "string"
+ },
"comment": {
"type": "string"
},
"companyID": {
- "type": "integer"
+ "type": "string"
},
"companyName": {
"type": "string"
@@ -3357,7 +4236,16 @@
"contacterName": {
"type": "string"
},
+ "createBy": {
+ "type": "string"
+ },
"createTime": {
+ "type": "string"
+ },
+ "custodian": {
+ "type": "string"
+ },
+ "custodianId": {
"type": "string"
},
"details": {
@@ -3391,6 +4279,12 @@
"description": "鐗╂祦閲嶉噺",
"type": "number"
},
+ "manager": {
+ "type": "string"
+ },
+ "managerId": {
+ "type": "string"
+ },
"number": {
"description": "鍗曞彿",
"type": "string"
@@ -3398,6 +4292,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",
@@ -3416,6 +4318,9 @@
"receiverPhone": {
"type": "string"
},
+ "salesDetailsNumber": {
+ "type": "string"
+ },
"source": {
"type": "string"
},
@@ -3430,6 +4335,18 @@
"$ref": "#/definitions/constvar.OperationStatus"
}
]
+ },
+ "toLocation": {
+ "description": "鐩爣浣嶇疆",
+ "allOf": [
+ {
+ "$ref": "#/definitions/models.Location"
+ }
+ ]
+ },
+ "toLocationId": {
+ "description": "鐩爣浣嶇疆id",
+ "type": "integer"
},
"updateTime": {
"type": "string"
@@ -3451,6 +4368,12 @@
"description": "ProductName string ` + "`" + `json:\"productName\" gorm:\"type:varchar(255);not null;comment:浜у搧鍚嶇О\"` + "`" + ` //浜у搧鍚嶇О",
"type": "number"
},
+ "auxiliaryAmount": {
+ "type": "number"
+ },
+ "auxiliaryUnit": {
+ "type": "string"
+ },
"createTime": {
"type": "string"
},
@@ -3468,6 +4391,9 @@
},
"id": {
"type": "integer"
+ },
+ "note": {
+ "type": "string"
},
"operationId": {
"description": "鎿嶄綔id",
@@ -3496,6 +4422,12 @@
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
+ },
+ "totalGrossWeight": {
+ "type": "number"
+ },
+ "totalNetWeight": {
+ "type": "number"
},
"updateTime": {
"type": "string"
@@ -3616,11 +4548,37 @@
}
}
},
+ "models.UnitDict": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "isDefault": {
+ "type": "boolean"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
+ },
+ "models.UnitItems": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "type": "number"
+ },
+ "floating": {
+ "description": "鏄惁娴姩鍒╃巼",
+ "type": "boolean"
+ },
+ "unit": {
+ "type": "string"
+ }
+ }
+ },
"models.Warehouse": {
"type": "object",
- "required": [
- "code"
- ],
"properties": {
"active": {
"description": "鏄惁鍚敤锛屼紶true灏辫",
@@ -3636,15 +4594,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"
@@ -3657,7 +4617,7 @@
"type": "integer"
},
"locationId": {
- "description": "浣嶇疆id",
+ "description": "榛樿浣嶇疆id",
"type": "integer"
},
"name": {
@@ -3782,13 +4742,19 @@
"request.AddOperation": {
"type": "object",
"properties": {
+ "accountant": {
+ "type": "string"
+ },
+ "accountantId": {
+ "type": "string"
+ },
"comment": {
"description": "澶囨敞",
"type": "string"
},
"companyID": {
"description": "鍏徃ID-瀹㈡埛",
- "type": "integer"
+ "type": "string"
},
"companyName": {
"description": "鍏徃鍚嶇О-瀹㈡埛鍚嶇О",
@@ -3800,6 +4766,12 @@
},
"contacterName": {
"description": "鑱旂郴浜哄鍚�-闈炲繀濉�",
+ "type": "string"
+ },
+ "custodian": {
+ "type": "string"
+ },
+ "custodianId": {
"type": "string"
},
"details": {
@@ -3821,6 +4793,12 @@
"logisticWeight": {
"description": "鐗╂祦閲嶉噺",
"type": "number"
+ },
+ "manager": {
+ "type": "string"
+ },
+ "managerId": {
+ "type": "string"
},
"number": {
"description": "鍗曞彿",
@@ -3858,6 +4836,10 @@
"$ref": "#/definitions/constvar.OperationStatus"
}
]
+ },
+ "toLocationId": {
+ "description": "鐩爣浣嶇疆id",
+ "type": "integer"
},
"waybillNumber": {
"description": "杩愬崟鍙�",
@@ -3969,6 +4951,10 @@
"maxLength": 5,
"minLength": 1
},
+ "contacts": {
+ "description": "鑱旂郴浜�",
+ "type": "string"
+ },
"inboundTransportation": {
"description": "鍏ュ悜杩愯緭",
"type": "integer"
@@ -3995,6 +4981,14 @@
"items": {
"type": "string"
}
+ }
+ }
+ },
+ "request.DoMonthStats": {
+ "type": "object",
+ "properties": {
+ "token": {
+ "type": "string"
}
}
},
@@ -4091,6 +5085,22 @@
}
}
},
+ "request.GetList": {
+ "type": "object",
+ "properties": {
+ "keyword": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ }
+ }
+ },
"request.GetLocationForms": {
"type": "object",
"properties": {
@@ -4139,6 +5149,25 @@
"type": "integer"
},
"type": {
+ "type": "integer"
+ }
+ }
+ },
+ "request.GetMonthStats": {
+ "type": "object",
+ "properties": {
+ "date": {
+ "type": "string"
+ },
+ "keyword": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
"type": "integer"
}
}
@@ -4226,12 +5255,24 @@
"condition": {
"type": "string"
},
+ "keyword": {
+ "description": "鍏抽敭瀛楁悳绱�",
+ "type": "string"
+ },
+ "locationId": {
+ "description": "浣嶇疆ID",
+ "type": "integer"
+ },
"page": {
"description": "椤电爜",
"type": "integer"
},
"pageSize": {
"description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "warehouseId": {
+ "description": "浠撳簱ID",
"type": "integer"
}
}
@@ -4247,6 +5288,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"
@@ -4258,6 +5307,14 @@
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
+ },
+ "totalGrossWeight": {
+ "description": "鎬绘瘺閲�",
+ "type": "number"
+ },
+ "totalNetWeight": {
+ "description": "鎬诲噣閲�",
+ "type": "number"
}
}
},
@@ -4343,6 +5400,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"
}
}
@@ -4486,6 +5565,12 @@
"request.UpdateOperation": {
"type": "object",
"properties": {
+ "accountant": {
+ "type": "string"
+ },
+ "accountantId": {
+ "type": "string"
+ },
"baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
@@ -4500,7 +5585,7 @@
},
"companyID": {
"description": "鍏徃ID-瀹㈡埛",
- "type": "integer"
+ "type": "string"
},
"companyName": {
"description": "鍏徃鍚嶇О-瀹㈡埛鍚嶇О",
@@ -4512,6 +5597,12 @@
},
"contacterName": {
"description": "鑱旂郴浜哄鍚�-闈炲繀濉�",
+ "type": "string"
+ },
+ "custodian": {
+ "type": "string"
+ },
+ "custodianId": {
"type": "string"
},
"details": {
@@ -4533,6 +5624,12 @@
"logisticWeight": {
"description": "鐗╂祦閲嶉噺",
"type": "number"
+ },
+ "manager": {
+ "type": "string"
+ },
+ "managerId": {
+ "type": "string"
},
"number": {
"description": "鍗曞彿",
@@ -4570,6 +5667,10 @@
"$ref": "#/definitions/constvar.OperationStatus"
}
]
+ },
+ "toLocationId": {
+ "description": "鐩爣浣嶇疆id",
+ "type": "integer"
},
"waybillNumber": {
"description": "杩愬崟鍙�",
@@ -4664,9 +5765,23 @@
"description": "鍦ㄥ簱鏁伴噺",
"type": "number"
},
+ "amountMoreUnits": {
+ "description": "鍦ㄥ簱鏁伴噺澶氬崟浣�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitItems"
+ }
+ },
"availableNumber": {
"description": "鍙敤搴撳瓨",
"type": "number"
+ },
+ "availableNumberMoreUnits": {
+ "description": "鍙敤搴撳瓨澶氬崟浣�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitItems"
+ }
},
"cost": {
"description": "鎴愭湰",
@@ -4676,9 +5791,23 @@
"description": "鍏ュ簱",
"type": "number"
},
+ "inMoreUnits": {
+ "description": "鍏ュ簱澶氬崟浣�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitItems"
+ }
+ },
"out": {
"description": "鍑哄簱",
"type": "number"
+ },
+ "outMoreUnits": {
+ "description": "鍑哄簱澶氬崟浣�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitItems"
+ }
},
"produceId": {
"description": "浜у搧id",
@@ -4702,81 +5831,19 @@
}
}
},
- "response.InventoryHistory": {
- "type": "object",
- "properties": {
- "amount": {
- "description": "鏁伴噺",
- "type": "number"
- },
- "baseOperationType": {
- "description": "鍩虹浣滀笟绫诲瀷",
- "allOf": [
- {
- "$ref": "#/definitions/constvar.BaseOperationType"
- }
- ]
- },
- "contactedName": {
- "description": "瀹屾垚鑰�",
- "type": "string"
- },
- "date": {
- "description": "鏃ユ湡",
- "type": "string"
- },
- "fromLocation": {
- "description": "婧愪綅缃�",
- "type": "string"
- },
- "fromLocationId": {
- "type": "integer"
- },
- "number": {
- "description": "鍗曞彿",
- "type": "string"
- },
- "operationId": {
- "type": "integer"
- },
- "operationTypeName": {
- "description": "浣滀笟绫诲瀷鍚嶇О",
- "type": "string"
- },
- "productId": {
- "type": "string"
- },
- "productName": {
- "description": "浜у搧鍚嶇О",
- "type": "string"
- },
- "status": {
- "description": "鐘舵��",
- "type": "string"
- },
- "toLocation": {
- "description": "鐩爣浣嶇疆",
- "type": "string"
- },
- "toLocationId": {
- "type": "integer"
- },
- "unit": {
- "description": "鍗曚綅",
- "type": "string"
- },
- "weight": {
- "description": "閲嶉噺",
- "type": "number"
- }
- }
- },
"response.LocationForms": {
"type": "object",
"properties": {
"amount": {
"description": "鏁伴噺",
"type": "number"
+ },
+ "amountMoreUnits": {
+ "description": "鍦ㄥ簱鏁伴噺澶氬崟浣�",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.UnitItems"
+ }
},
"locationId": {
"description": "浣嶇疆id",
@@ -4873,6 +5940,8 @@
Description: "",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
+ LeftDelim: "{{",
+ RightDelim: "}}",
}
func init() {
--
Gitblit v1.8.0