~cuijin/WMS.git

			@@ -294,6 +294,207 @@
			}
			}
			},
			"/api-wms/v1/location/addLocation": {
			"post": {
			"produces": [
			"application/json"
			],
			"tags": [
			"位置"
			],
			"summary": "添加位置信息",
			"parameters": [
			{
			"description": "位置信息",
			"name": "object",
			"in": "body",
			"required": true,
			"schema": {
			"$ref": "#/definitions/models.Location"
			}
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"$ref": "#/definitions/util.Response"
			}
			}
			}
			}
			},
			"/api-wms/v1/location/deleteLocation/{id}": {
			"delete": {
			"produces": [
			"application/json"
			],
			"tags": [
			"位置"
			],
			"summary": "删除位置",
			"parameters": [
			{
			"type": "string",
			"description": "id",
			"name": "id",
			"in": "path",
			"required": true
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"$ref": "#/definitions/util.Response"
			}
			}
			}
			}
			},
			"/api-wms/v1/location/getLocationDetails/{id}": {
			"get": {
			"produces": [
			"application/json"
			],
			"tags": [
			"位置"
			],
			"summary": "获取位置详情",
			"parameters": [
			{
			"type": "string",
			"description": "id",
			"name": "id",
			"in": "path",
			"required": true
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"allOf": [
			{
			"$ref": "#/definitions/util.Response"
			},
			{
			"type": "object",
			"properties": {
			"data": {
			"$ref": "#/definitions/models.Location"
			}
			}
			}
			]
			}
			}
			}
			}
			},
			"/api-wms/v1/location/getLocationList": {
			"post": {
			"produces": [
			"application/json"
			],
			"tags": [
			"位置"
			],
			"summary": "获取位置列表",
			"parameters": [
			{
			"description": "查询参数",
			"name": "object",
			"in": "body",
			"required": true,
			"schema": {
			"$ref": "#/definitions/request.GetProductList"
			}
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"allOf": [
			{
			"$ref": "#/definitions/util.ResponseList"
			},
			{
			"type": "object",
			"properties": {
			"data": {
			"type": "array",
			"items": {
			"$ref": "#/definitions/models.Location"
			}
			}
			}
			}
			]
			}
			}
			}
			}
			},
			"/api-wms/v1/location/updateLocation": {
			"post": {
			"produces": [
			"application/json"
			],
			"tags": [
			"位置"
			],
			"summary": "修改位置",
			"parameters": [
			{
			"description": "产品信息",
			"name": "object",
			"in": "body",
			"required": true,
			"schema": {
			"$ref": "#/definitions/models.Location"
			}
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"$ref": "#/definitions/util.Response"
			}
			}
			}
			}
			},
			"/api-wms/v1/operation/finish/{id}": {
			"put": {
			"produces": [
			"application/json"
			],
			"tags": [
			"入库/出库"
			],
			"summary": "更改记录状态",
			"parameters": [
			{
			"type": "integer",
			"description": "id",
			"name": "id",
			"in": "path",
			"required": true
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"$ref": "#/definitions/util.Response"
			}
			}
			}
			}
			},
			"/api-wms/v1/operation/operation": {
			"get": {
			"consumes": [
			@@ -364,41 +565,6 @@
			}
			},
			"/api-wms/v1/operation/operation/{id}": {
			"put": {
			"produces": [
			"application/json"
			],
			"tags": [
			"入库/出库"
			],
			"summary": "修改入库/出库信息",
			"parameters": [
			{
			"description": "入库信息",
			"name": "object",
			"in": "body",
			"required": true,
			"schema": {
			"$ref": "#/definitions/request.UpdateOperation"
			}
			},
			{
			"type": "integer",
			"description": "入库信息id",
			"name": "id",
			"in": "path",
			"required": true
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"$ref": "#/definitions/util.Response"
			}
			}
			}
			},
			"delete": {
			"produces": [
			"application/json"
			@@ -426,13 +592,43 @@
			}
			}
			},
			"/api-wms/v1/operation/update": {
			"post": {
			"produces": [
			"application/json"
			],
			"tags": [
			"入库/出库"
			],
			"summary": "修改入库/出库信息",
			"parameters": [
			{
			"description": "入库信息",
			"name": "object",
			"in": "body",
			"required": true,
			"schema": {
			"$ref": "#/definitions/request.UpdateOperation"
			}
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"$ref": "#/definitions/util.Response"
			}
			}
			}
			}
			},
			"/api-wms/v1/operationType/operationType": {
			"get": {
			"produces": [
			"application/json"
			],
			"tags": [
			"作业类型"
			"业务类型"
			],
			"summary": "查询作业类型列表",
			"parameters": [
			@@ -483,7 +679,7 @@
			"application/json"
			],
			"tags": [
			"作业类型"
			"业务类型"
			],
			"summary": "添加作业类型",
			"parameters": [
			@@ -513,7 +709,7 @@
			"application/json"
			],
			"tags": [
			"作业类型"
			"业务类型"
			],
			"summary": "编辑作业类型",
			"parameters": [
			@@ -548,7 +744,7 @@
			"application/json"
			],
			"tags": [
			"作业类型"
			"业务类型"
			],
			"summary": "删除作业类型",
			"parameters": [
			@@ -916,6 +1112,76 @@
			}
			}
			},
			"/api-wms/v1/warehouse/getWarehouseDetails/{id}": {
			"get": {
			"produces": [
			"application/json"
			],
			"tags": [
			"仓库"
			],
			"summary": "获取仓库详情",
			"parameters": [
			{
			"type": "string",
			"description": "仓库id",
			"name": "id",
			"in": "path",
			"required": true
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"allOf": [
			{
			"$ref": "#/definitions/util.Response"
			},
			{
			"type": "object",
			"properties": {
			"data": {
			"$ref": "#/definitions/models.Warehouse"
			}
			}
			}
			]
			}
			}
			}
			}
			},
			"/api-wms/v1/warehouse/updateWarehouse": {
			"post": {
			"produces": [
			"application/json"
			],
			"tags": [
			"仓库"
			],
			"summary": "编辑仓库",
			"parameters": [
			{
			"description": "仓库信息",
			"name": "object",
			"in": "body",
			"required": true,
			"schema": {
			"$ref": "#/definitions/models.Warehouse"
			}
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"$ref": "#/definitions/util.Response"
			}
			}
			}
			}
			},
			"/api-wms/v1/warehouse/warehouse": {
			"get": {
			"produces": [
			@@ -998,41 +1264,6 @@
			}
			},
			"/api-wms/v1/warehouse/warehouse/{id}": {
			"put": {
			"produces": [
			"application/json"
			],
			"tags": [
			"仓库"
			],
			"summary": "编辑仓库",
			"parameters": [
			{
			"description": "仓库信息",
			"name": "object",
			"in": "body",
			"required": true,
			"schema": {
			"$ref": "#/definitions/request.UpdateWarehouse"
			}
			},
			{
			"type": "string",
			"description": "仓库id",
			"name": "id",
			"in": "path",
			"required": true
			}
			],
			"responses": {
			"200": {
			"description": "成功",
			"schema": {
			"$ref": "#/definitions/util.Response"
			}
			}
			}
			},
			"delete": {
			"produces": [
			"application/json"
			@@ -1235,6 +1466,24 @@
			"TaskAndObject"
			]
			},
			"constvar.ProductType": {
			"type": "integer",
			"enum": [
			1,
			2,
			3
			],
			"x-enum-comments": {
			"Consumables": "消耗品",
			"Server": "服务",
			"StoredProduct": "可储存的产品"
			},
			"x-enum-varnames": [
			"Consumables",
			"Server",
			"StoredProduct"
			]
			},
			"constvar.ReservationMethod": {
			"type": "integer",
			"enum": [
			@@ -1330,14 +1579,6 @@
			"models.Location": {
			"type": "object",
			"properties": {
			"company": {
			"description": "公司",
			"allOf": [
			{
			"$ref": "#/definitions/models.Company"
			}
			]
			},
			"companyId": {
			"description": "公司id",
			"type": "integer"
			@@ -1348,6 +1589,14 @@
			},
			"createTime": {
			"type": "string"
			},
			"forceRemovalStrategy": {
			"description": "下架策略",
			"allOf": [
			{
			"$ref": "#/definitions/constvar.ForceRemovalStrategy"
			}
			]
			},
			"id": {
			"type": "integer"
			@@ -1364,16 +1613,28 @@
			"description": "位置名称",
			"type": "string"
			},
			"nextCount": {
			"description": "下次盘点",
			"type": "string"
			},
			"notes": {
			"description": "外部备注",
			"type": "string"
			},
			"parentId": {
			"description": "上级id",
			"type": "integer"
			"type": "string"
			},
			"recentlyCount": {
			"description": "最近盘点",
			"type": "string"
			},
			"replenishLocation": {
			"description": "是否补充位置",
			"type": "boolean"
			},
			"type": {
			"description": "位置类型",
			"description": "Company Company ` + "`" + `json:\"company\" gorm:\"foreignKey:CompanyId\"` + "`" + ` //公司",
			"allOf": [
			{
			"$ref": "#/definitions/constvar.LocationType"
			@@ -1388,10 +1649,6 @@
			"models.Material": {
			"type": "object",
			"properties": {
			"HSCode": {
			"description": "HS编码",
			"type": "string"
			},
			"amount": {
			"description": "数量",
			"type": "number"
			@@ -1411,6 +1668,10 @@
			"categoryId": {
			"description": "产品类别id",
			"type": "integer"
			},
			"categoryName": {
			"description": "产品类别名称",
			"type": "string"
			},
			"companyId": {
			"description": "公司id",
			@@ -1441,14 +1702,14 @@
			"type": "number"
			},
			"deliveryAdvanceTime": {
			"description": "交货提前时间(天)",
			"type": "integer"
			"description": "客户前置时间(天)",
			"type": "number"
			},
			"id": {
			"type": "string"
			},
			"inStorageExplain": {
			"description": "入库说明",
			"description": "HSCode string ` + "`" + `gorm:\"type:varchar(255);comment:HS编码\" json:\"HSCode\"` + "`" + ` //HS编码\nOriginCountryId int ` + "`" + `gorm:\"type:int(11);comment:原产地id\" json:\"originCountryId\"` + "`" + ` //原产地id\nOriginCountryName string ` + "`" + `gorm:\"type:varchar(255);comment:原产地名称\" json:\"originCountryName\"` + "`" + ` //原产地名称",
			"type": "string"
			},
			"internalNotes": {
			@@ -1464,7 +1725,7 @@
			"type": "string"
			},
			"invoicingStrategy": {
			"description": "wms添加字段",
			"description": "开票策略",
			"allOf": [
			{
			"$ref": "#/definitions/constvar.InvoicingStrategy"
			@@ -1474,6 +1735,10 @@
			"isSale": {
			"description": "PurchaseType constvar.PurchaseType ` + "`" + `gorm:\"type:int(11);comment:采购类型\" json:\"purchaseType\"` + "`" + `",
			"type": "boolean"
			},
			"makeAdvanceTime": {
			"description": "制造前置时间(天)",
			"type": "number"
			},
			"maxInventory": {
			"description": "最大库存",
			@@ -1499,6 +1764,10 @@
			"description": "物料名称",
			"type": "string"
			},
			"orderAdvanceTime": {
			"description": "订单准备天数(天)",
			"type": "number"
			},
			"orderCreation": {
			"description": "订单创建",
			"allOf": [
			@@ -1506,14 +1775,6 @@
			"$ref": "#/definitions/constvar.OrderCreation"
			}
			]
			},
			"originCountryId": {
			"description": "原产地id",
			"type": "integer"
			},
			"originCountryName": {
			"description": "原产地名称",
			"type": "string"
			},
			"outStorageExplain": {
			"description": "出库说明",
			@@ -1531,6 +1792,14 @@
			"description": "产品标签名称",
			"type": "string"
			},
			"productType": {
			"description": "wms添加字段",
			"allOf": [
			{
			"$ref": "#/definitions/constvar.ProductType"
			}
			]
			},
			"purchasePrice": {
			"description": "采购价格",
			"type": "number"
			@@ -1541,7 +1810,7 @@
			},
			"selectProduct": {
			"description": "可选产品id",
			"type": "integer"
			"type": "string"
			},
			"sellExplain": {
			"description": "销售说明",
			@@ -1631,11 +1900,19 @@
			"description": "默认源位置id",
			"type": "integer"
			},
			"earlyOperations": {
			"description": "预填写作业详情",
			"type": "boolean"
			},
			"id": {
			"type": "integer"
			},
			"name": {
			"description": "仓库名称",
			"type": "string"
			},
			"prefix": {
			"description": "前缀",
			"type": "string"
			},
			"printLabel": {
			@@ -1771,6 +2048,10 @@
			"description": "入向运输",
			"type": "integer"
			},
			"locationId": {
			"description": "位置id",
			"type": "integer"
			},
			"name": {
			"description": "仓库名称",
			"type": "string"
			@@ -1798,6 +2079,10 @@
			}
			},
			"updateTime": {
			"type": "string"
			},
			"warehouseLocation": {
			"description": "库存位置",
			"type": "string"
			}
			}
			@@ -1835,22 +2120,24 @@
			"request.AddOperation": {
			"type": "object",
			"properties": {
			"carrierID": {
			"type": "integer"
			},
			"carrierName": {
			"comment": {
			"description": "备注",
			"type": "string"
			},
			"companyID": {
			"description": "公司ID-客户",
			"type": "integer"
			},
			"companyName": {
			"description": "公司名称-客户名称",
			"type": "string"
			},
			"contacterID": {
			"description": "联系人ID-非必填",
			"type": "integer"
			},
			"contacterName": {
			"description": "联系人姓名-非必填",
			"type": "string"
			},
			"details": {
			@@ -1871,11 +2158,16 @@
			"type": "string"
			},
			"operationDate": {
			"description": "安排日期",
			"type": "string"
			},
			"operationTypeId": {
			"description": "作业类型id",
			"type": "integer"
			},
			"operationTypeName": {
			"description": "作业类型名称",
			"type": "string"
			},
			"sourceNumber": {
			"description": "源单号",
			@@ -1892,15 +2184,6 @@
			"toLocationId": {
			"description": "目标位置id",
			"type": "integer"
			},
			"tracking": {
			"type": "string"
			},
			"transferWeight": {
			"type": "number"
			},
			"weight": {
			"type": "number"
			}
			}
			},
			@@ -2004,6 +2287,10 @@
			"description": "入向运输",
			"type": "integer"
			},
			"locationId": {
			"description": "位置id",
			"type": "integer"
			},
			"name": {
			"description": "仓库名称",
			"type": "string"
			@@ -2044,21 +2331,24 @@
			"request.OperationDetails": {
			"type": "object",
			"properties": {
			"finishQuantity": {
			"description": "完成数量",
			"OperationId": {
			"description": "操作id",
			"type": "integer"
			},
			"amount": {
			"description": "数量",
			"type": "number"
			},
			"productId": {
			"description": "产品id",
			"type": "integer"
			"type": "string"
			},
			"productName": {
			"description": "产品名称",
			"type": "string"
			},
			"quantity": {
			"description": "数量",
			"type": "number"
			"unit": {
			"type": "string"
			}
			}
			},
			@@ -2101,22 +2391,24 @@
			"request.UpdateOperation": {
			"type": "object",
			"properties": {
			"carrierID": {
			"type": "integer"
			},
			"carrierName": {
			"comment": {
			"description": "备注",
			"type": "string"
			},
			"companyID": {
			"description": "公司ID-客户",
			"type": "integer"
			},
			"companyName": {
			"description": "公司名称-客户名称",
			"type": "string"
			},
			"contacterID": {
			"description": "联系人ID-非必填",
			"type": "integer"
			},
			"contacterName": {
			"description": "联系人姓名-非必填",
			"type": "string"
			},
			"details": {
			@@ -2137,11 +2429,16 @@
			"type": "string"
			},
			"operationDate": {
			"description": "安排日期",
			"type": "string"
			},
			"operationTypeId": {
			"description": "作业类型id",
			"type": "integer"
			},
			"operationTypeName": {
			"description": "作业类型名称",
			"type": "string"
			},
			"sourceNumber": {
			"description": "源单号",
			@@ -2158,15 +2455,6 @@
			"toLocationId": {
			"description": "目标位置id",
			"type": "integer"
			},
			"tracking": {
			"type": "string"
			},
			"transferWeight": {
			"type": "number"
			},
			"weight": {
			"type": "number"
			}
			}
			},
			@@ -2239,58 +2527,6 @@
			"warehouseId": {
			"description": "仓库id",
			"type": "integer"
			}
			}
			},
			"request.UpdateWarehouse": {
			"type": "object",
			"required": [
			"code"
			],
			"properties": {
			"active": {
			"description": "是否启用，传true就行",
			"type": "boolean"
			},
			"address": {
			"description": "地址",
			"type": "string"
			},
			"buyToResupply": {
			"description": "购买补给，已购买产品能够发送到此仓库",
			"type": "boolean"
			},
			"code": {
			"description": "仓库编码",
			"type": "string",
			"maxLength": 5,
			"minLength": 1
			},
			"id": {
			"type": "integer"
			},
			"inboundTransportation": {
			"description": "入向运输",
			"type": "integer"
			},
			"name": {
			"description": "仓库名称",
			"type": "string"
			},
			"outboundTransportation": {
			"description": "出库运输",
			"type": "integer"
			},
			"partnerId": {
			"description": "合作伙伴id",
			"type": "integer"
			},
			"resupplyWhIds": {
			"description": "补给来源仓库ID",
			"type": "array",
			"items": {
			"type": "string"
			}
			}
			}
			},