From c1389eedfaf1c044b48b94c7a8d9d9bb4cca1064 Mon Sep 17 00:00:00 2001
From: muzexing <muzexing@qq.com>
Date: 星期六, 06 七月 2024 15:22:43 +0800
Subject: [PATCH] 出库/入库打印 修改bug
---
docs/docs.go | 536 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 480 insertions(+), 56 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 4d24113..aee23f5 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -773,6 +773,58 @@
}
}
},
+ "/api-wms/v1/forms/doWarehouseMonthStats": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃"
+ ],
+ "summary": "鎵嬪姩璺戞湀搴︾粺璁″簱瀛樻姤琛�",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.DoWarehouseMonthStats"
+ }
+ },
+ {
+ "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": [
@@ -938,6 +990,58 @@
"鎶ヨ〃"
],
"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/downloadWarehouseMonthStats": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鎶ヨ〃"
+ ],
+ "summary": "涓嬭浇鎸変粨搴撶粺璁℃湀搴︾粺璁″簱瀛樻姤琛�",
"parameters": [
{
"description": "鏌ヨ鍙傛暟",
@@ -1179,6 +1283,58 @@
"type": "array",
"items": {
"$ref": "#/definitions/models.MonthStats"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/forms/warehouseMonthStats": {
+ "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.WarehouseMonthStats"
}
}
}
@@ -1691,6 +1847,43 @@
}
}
},
+ "/api-wms/v1/locationProductAmount/locationProductList": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "搴撳瓨鐩樼偣"
+ ],
+ "summary": "鑾峰彇浣嶇疆瀵瑰簲浜у搧鍒楄〃",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.GetLocationProductList"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/util.ResponseList"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/locationProductAmount/update": {
"post": {
"produces": [
@@ -1838,7 +2031,7 @@
"tags": [
"鍏ュ簱/鍑哄簱"
],
- "summary": "鍏ュ簱/鍑哄簱鍒楄〃",
+ "summary": "鎿嶄綔璇︽儏鎺ュ彛",
"parameters": [
{
"type": "string",
@@ -1846,13 +2039,32 @@
"name": "id",
"in": "path",
"required": true
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
}
],
"responses": {
"200": {
"description": "鎴愬姛",
"schema": {
- "$ref": "#/definitions/util.Response"
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/models.Operation"
+ }
+ }
+ }
+ ]
}
}
}
@@ -1867,37 +2079,11 @@
"鍏ュ簱/鍑哄簱"
],
"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"
- }
- }
- }
- }
- ]
+ "$ref": "#/definitions/util.Response"
}
}
}
@@ -1946,7 +2132,22 @@
"200": {
"description": "鎴愬姛",
"schema": {
- "$ref": "#/definitions/util.Response"
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.ResponseList"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.Operation"
+ }
+ }
+ }
+ }
+ ]
}
}
}
@@ -2183,9 +2384,9 @@
"in": "query"
},
{
- "type": "integer",
+ "type": "string",
"description": "浠撳簱id",
- "name": "warehouseId",
+ "name": "warehouseIds",
"in": "query"
}
],
@@ -2626,6 +2827,31 @@
}
}
},
+ "/api-wms/v1/product/downloadInputFormat": {
+ "get": {
+ "tags": [
+ "浜у搧"
+ ],
+ "summary": "涓嬭浇瀵煎叆鐗╂枡/浜у搧妯℃澘",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/product/finishDisuse/{id}": {
"put": {
"produces": [
@@ -2953,9 +3179,9 @@
"application/xlsx"
],
"tags": [
- "鐗╂枡绠＄悊"
+ "浜у搧"
],
- "summary": "瀵煎叆鐗╂枡",
+ "summary": "瀵煎叆鐗╂枡/浜у搧",
"parameters": [
{
"type": "file",
@@ -3794,6 +4020,21 @@
"BaseOperationTypeAdjust"
]
},
+ "constvar.BoolType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "BoolTypeFalse": "false",
+ "BoolTypeTrue": "true"
+ },
+ "x-enum-varnames": [
+ "BoolTypeTrue",
+ "BoolTypeFalse"
+ ]
+ },
"constvar.CostingMethod": {
"type": "integer",
"enum": [
@@ -3965,17 +4206,23 @@
"enum": [
1,
2,
- 3
+ 3,
+ 4,
+ 5
],
"x-enum-comments": {
+ "DisuseType": "鎶ュ簾绫诲瀷",
"StockoutType": "鍑哄簱绫诲瀷",
"StorageType": "鍏ュ簱绫诲瀷",
+ "TakeStockType": "鐩樼偣绫诲瀷",
"TransferType": "璋冩嫧绫诲瀷"
},
"x-enum-varnames": [
- "TransferType",
"StorageType",
- "StockoutType"
+ "StockoutType",
+ "TransferType",
+ "TakeStockType",
+ "DisuseType"
]
},
"constvar.OperationSource": {
@@ -4158,17 +4405,6 @@
"valid": {
"description": "Valid is true if Time is not NULL",
"type": "boolean"
- }
- }
- },
- "inventory_order.WorkerInfo": {
- "type": "object",
- "properties": {
- "id": {
- "type": "string"
- },
- "name": {
- "type": "string"
}
}
},
@@ -4401,7 +4637,7 @@
"$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\"` + "`" + `",
+ "description": "浣嶇疆id",
"type": "integer"
},
"product": {
@@ -4420,6 +4656,9 @@
},
"updateTime": {
"type": "string"
+ },
+ "warehouseId": {
+ "type": "integer"
}
}
},
@@ -4850,6 +5089,21 @@
}
}
},
+ "models.MonthStatsItemsType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "MonthStatsItemsTypeInput": "鍏ュ簱",
+ "MonthStatsItemsTypeOutput": "鍑哄簱"
+ },
+ "x-enum-varnames": [
+ "MonthStatsItemsTypeInput",
+ "MonthStatsItemsTypeOutput"
+ ]
+ },
"models.MoveHistory": {
"type": "object",
"properties": {
@@ -4978,6 +5232,9 @@
"custodianId": {
"type": "string"
},
+ "dealerType": {
+ "type": "string"
+ },
"details": {
"type": "array",
"items": {
@@ -4985,12 +5242,6 @@
}
},
"id": {
- "type": "integer"
- },
- "inventoryDealer": {
- "$ref": "#/definitions/models.MiniDict"
- },
- "inventoryDealerType": {
"type": "integer"
},
"isInternalOutput": {
@@ -5030,7 +5281,6 @@
"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": {
@@ -5094,6 +5344,9 @@
"updateTime": {
"type": "string"
},
+ "warehouse": {
+ "$ref": "#/definitions/models.Warehouse"
+ },
"warehouseId": {
"type": "integer"
},
@@ -5120,11 +5373,23 @@
"auxiliaryUnit": {
"type": "string"
},
+ "baseOperationType": {
+ "description": "鍩虹浣滀笟绫诲瀷",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.BaseOperationType"
+ }
+ ]
+ },
"cost": {
"description": "鎴愭湰鍗曚环",
"type": "number"
},
"createTime": {
+ "type": "string"
+ },
+ "dealerType": {
+ "description": "鍑哄叆搴撶被鍨�",
"type": "string"
},
"fromLocation": {
@@ -5167,6 +5432,10 @@
},
"salePrice": {
"description": "閿�鍞崟浠�",
+ "type": "number"
+ },
+ "stockAmount": {
+ "description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�",
"type": "number"
},
"toLocation": {
@@ -5418,6 +5687,14 @@
"description": "浠撳簱鍚嶇О",
"type": "string"
},
+ "openMonthStats": {
+ "description": "鏄惁寮�鍚湀搴︾粺璁�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.BoolType"
+ }
+ ]
+ },
"outboundTransportation": {
"description": "鍑哄簱杩愯緭",
"type": "integer"
@@ -5446,6 +5723,93 @@
"warehouseLocation": {
"description": "搴撳瓨浣嶇疆",
"type": "string"
+ }
+ }
+ },
+ "models.WarehouseMonthStats": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "鏈熸湯缁撲綑鏁伴噺",
+ "type": "number"
+ },
+ "beginAmount": {
+ "description": "鏈熷垵鏁伴噺",
+ "type": "number"
+ },
+ "createTime": {
+ "type": "string"
+ },
+ "date": {
+ "description": "鏃ユ湡 2024-04",
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "inputAmount": {
+ "description": "鍏ュ簱鏁伴噺",
+ "type": "number"
+ },
+ "inputItems": {
+ "description": "鍏ュ簱鏄庣粏",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.WarehouseStatsItems"
+ }
+ },
+ "outputAmount": {
+ "description": "鍑哄簱鏁伴噺",
+ "type": "number"
+ },
+ "outputItems": {
+ "description": "鍑哄簱鏄庣粏",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.WarehouseStatsItems"
+ }
+ },
+ "productId": {
+ "description": "浜у搧id",
+ "type": "string"
+ },
+ "productName": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "salePrice": {
+ "description": "閿�鍞崟浠�",
+ "type": "number"
+ },
+ "unit": {
+ "description": "鍗曚綅",
+ "type": "string"
+ },
+ "updateTime": {
+ "type": "string"
+ },
+ "warehouseId": {
+ "description": "浠撳簱ID",
+ "type": "integer"
+ }
+ }
+ },
+ "models.WarehouseStatsItems": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "description": "鏁伴噺",
+ "type": "number"
+ },
+ "name": {
+ "description": "鍏ュ簱鏉ユ簮锛屽嚭搴撳幓澶�",
+ "type": "string"
+ },
+ "type": {
+ "$ref": "#/definitions/models.MonthStatsItemsType"
+ },
+ "warehouseMonthStatsId": {
+ "type": "integer"
}
}
},
@@ -5636,6 +6000,9 @@
"type": "string"
},
"custodianId": {
+ "type": "string"
+ },
+ "dealerType": {
"type": "string"
},
"details": {
@@ -5879,6 +6246,14 @@
}
}
},
+ "request.DoWarehouseMonthStats": {
+ "type": "object",
+ "properties": {
+ "token": {
+ "type": "string"
+ }
+ }
+ },
"request.EditMiniDict": {
"type": "object",
"properties": {
@@ -6026,6 +6401,12 @@
"locationId": {
"type": "integer"
},
+ "locationIds": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
"page": {
"description": "椤电爜",
"type": "integer"
@@ -6066,6 +6447,32 @@
},
"type": {
"type": "integer"
+ },
+ "warehouseId": {
+ "description": "浠撳簱ID",
+ "type": "integer"
+ }
+ }
+ },
+ "request.GetLocationProductList": {
+ "type": "object",
+ "properties": {
+ "keyword": {
+ "type": "string"
+ },
+ "locationId": {
+ "type": "integer"
+ },
+ "page": {
+ "description": "椤电爜",
+ "type": "integer"
+ },
+ "pageSize": {
+ "description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "warehouseId": {
+ "type": "integer"
}
}
},
@@ -6097,6 +6504,12 @@
},
"pageSize": {
"description": "姣忛〉澶у皬",
+ "type": "integer"
+ },
+ "preload": {
+ "type": "boolean"
+ },
+ "warehouseID": {
"type": "integer"
}
}
@@ -6259,6 +6672,10 @@
},
"salePrice": {
"description": "閿�鍞崟浠�",
+ "type": "number"
+ },
+ "stockAmount": {
+ "description": "搴撳瓨鏁伴噺锛岀洏鐐规椂鐢�",
"type": "number"
},
"toLocationId": {
@@ -6665,6 +7082,9 @@
"id": {
"type": "integer"
},
+ "inventoryDealerType": {
+ "type": "integer"
+ },
"locationId": {
"description": "婧愪綅缃甶d",
"type": "integer"
@@ -6723,6 +7143,10 @@
"description": "鐩爣浣嶇疆id",
"type": "integer"
},
+ "warehouseId": {
+ "description": "浠撳簱id",
+ "type": "integer"
+ },
"waybillNumber": {
"description": "杩愬崟鍙�",
"type": "string"
--
Gitblit v1.8.0