From 893d7c4e20efa390ee11bd023b7922ec30c6e5cf Mon Sep 17 00:00:00 2001 From: shanji <18996038927@163.com> Date: Tue, 11 Apr 2023 16:35:05 +0800 Subject: [PATCH] 1 --- .../PurchaseOrderV2Business.cs | 19 + .../Db/PurchaseOrder/PurchaseOrderSku.cs | 125 +++++ .../Db/PurchaseOrder/PurchaseOrderV2.cs | 203 ++++++++ .../SearchProductSkuAndSchemeRequest.cs | 11 + .../ProductSkuWithSchemeResponse.cs | 16 + ...数据库-backup-2023411162951.pdma.json} | 261 +++++----- ...数据库-backup-2023411163151.pdma.json} | 473 +++++++++++++----- ...数据库-backup-2023411163351.pdma.json} | 473 +++++++++++++----- doc/步步为盈数据库.pdma.json | 448 ++++++++++++----- 9 files changed, 1551 insertions(+), 478 deletions(-) create mode 100644 BBWY.Server.Business/PurchaseOrderV2/PurchaseOrderV2Business.cs create mode 100644 BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderSku.cs create mode 100644 BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs create mode 100644 BBWY.Server.Model/Dto/Request/PurchaseOrderV2/SearchProductSkuAndSchemeRequest.cs create mode 100644 BBWY.Server.Model/Dto/Response/PurchaseOrderV2/ProductSkuWithSchemeResponse.cs rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023411004245.pdma.json => 步步为盈数据库-backup-2023411162951.pdma.json} (99%) rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023411004157.pdma.json => 步步为盈数据库-backup-2023411163151.pdma.json} (98%) rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023411004239.pdma.json => 步步为盈数据库-backup-2023411163351.pdma.json} (98%) diff --git a/BBWY.Server.Business/PurchaseOrderV2/PurchaseOrderV2Business.cs b/BBWY.Server.Business/PurchaseOrderV2/PurchaseOrderV2Business.cs new file mode 100644 index 00000000..3e215fcc --- /dev/null +++ b/BBWY.Server.Business/PurchaseOrderV2/PurchaseOrderV2Business.cs @@ -0,0 +1,19 @@ +using BBWY.Common.Models; +using BBWY.Server.Model.Dto; +using BBWY.Server.Model.Dto.Response.PurchaseOrderV2; +using Yitter.IdGenerator; + +namespace BBWY.Server.Business +{ + public class PurchaseOrderV2Business : BaseBusiness, IDenpendency + { + public PurchaseOrderV2Business(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator) : base(fsql, nLogManager, idGenerator) + { + } + + public ProductSkuWithSchemeResponse GetProductSkuAndSchemeList(SearchProductSkuAndSchemeRequest request) + { + return null; + } + } +} diff --git a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderSku.cs b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderSku.cs new file mode 100644 index 00000000..d8235134 --- /dev/null +++ b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderSku.cs @@ -0,0 +1,125 @@ +using FreeSql.DataAnnotations; +using Newtonsoft.Json; +using System; + +namespace BBWY.Server.Model.Db +{ + + /// + /// 采购商品表 + /// + [Table(Name = "purchaseordersku", DisableSyncStructure = true)] + public partial class PurchaseOrderSku + { + + /// + /// 打包耗材费 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? ConsumableAmount { get; set; } = 0.00M; + + /// + /// 创建时间 + /// + [Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } + + /// + /// 头程运费 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? FirstFreight { get; set; } = 0.00M; + + /// + /// 主键Id + /// + + public long? Id { get; set; } + + /// + /// 入仓费 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? InStorageAmount { get; set; } = 0.00M; + + /// + /// Sku Logo + /// + + public string Logo { get; set; } + + /// + /// 单价 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? Price { get; set; } = 0.00M; + + /// + /// 采购货款 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? ProductAmount { get; set; } + + [Column(StringLength = 100)] + public string ProductId { get; set; } + + /// + /// 采购金额(采购货款+采购运费) + /// + [Column(DbType = "decimal(18,2)")] + public decimal? PurchaseAmount { get; set; } + + /// + /// 采购运费 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? PurchaseFreight { get; set; } + + /// + /// 采购单Id + /// + [Column(StringLength = 100)] + public string PurchaseOrderId { get; set; } + + /// + /// 采购方案Id + /// + + public long? PurchaseSchemeId { get; set; } + + /// + /// 采购SkuId串 + /// + [Column(StringLength = 500)] + public string PurchaseSkuIds { get; set; } + + /// + /// 质检费 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? QualityInspectionAmount { get; set; } = 0.00M; + + /// + /// 采购数量 + /// + + public int? Quantity { get; set; } + + /// + /// 店铺Id + /// + + public long? ShopId { get; set; } + + [Column(StringLength = 100)] + public string SkuId { get; set; } + + /// + /// Sku标题 + /// + + public string SkuTitle { get; set; } + + } + +} diff --git a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs new file mode 100644 index 00000000..1d74e676 --- /dev/null +++ b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs @@ -0,0 +1,203 @@ +using FreeSql.DataAnnotations; +using Newtonsoft.Json; +using System; + +namespace BBWY.Server.Model.Db +{ + + /// + /// 采购单表 + /// + [Table(Name = "purchaseorderv2", DisableSyncStructure = true)] + public partial class PurchaseOrderV2 + { + + /// + /// 采购单号 + /// + [Column(StringLength = 100, IsPrimary = true, IsNullable = false)] + public string Id { get; set; } + + /// + /// 完成时间 + /// + [Column(DbType = "datetime")] + public DateTime? CompletionTime { get; set; } + + /// + /// 收货详细地址 + /// + + public string ConsigneeAddress { get; set; } + + /// + /// 收货市 + /// + [Column(StringLength = 30)] + public string ConsigneeCity { get; set; } + + /// + /// 收货联系人名称 + /// + [Column(StringLength = 50)] + public string ConsigneeContactName { get; set; } + + /// + /// 收货区 + /// + [Column(StringLength = 30)] + public string ConsigneeCounty { get; set; } + + /// + /// 收货联系人电话 + /// + [Column(StringLength = 50)] + public string ConsigneeMobile { get; set; } + + /// + /// 收货省 + /// + [Column(StringLength = 30)] + public string ConsigneeProvince { get; set; } + + /// + /// 收货镇 + /// + [Column(StringLength = 30)] + public string ConsigneeTown { get; set; } + + /// + /// 打包耗材费 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? ConsumableAmount { get; set; } = 0.00M; + + /// + /// 创建时间 + /// + [Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } + + /// + /// 快递公司 + /// + [Column(StringLength = 100)] + public string ExpressName { get; set; } + + /// + /// 头程运费 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? FirstFreight { get; set; } = 0.00M; + + /// + /// 入仓费 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? InStorageAmount { get; set; } = 0.00M; + + /// + /// 是否转入库存 + /// + + public bool? IsConvertToStock { get; set; } = false; + + /// + /// 是否订阅快递100 + /// + + public bool? IsSubscribeKuaiDi100 { get; set; } = false; + + /// + /// 采购单状态(待付款=0,待发货=1,待收货=2,待质检=3,待打包=4,待结算=5,已完成=6) + /// + + public int? OrderState { get; set; } + + /// + /// 支付时间 + /// + [Column(DbType = "datetime")] + public DateTime? PayTime { get; set; } + + /// + /// 采购货款 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? ProductAmount { get; set; } = 0.00M; + + /// + /// 采购账号Id + /// + + public long? PurchaseAccountId { get; set; } + + /// + /// 采购金额(采购货款+采购运费) + /// + [Column(DbType = "decimal(18,2)")] + public decimal? PurchaseAmount { get; set; } = 0.00M; + + /// + /// 采购运费 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? PurchaseFreight { get; set; } = 0.00M; + + /// + /// 采购平台 + /// + + public int? PurchasePlatform { get; set; } + + /// + /// 商家Id + /// + [Column(StringLength = 20)] + public string PurchaserId { get; set; } + + /// + /// 商家名称 + /// + [Column(StringLength = 100)] + public string PurchaserName { get; set; } + + /// + /// 质检费 + /// + [Column(DbType = "decimal(18,2)")] + public decimal? QualityInspectionAmount { get; set; } = 0.00M; + + /// + /// 备注信息 + /// + + public string Remark { get; set; } + + /// + /// 店铺Id + /// + + public string ShopId { get; set; } + + /// + /// 签收时间 + /// + [Column(DbType = "datetime")] + public DateTime? SignTime { get; set; } + + /// + /// 快递单号 + /// + [Column(StringLength = 100)] + public string WaybillNo { get; set; } + + /// + /// 采购方式(线上=0, 线下=1) + /// + [Column(MapType = typeof(int))] + public Enums.PurchaseMethod PurchaseMethod { get; set; } + + } + +} diff --git a/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/SearchProductSkuAndSchemeRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/SearchProductSkuAndSchemeRequest.cs new file mode 100644 index 00000000..f06e45f6 --- /dev/null +++ b/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/SearchProductSkuAndSchemeRequest.cs @@ -0,0 +1,11 @@ +namespace BBWY.Server.Model.Dto +{ + public class SearchProductSkuAndSchemeRequest : PlatformRequest + { + public string Spu { get; set; } + + public string Sku { get; set; } + + public Enums.Platform PurchasePlatform { get; set; } + } +} diff --git a/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/ProductSkuWithSchemeResponse.cs b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/ProductSkuWithSchemeResponse.cs new file mode 100644 index 00000000..12040fda --- /dev/null +++ b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/ProductSkuWithSchemeResponse.cs @@ -0,0 +1,16 @@ +namespace BBWY.Server.Model.Dto.Response.PurchaseOrderV2 +{ + /// + /// 包含采购方案的Sku商品信息 + /// + public class ProductSkuWithSchemeResponse : ProductSkuResponse + { + public long PurchaseSchemeId { get; set; } + + public string PurchaserId { get; set; } + + public string PurchaseName { get; set; } + + public Enums.Platform PurchasePlatform { get; set; } + } +} diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004245.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411162951.pdma.json similarity index 99% rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004245.pdma.json rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411162951.pdma.json index 4298ba45..bfba2eb7 100644 --- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004245.pdma.json +++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411162951.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2022-10-3 12:39:39", - "updatedTime": "2023-4-11 00:42:39", + "updatedTime": "2023-4-11 14:53:32", "dbConns": [], "profile": { "default": { @@ -11040,6 +11040,23 @@ "extProps": {}, "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", "id": "2ED49BCC-4CA9-4793-9061-157C85E10A71" + }, + { + "defKey": "PurchaseMethod", + "defName": "采购方式(线上=0, 线下=1)", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62" } ], "correlations": [], @@ -11329,6 +11346,23 @@ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", "id": "9E416CD0-06B0-49AD-87D2-D600A6C7C57D" }, + { + "defKey": "Quantity", + "defName": "采购数量", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "C5FED921-4898-4544-8143-A315F5C49E0B" + }, { "defKey": "PurchaseSchemeId", "defName": "采购方案Id", @@ -11534,23 +11568,6 @@ "extProps": {}, "domain": "", "id": "3052ED56-10A7-4CAE-9932-217D2821CBE7" - }, - { - "defKey": "Quantity", - "defName": "采购数量", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": "", - "extProps": {}, - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "id": "C5FED921-4898-4544-8143-A315F5C49E0B" } ], "correlations": [], @@ -12279,6 +12296,106 @@ "count": 0, "originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E" }, + { + "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431", + "shape": "table", + "position": { + "x": 560, + "y": -167 + }, + "count": 0, + "originKey": "CD64DEB3-500E-48AF-896E-123922A03290" + }, + { + "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833", + "shape": "table", + "position": { + "x": -2570, + "y": -1440.5 + }, + "count": 0, + "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B" + }, + { + "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c", + "shape": "table", + "position": { + "x": -450.5, + "y": -368 + }, + "count": 0, + "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213" + }, + { + "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "shape": "table", + "position": { + "x": 30, + "y": 487 + }, + "count": 0, + "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" + }, + { + "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", + "shape": "table", + "position": { + "x": 560, + "y": 140 + }, + "count": 0, + "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" + }, + { + "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", + "shape": "table", + "position": { + "x": 30, + "y": 80 + }, + "count": 0, + "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" + }, + { + "id": "b9769f40-c4a3-4bc8-9301-e74876370eed", + "shape": "table", + "position": { + "x": -810, + "y": -874 + }, + "count": 0, + "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD" + }, + { + "id": "fa539400-f09d-485c-af47-7055dd7beeaa", + "shape": "table", + "position": { + "x": -560, + "y": 527 + }, + "count": 0, + "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" + }, + { + "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", + "shape": "table", + "position": { + "x": -461, + "y": 180 + }, + "count": 0, + "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" + }, + { + "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", + "shape": "table", + "position": { + "x": -3270, + "y": -1440.5 + }, + "count": 0, + "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" + }, { "id": "524fda6a-d71b-4754-b673-ffc91fd753fc", "shape": "erdRelation", @@ -12689,66 +12806,6 @@ ], "fillColor": "#ACDAFC" }, - { - "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431", - "shape": "table", - "position": { - "x": 560, - "y": -167 - }, - "count": 0, - "originKey": "CD64DEB3-500E-48AF-896E-123922A03290" - }, - { - "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833", - "shape": "table", - "position": { - "x": -2570, - "y": -1440.5 - }, - "count": 0, - "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B" - }, - { - "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c", - "shape": "table", - "position": { - "x": -450.5, - "y": -368 - }, - "count": 0, - "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213" - }, - { - "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", - "shape": "table", - "position": { - "x": 30, - "y": 487 - }, - "count": 0, - "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" - }, - { - "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", - "shape": "table", - "position": { - "x": 560, - "y": 140 - }, - "count": 0, - "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" - }, - { - "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", - "shape": "table", - "position": { - "x": 30, - "y": 80 - }, - "count": 0, - "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" - }, { "id": "33dd1974-86a6-4344-9c56-ed081a79fa7f", "shape": "table", @@ -12759,16 +12816,6 @@ "count": 0, "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" }, - { - "id": "b9769f40-c4a3-4bc8-9301-e74876370eed", - "shape": "table", - "position": { - "x": -810, - "y": -874 - }, - "count": 0, - "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD" - }, { "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", "shape": "table", @@ -12780,34 +12827,14 @@ "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" }, { - "id": "fa539400-f09d-485c-af47-7055dd7beeaa", - "shape": "table", - "position": { - "x": -560, - "y": 527 - }, - "count": 0, - "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" - }, - { - "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", - "shape": "table", - "position": { - "x": -461, - "y": 180 - }, - "count": 0, - "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" - }, - { - "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", + "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac", "shape": "table", "position": { - "x": -3270, - "y": -1440.5 + "x": -3215.5, + "y": 699 }, "count": 0, - "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" + "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7" }, { "id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977", @@ -12818,16 +12845,6 @@ }, "count": 0, "originKey": "120166EB-7E57-44E5-816C-B8414CB849E9" - }, - { - "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac", - "shape": "table", - "position": { - "x": -3215.5, - "y": 699 - }, - "count": 0, - "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7" } ] }, diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004157.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163151.pdma.json similarity index 98% rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004157.pdma.json rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163151.pdma.json index 84dde971..bfba2eb7 100644 --- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004157.pdma.json +++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163151.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2022-10-3 12:39:39", - "updatedTime": "2023-4-11 00:41:51", + "updatedTime": "2023-4-11 14:53:32", "dbConns": [], "profile": { "default": { @@ -1339,7 +1339,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "30E9507B-707C-4BCF-99F2-104066BCC3F9", @@ -1835,7 +1844,24 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7", + "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95", + "refField": "3F567BD5-256D-4843-ADDF-0805BE706112", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "88311B02-719F-45ED-9603-84EEA4F6F802", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", @@ -2837,7 +2863,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "672717A5-A65E-4A6C-9F10-C4689C92FD45", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E", @@ -3265,7 +3300,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "379D48BE-3522-413B-8FA3-752D65ADB597", @@ -3747,7 +3791,24 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "65A1A6ED-EF2C-4369-8CCB-B6E762EEF9D0", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "E85EE812-0F49-49B3-8FBD-E6435CF08CDA", + "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95", + "refField": "B503CFCF-19DA-4D5B-9416-C3DD65E477CD", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1", @@ -4003,7 +4064,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", @@ -4395,7 +4465,32 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "C2FE946F-02B4-4B24-9AA4-433A6E98F7A9", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9", + "refEntity": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE", + "refField": "1012CEB5-702E-428F-ABEF-17BD9856E4E3", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "93852E9B-AD50-40B6-A131-B62EFFE3438C", + "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95", + "refField": "3F567BD5-256D-4843-ADDF-0805BE706112", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74", @@ -4767,7 +4862,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213", @@ -5616,7 +5720,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE", + "refEntity": "6036D7E4-7ECB-4888-9D74-58DA414447F8", + "refField": "0EE3108C-0995-4D82-AA03-FF63F0D62626", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE", @@ -7179,7 +7292,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E", + "refEntity": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE", + "refField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", @@ -7437,7 +7559,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "98F8F005-A630-4C98-8C1F-ECCA64E65996", + "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", + "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", @@ -7712,7 +7843,24 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "61C58DEB-2779-451F-82AD-3B03BC9C795D", + "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", + "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "4C09B365-4B2A-4613-9133-DF0421BFC85C", + "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", + "refField": "41BFEC37-8F13-42D0-B8ED-123071447D18", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "65A6F4A2-D006-4FC7-BED7-53209273F05E", @@ -8258,7 +8406,16 @@ "id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9" } ], - "correlations": [], + "correlations": [ + { + "myField": "A3C3A9A6-05BF-4514-9789-15C5732F7241", + "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022", + "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "indexes": [] }, { @@ -8989,7 +9146,24 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "correlations": [], + "correlations": [ + { + "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", + "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022", + "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "16E62919-C979-4830-930A-EAE234252B2F", + "refEntity": "91555D00-CE97-4666-94BA-E83996533E52", + "refField": "81703BD3-514F-4E8E-8898-54FDBFF90D7A", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "indexes": [] }, { @@ -9737,7 +9911,32 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "correlations": [], + "correlations": [ + { + "myField": "5F519CD5-5B0E-4C18-99AD-CD24BADE9ED3", + "refEntity": "91555D00-CE97-4666-94BA-E83996533E52", + "refField": "ED33CB09-DBB2-4FD6-B3E9-BEE77BD14B63", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", + "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022", + "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "58444AC3-3BDE-408A-BE47-3C063EC54731", + "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386", + "refField": "16E62919-C979-4830-930A-EAE234252B2F", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "indexes": [] }, { @@ -10841,6 +11040,23 @@ "extProps": {}, "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", "id": "2ED49BCC-4CA9-4793-9061-157C85E10A71" + }, + { + "defKey": "PurchaseMethod", + "defName": "采购方式(线上=0, 线下=1)", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62" } ], "correlations": [], @@ -11130,6 +11346,23 @@ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", "id": "9E416CD0-06B0-49AD-87D2-D600A6C7C57D" }, + { + "defKey": "Quantity", + "defName": "采购数量", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "C5FED921-4898-4544-8143-A315F5C49E0B" + }, { "defKey": "PurchaseSchemeId", "defName": "采购方案Id", @@ -12063,6 +12296,106 @@ "count": 0, "originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E" }, + { + "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431", + "shape": "table", + "position": { + "x": 560, + "y": -167 + }, + "count": 0, + "originKey": "CD64DEB3-500E-48AF-896E-123922A03290" + }, + { + "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833", + "shape": "table", + "position": { + "x": -2570, + "y": -1440.5 + }, + "count": 0, + "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B" + }, + { + "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c", + "shape": "table", + "position": { + "x": -450.5, + "y": -368 + }, + "count": 0, + "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213" + }, + { + "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "shape": "table", + "position": { + "x": 30, + "y": 487 + }, + "count": 0, + "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" + }, + { + "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", + "shape": "table", + "position": { + "x": 560, + "y": 140 + }, + "count": 0, + "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" + }, + { + "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", + "shape": "table", + "position": { + "x": 30, + "y": 80 + }, + "count": 0, + "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" + }, + { + "id": "b9769f40-c4a3-4bc8-9301-e74876370eed", + "shape": "table", + "position": { + "x": -810, + "y": -874 + }, + "count": 0, + "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD" + }, + { + "id": "fa539400-f09d-485c-af47-7055dd7beeaa", + "shape": "table", + "position": { + "x": -560, + "y": 527 + }, + "count": 0, + "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" + }, + { + "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", + "shape": "table", + "position": { + "x": -461, + "y": 180 + }, + "count": 0, + "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" + }, + { + "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", + "shape": "table", + "position": { + "x": -3270, + "y": -1440.5 + }, + "count": 0, + "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" + }, { "id": "524fda6a-d71b-4754-b673-ffc91fd753fc", "shape": "erdRelation", @@ -12473,66 +12806,6 @@ ], "fillColor": "#ACDAFC" }, - { - "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431", - "shape": "table", - "position": { - "x": 560, - "y": -167 - }, - "count": 0, - "originKey": "CD64DEB3-500E-48AF-896E-123922A03290" - }, - { - "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833", - "shape": "table", - "position": { - "x": -2570, - "y": -1440.5 - }, - "count": 0, - "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B" - }, - { - "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c", - "shape": "table", - "position": { - "x": -450.5, - "y": -368 - }, - "count": 0, - "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213" - }, - { - "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", - "shape": "table", - "position": { - "x": 30, - "y": 487 - }, - "count": 0, - "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" - }, - { - "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", - "shape": "table", - "position": { - "x": 560, - "y": 140 - }, - "count": 0, - "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" - }, - { - "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", - "shape": "table", - "position": { - "x": 30, - "y": 80 - }, - "count": 0, - "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" - }, { "id": "33dd1974-86a6-4344-9c56-ed081a79fa7f", "shape": "table", @@ -12543,16 +12816,6 @@ "count": 0, "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" }, - { - "id": "b9769f40-c4a3-4bc8-9301-e74876370eed", - "shape": "table", - "position": { - "x": -810, - "y": -874 - }, - "count": 0, - "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD" - }, { "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", "shape": "table", @@ -12564,34 +12827,14 @@ "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" }, { - "id": "fa539400-f09d-485c-af47-7055dd7beeaa", - "shape": "table", - "position": { - "x": -560, - "y": 527 - }, - "count": 0, - "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" - }, - { - "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", - "shape": "table", - "position": { - "x": -461, - "y": 180 - }, - "count": 0, - "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" - }, - { - "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", + "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac", "shape": "table", "position": { - "x": -3270, - "y": -1440.5 + "x": -3215.5, + "y": 699 }, "count": 0, - "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" + "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7" }, { "id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977", @@ -12602,16 +12845,6 @@ }, "count": 0, "originKey": "120166EB-7E57-44E5-816C-B8414CB849E9" - }, - { - "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac", - "shape": "table", - "position": { - "x": -3215.5, - "y": 662 - }, - "count": 0, - "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7" } ] }, diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004239.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163351.pdma.json similarity index 98% rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004239.pdma.json rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163351.pdma.json index 20c82a83..bfba2eb7 100644 --- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004239.pdma.json +++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163351.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2022-10-3 12:39:39", - "updatedTime": "2023-4-11 00:41:57", + "updatedTime": "2023-4-11 14:53:32", "dbConns": [], "profile": { "default": { @@ -1339,7 +1339,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "30E9507B-707C-4BCF-99F2-104066BCC3F9", @@ -1835,7 +1844,24 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7", + "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95", + "refField": "3F567BD5-256D-4843-ADDF-0805BE706112", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "88311B02-719F-45ED-9603-84EEA4F6F802", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", @@ -2837,7 +2863,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "672717A5-A65E-4A6C-9F10-C4689C92FD45", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E", @@ -3265,7 +3300,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "379D48BE-3522-413B-8FA3-752D65ADB597", @@ -3747,7 +3791,24 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "65A1A6ED-EF2C-4369-8CCB-B6E762EEF9D0", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "E85EE812-0F49-49B3-8FBD-E6435CF08CDA", + "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95", + "refField": "B503CFCF-19DA-4D5B-9416-C3DD65E477CD", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1", @@ -4003,7 +4064,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", @@ -4395,7 +4465,32 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "C2FE946F-02B4-4B24-9AA4-433A6E98F7A9", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9", + "refEntity": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE", + "refField": "1012CEB5-702E-428F-ABEF-17BD9856E4E3", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "93852E9B-AD50-40B6-A131-B62EFFE3438C", + "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95", + "refField": "3F567BD5-256D-4843-ADDF-0805BE706112", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74", @@ -4767,7 +4862,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213", @@ -5616,7 +5720,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE", + "refEntity": "6036D7E4-7ECB-4888-9D74-58DA414447F8", + "refField": "0EE3108C-0995-4D82-AA03-FF63F0D62626", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE", @@ -7179,7 +7292,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E", + "refEntity": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE", + "refField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", @@ -7437,7 +7559,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "98F8F005-A630-4C98-8C1F-ECCA64E65996", + "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", + "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", @@ -7712,7 +7843,24 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "61C58DEB-2779-451F-82AD-3B03BC9C795D", + "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", + "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "4C09B365-4B2A-4613-9133-DF0421BFC85C", + "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", + "refField": "41BFEC37-8F13-42D0-B8ED-123071447D18", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "65A6F4A2-D006-4FC7-BED7-53209273F05E", @@ -8258,7 +8406,16 @@ "id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9" } ], - "correlations": [], + "correlations": [ + { + "myField": "A3C3A9A6-05BF-4514-9789-15C5732F7241", + "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022", + "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "indexes": [] }, { @@ -8989,7 +9146,24 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "correlations": [], + "correlations": [ + { + "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", + "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022", + "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "16E62919-C979-4830-930A-EAE234252B2F", + "refEntity": "91555D00-CE97-4666-94BA-E83996533E52", + "refField": "81703BD3-514F-4E8E-8898-54FDBFF90D7A", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "indexes": [] }, { @@ -9737,7 +9911,32 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "correlations": [], + "correlations": [ + { + "myField": "5F519CD5-5B0E-4C18-99AD-CD24BADE9ED3", + "refEntity": "91555D00-CE97-4666-94BA-E83996533E52", + "refField": "ED33CB09-DBB2-4FD6-B3E9-BEE77BD14B63", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", + "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022", + "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "58444AC3-3BDE-408A-BE47-3C063EC54731", + "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386", + "refField": "16E62919-C979-4830-930A-EAE234252B2F", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "indexes": [] }, { @@ -10841,6 +11040,23 @@ "extProps": {}, "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", "id": "2ED49BCC-4CA9-4793-9061-157C85E10A71" + }, + { + "defKey": "PurchaseMethod", + "defName": "采购方式(线上=0, 线下=1)", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62" } ], "correlations": [], @@ -11130,6 +11346,23 @@ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", "id": "9E416CD0-06B0-49AD-87D2-D600A6C7C57D" }, + { + "defKey": "Quantity", + "defName": "采购数量", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "C5FED921-4898-4544-8143-A315F5C49E0B" + }, { "defKey": "PurchaseSchemeId", "defName": "采购方案Id", @@ -12063,6 +12296,106 @@ "count": 0, "originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E" }, + { + "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431", + "shape": "table", + "position": { + "x": 560, + "y": -167 + }, + "count": 0, + "originKey": "CD64DEB3-500E-48AF-896E-123922A03290" + }, + { + "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833", + "shape": "table", + "position": { + "x": -2570, + "y": -1440.5 + }, + "count": 0, + "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B" + }, + { + "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c", + "shape": "table", + "position": { + "x": -450.5, + "y": -368 + }, + "count": 0, + "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213" + }, + { + "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "shape": "table", + "position": { + "x": 30, + "y": 487 + }, + "count": 0, + "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" + }, + { + "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", + "shape": "table", + "position": { + "x": 560, + "y": 140 + }, + "count": 0, + "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" + }, + { + "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", + "shape": "table", + "position": { + "x": 30, + "y": 80 + }, + "count": 0, + "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" + }, + { + "id": "b9769f40-c4a3-4bc8-9301-e74876370eed", + "shape": "table", + "position": { + "x": -810, + "y": -874 + }, + "count": 0, + "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD" + }, + { + "id": "fa539400-f09d-485c-af47-7055dd7beeaa", + "shape": "table", + "position": { + "x": -560, + "y": 527 + }, + "count": 0, + "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" + }, + { + "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", + "shape": "table", + "position": { + "x": -461, + "y": 180 + }, + "count": 0, + "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" + }, + { + "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", + "shape": "table", + "position": { + "x": -3270, + "y": -1440.5 + }, + "count": 0, + "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" + }, { "id": "524fda6a-d71b-4754-b673-ffc91fd753fc", "shape": "erdRelation", @@ -12473,66 +12806,6 @@ ], "fillColor": "#ACDAFC" }, - { - "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431", - "shape": "table", - "position": { - "x": 560, - "y": -167 - }, - "count": 0, - "originKey": "CD64DEB3-500E-48AF-896E-123922A03290" - }, - { - "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833", - "shape": "table", - "position": { - "x": -2570, - "y": -1440.5 - }, - "count": 0, - "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B" - }, - { - "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c", - "shape": "table", - "position": { - "x": -450.5, - "y": -368 - }, - "count": 0, - "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213" - }, - { - "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", - "shape": "table", - "position": { - "x": 30, - "y": 487 - }, - "count": 0, - "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" - }, - { - "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", - "shape": "table", - "position": { - "x": 560, - "y": 140 - }, - "count": 0, - "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" - }, - { - "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", - "shape": "table", - "position": { - "x": 30, - "y": 80 - }, - "count": 0, - "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" - }, { "id": "33dd1974-86a6-4344-9c56-ed081a79fa7f", "shape": "table", @@ -12543,16 +12816,6 @@ "count": 0, "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" }, - { - "id": "b9769f40-c4a3-4bc8-9301-e74876370eed", - "shape": "table", - "position": { - "x": -810, - "y": -874 - }, - "count": 0, - "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD" - }, { "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", "shape": "table", @@ -12564,34 +12827,14 @@ "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" }, { - "id": "fa539400-f09d-485c-af47-7055dd7beeaa", - "shape": "table", - "position": { - "x": -560, - "y": 527 - }, - "count": 0, - "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" - }, - { - "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", - "shape": "table", - "position": { - "x": -461, - "y": 180 - }, - "count": 0, - "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" - }, - { - "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", + "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac", "shape": "table", "position": { - "x": -3270, - "y": -1440.5 + "x": -3215.5, + "y": 699 }, "count": 0, - "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" + "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7" }, { "id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977", @@ -12602,16 +12845,6 @@ }, "count": 0, "originKey": "120166EB-7E57-44E5-816C-B8414CB849E9" - }, - { - "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac", - "shape": "table", - "position": { - "x": -3215.5, - "y": 662 - }, - "count": 0, - "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7" } ] }, diff --git a/doc/步步为盈数据库.pdma.json b/doc/步步为盈数据库.pdma.json index a91b31e7..14b6d79f 100644 --- a/doc/步步为盈数据库.pdma.json +++ b/doc/步步为盈数据库.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2022-10-3 12:39:39", - "updatedTime": "2023-4-11 00:42:45", + "updatedTime": "2023-4-11 16:33:51", "dbConns": [], "profile": { "default": { @@ -1339,7 +1339,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "30E9507B-707C-4BCF-99F2-104066BCC3F9", @@ -1835,7 +1844,24 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7", + "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95", + "refField": "3F567BD5-256D-4843-ADDF-0805BE706112", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "88311B02-719F-45ED-9603-84EEA4F6F802", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", @@ -2837,7 +2863,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "672717A5-A65E-4A6C-9F10-C4689C92FD45", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E", @@ -3265,7 +3300,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "379D48BE-3522-413B-8FA3-752D65ADB597", @@ -3747,7 +3791,24 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "65A1A6ED-EF2C-4369-8CCB-B6E762EEF9D0", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "E85EE812-0F49-49B3-8FBD-E6435CF08CDA", + "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95", + "refField": "B503CFCF-19DA-4D5B-9416-C3DD65E477CD", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1", @@ -4003,7 +4064,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", @@ -4395,7 +4465,32 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "C2FE946F-02B4-4B24-9AA4-433A6E98F7A9", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9", + "refEntity": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE", + "refField": "1012CEB5-702E-428F-ABEF-17BD9856E4E3", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "93852E9B-AD50-40B6-A131-B62EFFE3438C", + "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95", + "refField": "3F567BD5-256D-4843-ADDF-0805BE706112", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74", @@ -4767,7 +4862,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3", + "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", + "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213", @@ -5616,7 +5720,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE", + "refEntity": "6036D7E4-7ECB-4888-9D74-58DA414447F8", + "refField": "0EE3108C-0995-4D82-AA03-FF63F0D62626", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE", @@ -7179,7 +7292,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E", + "refEntity": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE", + "refField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", @@ -7437,7 +7559,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "98F8F005-A630-4C98-8C1F-ECCA64E65996", + "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", + "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", @@ -7712,7 +7843,24 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "61C58DEB-2779-451F-82AD-3B03BC9C795D", + "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", + "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "4C09B365-4B2A-4613-9133-DF0421BFC85C", + "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", + "refField": "41BFEC37-8F13-42D0-B8ED-123071447D18", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "65A6F4A2-D006-4FC7-BED7-53209273F05E", @@ -8258,7 +8406,16 @@ "id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9" } ], - "correlations": [], + "correlations": [ + { + "myField": "A3C3A9A6-05BF-4514-9789-15C5732F7241", + "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022", + "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "indexes": [] }, { @@ -8989,7 +9146,24 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "correlations": [], + "correlations": [ + { + "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", + "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022", + "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "16E62919-C979-4830-930A-EAE234252B2F", + "refEntity": "91555D00-CE97-4666-94BA-E83996533E52", + "refField": "81703BD3-514F-4E8E-8898-54FDBFF90D7A", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "indexes": [] }, { @@ -9737,7 +9911,32 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "correlations": [], + "correlations": [ + { + "myField": "5F519CD5-5B0E-4C18-99AD-CD24BADE9ED3", + "refEntity": "91555D00-CE97-4666-94BA-E83996533E52", + "refField": "ED33CB09-DBB2-4FD6-B3E9-BEE77BD14B63", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", + "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022", + "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", + "myRows": "1", + "refRows": "n", + "innerType": "" + }, + { + "myField": "58444AC3-3BDE-408A-BE47-3C063EC54731", + "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386", + "refField": "16E62919-C979-4830-930A-EAE234252B2F", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "indexes": [] }, { @@ -10841,6 +11040,23 @@ "extProps": {}, "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", "id": "2ED49BCC-4CA9-4793-9061-157C85E10A71" + }, + { + "defKey": "PurchaseMethod", + "defName": "采购方式(线上=0, 线下=1)", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62" } ], "correlations": [], @@ -12080,6 +12296,106 @@ "count": 0, "originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E" }, + { + "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431", + "shape": "table", + "position": { + "x": 560, + "y": -167 + }, + "count": 0, + "originKey": "CD64DEB3-500E-48AF-896E-123922A03290" + }, + { + "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833", + "shape": "table", + "position": { + "x": -2570, + "y": -1440.5 + }, + "count": 0, + "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B" + }, + { + "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c", + "shape": "table", + "position": { + "x": -450.5, + "y": -368 + }, + "count": 0, + "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213" + }, + { + "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "shape": "table", + "position": { + "x": 30, + "y": 487 + }, + "count": 0, + "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" + }, + { + "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", + "shape": "table", + "position": { + "x": 560, + "y": 140 + }, + "count": 0, + "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" + }, + { + "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", + "shape": "table", + "position": { + "x": 30, + "y": 80 + }, + "count": 0, + "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" + }, + { + "id": "b9769f40-c4a3-4bc8-9301-e74876370eed", + "shape": "table", + "position": { + "x": -810, + "y": -874 + }, + "count": 0, + "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD" + }, + { + "id": "fa539400-f09d-485c-af47-7055dd7beeaa", + "shape": "table", + "position": { + "x": -560, + "y": 527 + }, + "count": 0, + "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" + }, + { + "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", + "shape": "table", + "position": { + "x": -461, + "y": 180 + }, + "count": 0, + "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" + }, + { + "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", + "shape": "table", + "position": { + "x": -3270, + "y": -1440.5 + }, + "count": 0, + "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" + }, { "id": "524fda6a-d71b-4754-b673-ffc91fd753fc", "shape": "erdRelation", @@ -12490,66 +12806,6 @@ ], "fillColor": "#ACDAFC" }, - { - "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431", - "shape": "table", - "position": { - "x": 560, - "y": -167 - }, - "count": 0, - "originKey": "CD64DEB3-500E-48AF-896E-123922A03290" - }, - { - "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833", - "shape": "table", - "position": { - "x": -2570, - "y": -1440.5 - }, - "count": 0, - "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B" - }, - { - "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c", - "shape": "table", - "position": { - "x": -450.5, - "y": -368 - }, - "count": 0, - "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213" - }, - { - "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", - "shape": "table", - "position": { - "x": 30, - "y": 487 - }, - "count": 0, - "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" - }, - { - "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", - "shape": "table", - "position": { - "x": 560, - "y": 140 - }, - "count": 0, - "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" - }, - { - "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", - "shape": "table", - "position": { - "x": 30, - "y": 80 - }, - "count": 0, - "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" - }, { "id": "33dd1974-86a6-4344-9c56-ed081a79fa7f", "shape": "table", @@ -12560,16 +12816,6 @@ "count": 0, "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" }, - { - "id": "b9769f40-c4a3-4bc8-9301-e74876370eed", - "shape": "table", - "position": { - "x": -810, - "y": -874 - }, - "count": 0, - "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD" - }, { "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", "shape": "table", @@ -12580,36 +12826,6 @@ "count": 0, "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" }, - { - "id": "fa539400-f09d-485c-af47-7055dd7beeaa", - "shape": "table", - "position": { - "x": -560, - "y": 527 - }, - "count": 0, - "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" - }, - { - "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", - "shape": "table", - "position": { - "x": -461, - "y": 180 - }, - "count": 0, - "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" - }, - { - "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", - "shape": "table", - "position": { - "x": -3270, - "y": -1440.5 - }, - "count": 0, - "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" - }, { "id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977", "shape": "table",