~cuijin/WMS.git

			@@ -13,26 +13,6 @@
			- BaseOperationTypeIncoming
			- BaseOperationTypeOutgoing
			- BaseOperationTypeInternal
			constvar.InvoicingStrategy:
			enum:
			- 1
			- 2
			- 3
			- 4
			- 5
			type: integer
			x-enum-comments:
			BasedDeliverNumber: 基于交付数量
			DeliverNumber: 交付数量
			IndentNumber: 订购数量
			Milestones: 基于里程碑
			PrepaidPrice: 预付\固定价格
			x-enum-varnames:
			- IndentNumber
			- DeliverNumber
			- PrepaidPrice
			- Milestones
			- BasedDeliverNumber
			constvar.LocationType:
			enum:
			- 1
			@@ -59,7 +39,7 @@
			- LocationTypeInventoryLoss
			- LocationTypeProduction
			- LocationTypeTransit
			constvar.OrderCreation:
			constvar.OperationStatus:
			enum:
			- 1
			- 2
			@@ -67,29 +47,15 @@
			- 4
			type: integer
			x-enum-comments:
			Nothing: 不操作
			Object: 项目
			Task: 任务
			TaskAndObject: 任务和项目
			OperationStatus_Draft: 草稿
			OperationStatus_Finish: 完成
			OperationStatus_Ready: 就绪
			OperationStatus_Waiting: 正在等待
			x-enum-varnames:
			- Nothing
			- Task
			- Object
			- TaskAndObject
			constvar.ProductType:
			enum:
			- 1
			- 2
			- 3
			type: integer
			x-enum-comments:
			Consumables: 消耗品
			Server: 服务
			StoredProduct: 可储存的产品
			x-enum-varnames:
			- Consumables
			- Server
			- StoredProduct
			- OperationStatus_Draft
			- OperationStatus_Waiting
			- OperationStatus_Ready
			- OperationStatus_Finish
			constvar.ReservationMethod:
			enum:
			- 1
			@@ -265,107 +231,6 @@
			description: 仓库id
			type: integer
			type: object
			models.Product:
			properties:
			HSCode:
			type: string
			barcode:
			description: 条码
			type: string
			buyExplain:
			type: string
			canBePurchased:
			description: 是否可采购
			type: boolean
			canBeSell:
			description: 是否销售
			type: boolean
			categoryId:
			description: 产品分类id
			type: integer
			companyId:
			type: integer
			companyName:
			type: string
			controlStrategy:
			$ref: '#/definitions/constvar.InvoicingStrategy'
			cost:
			description: 成本
			type: number
			createTime:
			type: string
			currencyId:
			type: integer
			currencyName:
			type: string
			customerAdvanceTime:
			type: number
			customerTaxes:
			description: 客户税百分比
			type: number
			deliveryAdvanceTime:
			type: number
			id:
			type: integer
			inStorageExplain:
			type: string
			internalNotes:
			description: 内部说明
			type: string
			internalReference:
			description: 内部参考
			type: string
			internalTransferExplain:
			type: string
			invoicingStrategy:
			$ref: '#/definitions/constvar.InvoicingStrategy'
			name:
			description: 产品名称
			type: string
			objectTemplateId:
			type: string
			orderCreation:
			$ref: '#/definitions/constvar.OrderCreation'
			originCountryId:
			type: integer
			originCountryName:
			type: string
			outStorageExplain:
			type: string
			price:
			type: number
			principal:
			description: 负责人
			type: string
			productTagId:
			description: 产品标签
			type: integer
			productTagName:
			type: string
			salePrice:
			description: 销售价格
			type: number
			selectProduct:
			type: integer
			sellExplain:
			type: string
			supplierId:
			type: integer
			supplierName:
			type: string
			type:
			allOf:
			- $ref: '#/definitions/constvar.ProductType'
			description: 产品类型
			updateTime:
			type: string
			volume:
			description: 体积
			type: number
			weight:
			description: 重量
			type: number
			type: object
			models.Warehouse:
			properties:
			active:
			@@ -428,6 +293,36 @@
			remark:
			description: 备注
			type: string
			type: object
			request.AddOperation:
			properties:
			details:
			items:
			$ref: '#/definitions/request.OperationDetails'
			type: array
			fromLocationId:
			description: 源位置id
			type: integer
			id:
			type: integer
			number:
			description: 单号
			type: string
			operationDate:
			$ref: '#/definitions/util.JSONTime'
			operationTypeId:
			description: 作业类型id
			type: integer
			sourceNumber:
			description: 源单号
			type: string
			status:
			allOf:
			- $ref: '#/definitions/constvar.OperationStatus'
			description: 状态
			toLocationId:
			description: 目标位置id
			type: integer
			type: object
			request.AddOperationType:
			properties:
			@@ -502,6 +397,21 @@
			type: array
			required:
			- code
			type: object
			request.OperationDetails:
			properties:
			finishQuantity:
			description: 完成数量
			type: number
			productId:
			description: 产品id
			type: integer
			productName:
			description: 产品名称
			type: string
			quantity:
			description: 数量
			type: number
			type: object
			request.UpdateCompany:
			properties:
			@@ -603,6 +513,11 @@
			type: array
			required:
			- code
			type: object
			util.JSONTime:
			properties:
			time.Time:
			type: string
			type: object
			util.Response:
			properties:
			@@ -802,15 +717,15 @@
			summary: 编辑公司
			tags:
			- 公司
			/api-wms/v1/product/addProduct:
			/api-wms/v1/operation/operation:
			post:
			parameters:
			- description: 产品信息
			- description: 入库/出库信息
			in: body
			name: object
			required: true
			schema:
			$ref: '#/definitions/models.Product'
			$ref: '#/definitions/request.AddOperation'
			produces:
			- application/json
			responses:
			@@ -818,9 +733,9 @@
			description: 成功
			schema:
			$ref: '#/definitions/util.Response'
			summary: 添加产品
			summary: 添加入库/出库
			tags:
			- 产品
			- 入库/出库
			/api-wms/v1/warehouse/operationType:
			get:
			parameters: