From d2e6dff92184f2c6b9cff56ce04e2f11b8494672 Mon Sep 17 00:00:00 2001
From: lishihai <dslsh@dscom>
Date: 星期四, 13 六月 2024 11:37:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jialian' into jialian
---
docs/docs.go | 1084 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 1,001 insertions(+), 83 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 5a2c468..7837c42 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"
+ }
+ }
+ }
+ }
+ ]
}
}
}
@@ -1930,6 +2350,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 +2531,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 +3286,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 +3444,17 @@
"WhetherTypeAlways",
"ReservationNever"
]
+ },
+ "inventory_order.WorkerInfo": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
},
"models.Attachment": {
"type": "object",
@@ -3087,6 +3609,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 +3702,7 @@
"type": "number"
},
"attachmentIDs": {
+ "description": "浠ヤ笅涓轰笉瀛樺簱鐨勫瓧娈�",
"type": "array",
"items": {
"type": "integer"
@@ -3195,6 +3773,12 @@
"description": "瀹㈡埛鍓嶇疆鏃堕棿(澶�)",
"type": "number"
},
+ "grossUnit": {
+ "type": "string"
+ },
+ "grossWeight": {
+ "type": "number"
+ },
"id": {
"type": "string"
},
@@ -3229,6 +3813,14 @@
"description": "鏄惁閿�鍞�",
"type": "boolean"
},
+ "isStorage": {
+ "description": "鏃犲簱瀛樼殑鍦╳ms浠ュ強srm涓渶瑕佽繃婊ゆ帀",
+ "type": "integer"
+ },
+ "isVirtual": {
+ "description": "铏氭嫙鐗╂枡鍦∕RP璁＄畻鏃惰烦杩囪灞傜骇鐩存帴棰嗙敤涓嬬骇鐗╂枡锛岃櫄鎷熺墿鏂欎笉鐢熸垚宸ュ崟",
+ "type": "integer"
+ },
"makeAdvanceTime": {
"description": "鍒堕�犲墠缃椂闂�(澶�)",
"type": "number"
@@ -3261,9 +3853,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 +3924,12 @@
"purchaseType": {
"$ref": "#/definitions/constvar.PurchaseType"
},
+ "purchaseTypeList": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
"reorderRuleNum": {
"type": "integer"
},
@@ -3360,9 +3973,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"
},
@@ -3378,7 +4153,7 @@
"type": "string"
},
"companyID": {
- "type": "integer"
+ "type": "string"
},
"companyName": {
"type": "string"
@@ -3390,6 +4165,12 @@
"type": "string"
},
"createTime": {
+ "type": "string"
+ },
+ "custodian": {
+ "type": "string"
+ },
+ "custodianId": {
"type": "string"
},
"details": {
@@ -3423,6 +4204,12 @@
"description": "鐗╂祦閲嶉噺",
"type": "number"
},
+ "manager": {
+ "type": "string"
+ },
+ "managerId": {
+ "type": "string"
+ },
"number": {
"description": "鍗曞彿",
"type": "string"
@@ -3430,6 +4217,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 +4241,9 @@
"type": "string"
},
"receiverPhone": {
+ "type": "string"
+ },
+ "salesDetailsNumber": {
"type": "string"
},
"source": {
@@ -3495,6 +4293,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 +4344,12 @@
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
+ },
+ "totalGrossWeight": {
+ "type": "number"
+ },
+ "totalNetWeight": {
+ "type": "number"
},
"updateTime": {
"type": "string"
@@ -3660,11 +4470,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灏辫",
@@ -3680,15 +4516,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 +4539,7 @@
"type": "integer"
},
"locationId": {
- "description": "浣嶇疆id",
+ "description": "榛樿浣嶇疆id",
"type": "integer"
},
"name": {
@@ -3826,13 +4664,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": "鍏徃鍚嶇О-瀹㈡埛鍚嶇О",
@@ -3844,6 +4688,12 @@
},
"contacterName": {
"description": "鑱旂郴浜哄鍚�-闈炲繀濉�",
+ "type": "string"
+ },
+ "custodian": {
+ "type": "string"
+ },
+ "custodianId": {
"type": "string"
},
"details": {
@@ -3865,6 +4715,12 @@
"logisticWeight": {
"description": "鐗╂祦閲嶉噺",
"type": "number"
+ },
+ "manager": {
+ "type": "string"
+ },
+ "managerId": {
+ "type": "string"
},
"number": {
"description": "鍗曞彿",
@@ -4017,6 +4873,10 @@
"maxLength": 5,
"minLength": 1
},
+ "contacts": {
+ "description": "鑱旂郴浜�",
+ "type": "string"
+ },
"inboundTransportation": {
"description": "鍏ュ悜杩愯緭",
"type": "integer"
@@ -4043,6 +4903,14 @@
"items": {
"type": "string"
}
+ }
+ }
+ },
+ "request.DoMonthStats": {
+ "type": "object",
+ "properties": {
+ "token": {
+ "type": "string"
}
}
},
@@ -4139,6 +5007,22 @@
}
}
},
+ "request.GetList": {
+ "type": "object",
+ "properties": {
+ "keyword": {
+ "type": "string"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ }
+ }
+ },
"request.GetLocationForms": {
"type": "object",
"properties": {
@@ -4187,6 +5071,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"
}
}
@@ -4295,6 +5198,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 +5217,14 @@
"toLocationId": {
"description": "鐩爣浣嶇疆id",
"type": "integer"
+ },
+ "totalGrossWeight": {
+ "description": "鎬绘瘺閲�",
+ "type": "number"
+ },
+ "totalNetWeight": {
+ "description": "鎬诲噣閲�",
+ "type": "number"
}
}
},
@@ -4391,6 +5310,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 +5475,12 @@
"request.UpdateOperation": {
"type": "object",
"properties": {
+ "accountant": {
+ "type": "string"
+ },
+ "accountantId": {
+ "type": "string"
+ },
"baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
@@ -4548,7 +5495,7 @@
},
"companyID": {
"description": "鍏徃ID-瀹㈡埛",
- "type": "integer"
+ "type": "string"
},
"companyName": {
"description": "鍏徃鍚嶇О-瀹㈡埛鍚嶇О",
@@ -4560,6 +5507,12 @@
},
"contacterName": {
"description": "鑱旂郴浜哄鍚�-闈炲繀濉�",
+ "type": "string"
+ },
+ "custodian": {
+ "type": "string"
+ },
+ "custodianId": {
"type": "string"
},
"details": {
@@ -4581,6 +5534,12 @@
"logisticWeight": {
"description": "鐗╂祦閲嶉噺",
"type": "number"
+ },
+ "manager": {
+ "type": "string"
+ },
+ "managerId": {
+ "type": "string"
},
"number": {
"description": "鍗曞彿",
@@ -4716,9 +5675,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": "鎴愭湰",
@@ -4728,9 +5701,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",
@@ -4750,75 +5737,6 @@
},
"value": {
"description": "鎬讳环鍊�",
- "type": "number"
- }
- }
- },
- "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"
}
}
--
Gitblit v1.8.0