From 359f2f3fd0da6d69474cce87353beb54bfdbf90c Mon Sep 17 00:00:00 2001 From: lishihai <dslsh@dscom> Date: 星期四, 20 六月 2024 14:24:52 +0800 Subject: [PATCH] 概述->新建或编辑(出库/入库)信息,编辑的时候显示保存的成本单价和销售单价 --- docs/docs.go | 831 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 755 insertions(+), 76 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index e201b02..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" } } } @@ -1039,7 +1372,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/request.PageInfo" + "$ref": "#/definitions/request.GetList" } } ], @@ -1528,6 +1861,7 @@ "parameters": [ { "type": "string", + "description": "鍏抽敭瀛楁悳绱�", "name": "keyword", "in": "query" }, @@ -1541,6 +1875,12 @@ "type": "integer", "description": "姣忛〉澶у皬", "name": "pageSize", + "in": "query" + }, + { + "type": "integer", + "description": "浠撳簱id", + "name": "warehouseId", "in": "query" } ], @@ -3112,6 +3452,18 @@ "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": { @@ -3140,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" } } }, @@ -3381,6 +3773,13 @@ "$ref": "#/definitions/models.Attachment" } }, + "attributes": { + "description": "鍔ㄦ�佸睘鎬�", + "type": "array", + "items": { + "$ref": "#/definitions/models.Attribute" + } + }, "autoIncr": { "type": "integer" }, @@ -3438,6 +3837,12 @@ }, "deliveryAdvanceTime": { "description": "瀹㈡埛鍓嶇疆鏃堕棿(澶�)", + "type": "number" + }, + "grossUnit": { + "type": "string" + }, + "grossWeight": { "type": "number" }, "id": { @@ -3514,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" @@ -3619,10 +4039,169 @@ } } }, + "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": { @@ -3636,11 +4215,17 @@ } ] }, + "checkedAt": { + "type": "string" + }, + "checkedBy": { + "type": "string" + }, "comment": { "type": "string" }, "companyID": { - "type": "integer" + "type": "string" }, "companyName": { "type": "string" @@ -3651,10 +4236,16 @@ "contacterName": { "type": "string" }, + "createBy": { + "type": "string" + }, "createTime": { "type": "string" }, "custodian": { + "type": "string" + }, + "custodianId": { "type": "string" }, "details": { @@ -3689,6 +4280,9 @@ "type": "number" }, "manager": { + "type": "string" + }, + "managerId": { "type": "string" }, "number": { @@ -3774,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" }, @@ -3791,6 +4391,9 @@ }, "id": { "type": "integer" + }, + "note": { + "type": "string" }, "operationId": { "description": "鎿嶄綔id", @@ -3819,6 +4422,12 @@ "toLocationId": { "description": "鐩爣浣嶇疆id", "type": "integer" + }, + "totalGrossWeight": { + "type": "number" + }, + "totalNetWeight": { + "type": "number" }, "updateTime": { "type": "string" @@ -3949,6 +4558,21 @@ "type": "boolean" }, "name": { + "type": "string" + } + } + }, + "models.UnitItems": { + "type": "object", + "properties": { + "amount": { + "type": "number" + }, + "floating": { + "description": "鏄惁娴姩鍒╃巼", + "type": "boolean" + }, + "unit": { "type": "string" } } @@ -4121,13 +4745,16 @@ "accountant": { "type": "string" }, + "accountantId": { + "type": "string" + }, "comment": { "description": "澶囨敞", "type": "string" }, "companyID": { "description": "鍏徃ID-瀹㈡埛", - "type": "integer" + "type": "string" }, "companyName": { "description": "鍏徃鍚嶇О-瀹㈡埛鍚嶇О", @@ -4142,6 +4769,9 @@ "type": "string" }, "custodian": { + "type": "string" + }, + "custodianId": { "type": "string" }, "details": { @@ -4165,6 +4795,9 @@ "type": "number" }, "manager": { + "type": "string" + }, + "managerId": { "type": "string" }, "number": { @@ -4351,6 +4984,14 @@ } } }, + "request.DoMonthStats": { + "type": "object", + "properties": { + "token": { + "type": "string" + } + } + }, "request.FinishLocationProductAmount": { "type": "object", "properties": { @@ -4444,6 +5085,22 @@ } } }, + "request.GetList": { + "type": "object", + "properties": { + "keyword": { + "type": "string" + }, + "page": { + "description": "椤电爜", + "type": "integer" + }, + "pageSize": { + "description": "姣忛〉澶у皬", + "type": "integer" + } + } + }, "request.GetLocationForms": { "type": "object", "properties": { @@ -4492,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" } } @@ -4579,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" } } @@ -4600,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" @@ -4611,6 +5307,14 @@ "toLocationId": { "description": "鐩爣浣嶇疆id", "type": "integer" + }, + "totalGrossWeight": { + "description": "鎬绘瘺閲�", + "type": "number" + }, + "totalNetWeight": { + "description": "鎬诲噣閲�", + "type": "number" } } }, @@ -4864,6 +5568,9 @@ "accountant": { "type": "string" }, + "accountantId": { + "type": "string" + }, "baseOperationType": { "description": "鍩虹浣滀笟绫诲瀷", "allOf": [ @@ -4878,7 +5585,7 @@ }, "companyID": { "description": "鍏徃ID-瀹㈡埛", - "type": "integer" + "type": "string" }, "companyName": { "description": "鍏徃鍚嶇О-瀹㈡埛鍚嶇О", @@ -4893,6 +5600,9 @@ "type": "string" }, "custodian": { + "type": "string" + }, + "custodianId": { "type": "string" }, "details": { @@ -4916,6 +5626,9 @@ "type": "number" }, "manager": { + "type": "string" + }, + "managerId": { "type": "string" }, "number": { @@ -5052,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": "鎴愭湰", @@ -5064,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", @@ -5090,75 +5831,6 @@ } } }, - "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": { @@ -5166,6 +5838,13 @@ "description": "鏁伴噺", "type": "number" }, + "amountMoreUnits": { + "description": "鍦ㄥ簱鏁伴噺澶氬崟浣�", + "type": "array", + "items": { + "$ref": "#/definitions/models.UnitItems" + } + }, "locationId": { "description": "浣嶇疆id", "type": "integer" -- Gitblit v1.8.0