aps/crm.git - Gitblit

			@@ -9841,18 +9841,36 @@
			"BankAccountQueryClassExpireLessThen60Days"
			]
			},
			"constvar.CollectionStatus": {
			"constvar.CollectionSourceType": {
			"type": "integer",
			"enum": [
			1,
			2
			],
			"x-enum-comments": {
			"CollectionSourceTypeSaleDetails": "销售明细",
			"CollectionSourceTypeServiceContract": "服务合同"
			},
			"x-enum-varnames": [
			"CollectionSourceTypeSaleDetails",
			"CollectionSourceTypeServiceContract"
			]
			},
			"constvar.CollectionStatus": {
			"type": "integer",
			"enum": [
			1,
			2,
			3
			],
			"x-enum-comments": {
			"CollectionStatusCollected": "已收款",
			"CollectionStatusSubCollected": "部分收款",
			"CollectionStatusUnCollected": "待收款"
			},
			"x-enum-varnames": [
			"CollectionStatusUnCollected",
			"CollectionStatusSubCollected",
			"CollectionStatusCollected"
			]
			},
			@@ -9993,6 +10011,23 @@
			"ReceiptQueryClassExpireLessThen60Days"
			]
			},
			"constvar.ReceiptSourceType": {
			"type": "integer",
			"enum": [
			1,
			2,
			3,
			4,
			5
			],
			"x-enum-varnames": [
			"ReceiptSourceTypeSalesDetails",
			"ReceiptSourceTypeServiceContract",
			"ReceiptSourceTypeInvoice",
			"ReceiptSourceTypeCollectionPlan",
			"ReceiptSourceTypeChuKuDan"
			]
			},
			"constvar.SalesDetailsKeywordType": {
			"type": "string",
			"enum": [
			@@ -10008,6 +10043,18 @@
			"SalesDetailsKeywordTypeSignTime",
			"SalesDetailsKeywordTypePrincipal",
			"SalesDetailsKeywordTypeProductName"
			]
			},
			"constvar.SalesReturnSourceType": {
			"type": "integer",
			"enum": [
			1
			],
			"x-enum-comments": {
			"SalesReturnSourceTypeSaleDetails": "销售明细"
			},
			"x-enum-varnames": [
			"SalesReturnSourceTypeSaleDetails"
			]
			},
			"constvar.SalesStatus": {
			@@ -11233,7 +11280,7 @@
			"properties": {
			"amount": {
			"description": "收款金额",
			"type": "string"
			"type": "number"
			},
			"bankAccountId": {
			"description": "账户id",
			@@ -11276,7 +11323,11 @@
			},
			"sourceType": {
			"description": "来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）",
			"type": "integer"
			"allOf": [
			{
			"$ref": "#/definitions/constvar.ReceiptSourceType"
			}
			]
			}
			}
			},
			@@ -11499,6 +11550,9 @@
			"model.SalesDetails": {
			"type": "object",
			"properties": {
			"Member": {
			"$ref": "#/definitions/model.User"
			},
			"address": {
			"type": "string"
			},
			@@ -11517,6 +11571,10 @@
			"description": "已收金额",
			"type": "number"
			},
			"amountTotal": {
			"description": "价税合计",
			"type": "number"
			},
			"amountUnInvoiced": {
			"description": "未开票金额",
			"type": "number"
			@@ -11528,6 +11586,15 @@
			"type": "integer"
			},
			"conditions": {
			"type": "string"
			},
			"createTime": {
			"type": "string"
			},
			"creatorId": {
			"type": "integer"
			},
			"creatorName": {
			"type": "string"
			},
			"deliveryDate": {
			@@ -11692,8 +11759,28 @@
			"model.SalesReturn": {
			"type": "object",
			"properties": {
			"Member": {
			"$ref": "#/definitions/model.User"
			},
			"SalesReturnStatus": {
			"description": "退货状态",
			"allOf": [
			{
			"$ref": "#/definitions/model.SalesReturnStatus"
			}
			]
			},
			"client": {
			"$ref": "#/definitions/model.Client"
			},
			"clientId": {
			"type": "integer"
			},
			"createTime": {
			"type": "string"
			},
			"creatorName": {
			"type": "string"
			},
			"id": {
			"type": "integer"
			@@ -11705,22 +11792,38 @@
			"type": "string"
			},
			"products": {
			"description": "退货产品",
			"type": "array",
			"items": {
			"$ref": "#/definitions/model.Product"
			}
			},
			"reason": {
			"description": "退货原因",
			"type": "string"
			},
			"repository": {
			"type": "string"
			},
			"returnDate": {
			"description": "退货日期",
			"type": "string"
			},
			"salesReturnStatus": {
			"salesReturnStatusId": {
			"description": "退货状态id",
			"type": "integer"
			},
			"sourceId": {
			"description": "源单id",
			"type": "integer"
			},
			"sourceType": {
			"description": "源单类型（1销售明细）",
			"allOf": [
			{
			"$ref": "#/definitions/constvar.SalesReturnSourceType"
			}
			]
			}
			}
			},
			@@ -11764,6 +11867,18 @@
			"description": "金额",
			"type": "number"
			},
			"amountReceivable": {
			"description": "应收金额",
			"type": "number"
			},
			"amountReceived": {
			"description": "已收金额",
			"type": "number"
			},
			"amountTotal": {
			"description": "总额",
			"type": "number"
			},
			"collectionDate": {
			"description": "计划收款日期",
			"type": "string"
			@@ -11801,10 +11916,14 @@
			},
			"sourceType": {
			"description": "源单类型（1销售明细2服务合同3销售发票）",
			"type": "integer"
			"allOf": [
			{
			"$ref": "#/definitions/constvar.CollectionSourceType"
			}
			]
			},
			"status": {
			"description": "状态（1未收2已收）",
			"description": "状态（1未收2部分已收3已收）",
			"allOf": [
			{
			"$ref": "#/definitions/constvar.CollectionStatus"
			@@ -11833,6 +11952,10 @@
			},
			"amountReceived": {
			"description": "已收金额",
			"type": "number"
			},
			"amountTotal": {
			"description": "价税合计",
			"type": "number"
			},
			"amountUnInvoiced": {
			@@ -12150,6 +12273,10 @@
			"serviceOrderStatus": {
			"$ref": "#/definitions/model.ServiceOrderStatus"
			},
			"serviceOrderStatusId": {
			"description": "处理状态",
			"type": "integer"
			},
			"serviceType": {
			"$ref": "#/definitions/model.ServiceType"
			},
			@@ -12167,10 +12294,6 @@
			"solutionRemark": {
			"description": "内部备注",
			"type": "string"
			},
			"status": {
			"description": "处理状态",
			"type": "integer"
			},
			"subject": {
			"description": "主题",
			@@ -13062,7 +13185,7 @@
			"properties": {
			"amount": {
			"description": "收款金额",
			"type": "string"
			"type": "number"
			},
			"bankAccountId": {
			"description": "账户id",
			@@ -13105,7 +13228,11 @@
			},
			"sourceType": {
			"description": "来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）",
			"type": "integer"
			"allOf": [
			{
			"$ref": "#/definitions/constvar.ReceiptSourceType"
			}
			]
			}
			}
			},
			@@ -14851,22 +14978,38 @@
			"type": "string"
			},
			"products": {
			"description": "退货产品",
			"type": "array",
			"items": {
			"$ref": "#/definitions/model.Product"
			}
			},
			"reason": {
			"description": "退货原因",
			"type": "string"
			},
			"repository": {
			"type": "string"
			},
			"returnDate": {
			"description": "退货日期",
			"type": "string"
			},
			"status": {
			"salesReturnStatusId": {
			"description": "退货状态id",
			"type": "integer"
			},
			"sourceId": {
			"description": "源单id",
			"type": "integer"
			},
			"sourceType": {
			"description": "源单类型（1销售明细）",
			"allOf": [
			{
			"$ref": "#/definitions/constvar.SalesReturnSourceType"
			}
			]
			}
			}
			},
			@@ -15922,7 +16065,7 @@
			"properties": {
			"amount": {
			"description": "收款金额",
			"type": "string"
			"type": "number"
			},
			"bankAccountId": {
			"description": "账户id",
			@@ -15965,7 +16108,11 @@
			},
			"sourceType": {
			"description": "来源类型（1销售明细单2服务合同3销售发票4收款计划5出库单）",
			"type": "integer"
			"allOf": [
			{
			"$ref": "#/definitions/constvar.ReceiptSourceType"
			}
			]
			}
			}
			},
			@@ -16480,6 +16627,18 @@
			"description": "金额",
			"type": "number"
			},
			"amountReceivable": {
			"description": "应收金额",
			"type": "number"
			},
			"amountReceived": {
			"description": "已收金额",
			"type": "number"
			},
			"amountTotal": {
			"description": "总额",
			"type": "number"
			},
			"collectionDate": {
			"description": "计划收款日期",
			"type": "string"
			@@ -16517,10 +16676,14 @@
			},
			"sourceType": {
			"description": "源单类型（1销售明细2服务合同3销售发票）",
			"type": "integer"
			"allOf": [
			{
			"$ref": "#/definitions/constvar.CollectionSourceType"
			}
			]
			},
			"status": {
			"description": "状态（1未收2已收）",
			"description": "状态（1未收2部分已收3已收）",
			"allOf": [
			{
			"$ref": "#/definitions/constvar.CollectionStatus"