diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs index fb02caed..daa744b5 100644 --- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs +++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs @@ -1,4 +1,5 @@ -using BBWY.Common.Models; +using BBWY.Common.Extensions; +using BBWY.Common.Models; using BBWY.Server.Model.Db; using BBWY.Server.Model.Dto; using BBWY.Server.Model.Dto.Response.PurchaseOrderV2; @@ -16,6 +17,12 @@ namespace BBWY.Server.Business this.productBusiness = productBusiness; } + /// + /// 获取包含对应平台采购方案的sku列表 + /// + /// + /// + /// public IList GetProductSkuAndSchemeList(SearchProductSkuAndSchemeRequest request) { if (string.IsNullOrEmpty(request.Spu) || string.IsNullOrEmpty(request.Sku)) @@ -37,12 +44,29 @@ namespace BBWY.Server.Business var schemeList = fsql.Select().InnerJoin((ps, p) => ps.PurchaserId == p.Id) .Where((ps, p) => ps.ShopId == request.ShopId) .Where((ps, p) => ps.PurchasePlatform == request.PurchasePlatform) - .Where((ps, p) => skuIdList.Contains(ps.SkuId)).ToList(); - foreach (var productSku in productSkuList) + .Where((ps, p) => skuIdList.Contains(ps.SkuId)) + .ToList((ps, p) => new + { + PurchaseSchemeId = ps.Id, + ps.PurchaserId, + PurchaseName = p.Name, + ps.PurchasePlatform, + ps.SkuId + }); + var pruductSkuSchemeList = productSkuList.Map>(); + foreach (var ps in pruductSkuSchemeList) { - + var scheme = schemeList.FirstOrDefault(s => s.SkuId == ps.Id); + if (scheme == null) + continue; + ps.PurchaseSchemeId = scheme.PurchaseSchemeId; + ps.PurchaserId = scheme.PurchaserId; + ps.PurchaseName = scheme.PurchaseName; + ps.PurchasePlatform = scheme.PurchasePlatform; } - return null; + return pruductSkuSchemeList; } + + } } diff --git a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs index 1d74e676..c6004f8c 100644 --- a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs +++ b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs @@ -198,6 +198,11 @@ namespace BBWY.Server.Model.Db [Column(MapType = typeof(int))] public Enums.PurchaseMethod PurchaseMethod { get; set; } + /// + /// 采购单模式 批发 = 0,代发 = 1 + /// + [Column(MapType = typeof(int))] + public Enums.PurchaseOrderMode PurchaseOrderMode { get; set; } } } diff --git a/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/ProductSkuWithSchemeResponse.cs b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/ProductSkuWithSchemeResponse.cs index 12040fda..bdad83a1 100644 --- a/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/ProductSkuWithSchemeResponse.cs +++ b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/ProductSkuWithSchemeResponse.cs @@ -1,4 +1,4 @@ -namespace BBWY.Server.Model.Dto.Response.PurchaseOrderV2 +namespace BBWY.Server.Model.Dto { /// /// 包含采购方案的Sku商品信息 diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs index bba8aecf..33278d19 100644 --- a/BBWY.Server.Model/Enums.cs +++ b/BBWY.Server.Model/Enums.cs @@ -25,7 +25,7 @@ } /// - /// 采购单模式 + /// 采购单模式 批发 = 0,代发 = 1 /// public enum PurchaseOrderMode { diff --git a/BBWY.Server.Model/MappingProfiles.cs b/BBWY.Server.Model/MappingProfiles.cs index 7427348d..e7db91b6 100644 --- a/BBWY.Server.Model/MappingProfiles.cs +++ b/BBWY.Server.Model/MappingProfiles.cs @@ -59,7 +59,7 @@ namespace BBWY.Server.Model .ForPath(t => t.OrderCost.AfterTotalCost, opt => opt.MapFrom(f => f.AfterTotalCost)); CreateMap(); - + CreateMap(); } } } diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411162951.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235916.pdma.json similarity index 99% rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411162951.pdma.json rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235916.pdma.json index bfba2eb7..0f20e94b 100644 --- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411162951.pdma.json +++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235916.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2022-10-3 12:39:39", - "updatedTime": "2023-4-11 14:53:32", + "updatedTime": "2023-4-11 23:59:14", "dbConns": [], "profile": { "default": { @@ -11057,6 +11057,23 @@ "extProps": {}, "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", "id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62" + }, + { + "defKey": "PurchaseMode", + "defName": "采购模式(代发=0,批发=1)", + "comment": "", + "type": "INT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "C85C9ED3-63F6-4CA3-9482-FA7765DDE85B" } ], "correlations": [], @@ -12396,6 +12413,16 @@ "count": 0, "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" }, + { + "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", + "shape": "table", + "position": { + "x": -1054, + "y": -190 + }, + "count": 0, + "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" + }, { "id": "524fda6a-d71b-4754-b673-ffc91fd753fc", "shape": "erdRelation", @@ -12816,16 +12843,6 @@ "count": 0, "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" }, - { - "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", - "shape": "table", - "position": { - "x": -1054, - "y": -190 - }, - "count": 0, - "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" - }, { "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac", "shape": "table", @@ -12840,8 +12857,8 @@ "id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977", "shape": "table", "position": { - "x": -3220, - "y": -69.5 + "x": -3215.5, + "y": -109.5 }, "count": 0, "originKey": "120166EB-7E57-44E5-816C-B8414CB849E9" diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163151.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235945.pdma.json similarity index 99% rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163151.pdma.json rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235945.pdma.json index bfba2eb7..b9f2bc17 100644 --- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163151.pdma.json +++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235945.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2022-10-3 12:39:39", - "updatedTime": "2023-4-11 14:53:32", + "updatedTime": "2023-4-11 23:59:16", "dbConns": [], "profile": { "default": { @@ -11057,6 +11057,23 @@ "extProps": {}, "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", "id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62" + }, + { + "defKey": "PurchaseMode", + "defName": "采购模式(代发=0,批发=1)", + "comment": "", + "type": "INT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "C85C9ED3-63F6-4CA3-9482-FA7765DDE85B" } ], "correlations": [], @@ -12396,6 +12413,16 @@ "count": 0, "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" }, + { + "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", + "shape": "table", + "position": { + "x": -1054, + "y": -190 + }, + "count": 0, + "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" + }, { "id": "524fda6a-d71b-4754-b673-ffc91fd753fc", "shape": "erdRelation", @@ -12816,16 +12843,6 @@ "count": 0, "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" }, - { - "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", - "shape": "table", - "position": { - "x": -1054, - "y": -190 - }, - "count": 0, - "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" - }, { "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac", "shape": "table", @@ -12840,8 +12857,8 @@ "id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977", "shape": "table", "position": { - "x": -3220, - "y": -69.5 + "x": -3215.5, + "y": -109.5 }, "count": 0, "originKey": "120166EB-7E57-44E5-816C-B8414CB849E9" diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163351.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235948.pdma.json similarity index 98% rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163351.pdma.json rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235948.pdma.json index bfba2eb7..499fe76b 100644 --- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163351.pdma.json +++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235948.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2022-10-3 12:39:39", - "updatedTime": "2023-4-11 14:53:32", + "updatedTime": "2023-4-11 23:59:45", "dbConns": [], "profile": { "default": { @@ -1339,16 +1339,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3", - "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", - "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "30E9507B-707C-4BCF-99F2-104066BCC3F9", @@ -1844,24 +1835,7 @@ "hideInGraph": true } ], - "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": "" - } - ] + "correlations": [] }, { "id": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", @@ -2863,16 +2837,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "672717A5-A65E-4A6C-9F10-C4689C92FD45", - "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", - "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E", @@ -3300,16 +3265,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E", - "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", - "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "379D48BE-3522-413B-8FA3-752D65ADB597", @@ -3791,24 +3747,7 @@ "hideInGraph": true } ], - "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": "" - } - ] + "correlations": [] }, { "id": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1", @@ -4064,16 +4003,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF", - "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", - "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", @@ -4465,32 +4395,7 @@ "hideInGraph": true } ], - "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": "" - } - ] + "correlations": [] }, { "id": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74", @@ -4862,16 +4767,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3", - "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", - "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213", @@ -5720,16 +5616,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE", - "refEntity": "6036D7E4-7ECB-4888-9D74-58DA414447F8", - "refField": "0EE3108C-0995-4D82-AA03-FF63F0D62626", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE", @@ -7292,16 +7179,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E", - "refEntity": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE", - "refField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", @@ -7559,16 +7437,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "98F8F005-A630-4C98-8C1F-ECCA64E65996", - "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", - "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", @@ -7843,24 +7712,7 @@ "hideInGraph": true } ], - "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": "" - } - ] + "correlations": [] }, { "id": "65A6F4A2-D006-4FC7-BED7-53209273F05E", @@ -8406,16 +8258,7 @@ "id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9" } ], - "correlations": [ - { - "myField": "A3C3A9A6-05BF-4514-9789-15C5732F7241", - "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022", - "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -9146,24 +8989,7 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "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": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -9911,32 +9737,7 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "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": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -11057,6 +10858,23 @@ "extProps": {}, "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", "id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62" + }, + { + "defKey": "PurchaseOrderMode", + "defName": "采购模式(批发=0,代发=1)", + "comment": "", + "type": "INT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "C85C9ED3-63F6-4CA3-9482-FA7765DDE85B" } ], "correlations": [], @@ -12396,6 +12214,16 @@ "count": 0, "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" }, + { + "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", + "shape": "table", + "position": { + "x": -1054, + "y": -190 + }, + "count": 0, + "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" + }, { "id": "524fda6a-d71b-4754-b673-ffc91fd753fc", "shape": "erdRelation", @@ -12816,16 +12644,6 @@ "count": 0, "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" }, - { - "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", - "shape": "table", - "position": { - "x": -1054, - "y": -190 - }, - "count": 0, - "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" - }, { "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac", "shape": "table", @@ -12840,8 +12658,8 @@ "id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977", "shape": "table", "position": { - "x": -3220, - "y": -69.5 + "x": -3215.5, + "y": -109.5 }, "count": 0, "originKey": "120166EB-7E57-44E5-816C-B8414CB849E9" diff --git a/doc/步步为盈数据库.pdma.json b/doc/步步为盈数据库.pdma.json index 14b6d79f..9357debb 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 16:33:51", + "updatedTime": "2023-4-11 23:59:48", "dbConns": [], "profile": { "default": { @@ -1339,16 +1339,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3", - "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", - "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "30E9507B-707C-4BCF-99F2-104066BCC3F9", @@ -1844,24 +1835,7 @@ "hideInGraph": true } ], - "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": "" - } - ] + "correlations": [] }, { "id": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", @@ -2863,16 +2837,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "672717A5-A65E-4A6C-9F10-C4689C92FD45", - "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", - "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E", @@ -3300,16 +3265,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E", - "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", - "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "379D48BE-3522-413B-8FA3-752D65ADB597", @@ -3791,24 +3747,7 @@ "hideInGraph": true } ], - "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": "" - } - ] + "correlations": [] }, { "id": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1", @@ -4064,16 +4003,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF", - "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", - "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", @@ -4465,32 +4395,7 @@ "hideInGraph": true } ], - "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": "" - } - ] + "correlations": [] }, { "id": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74", @@ -4862,16 +4767,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3", - "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A", - "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213", @@ -5720,16 +5616,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE", - "refEntity": "6036D7E4-7ECB-4888-9D74-58DA414447F8", - "refField": "0EE3108C-0995-4D82-AA03-FF63F0D62626", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE", @@ -7292,16 +7179,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E", - "refEntity": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE", - "refField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", @@ -7559,16 +7437,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "98F8F005-A630-4C98-8C1F-ECCA64E65996", - "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", - "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", @@ -7843,24 +7712,7 @@ "hideInGraph": true } ], - "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": "" - } - ] + "correlations": [] }, { "id": "65A6F4A2-D006-4FC7-BED7-53209273F05E", @@ -8406,16 +8258,7 @@ "id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9" } ], - "correlations": [ - { - "myField": "A3C3A9A6-05BF-4514-9789-15C5732F7241", - "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022", - "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -9146,24 +8989,7 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "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": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -9911,32 +9737,7 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "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": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -11057,6 +10858,23 @@ "extProps": {}, "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", "id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62" + }, + { + "defKey": "PurchaseOrderMode", + "defName": "采购模式(批发=0,代发=1)", + "comment": "", + "type": "INT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "C85C9ED3-63F6-4CA3-9482-FA7765DDE85B" } ], "correlations": [], @@ -12396,6 +12214,16 @@ "count": 0, "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" }, + { + "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", + "shape": "table", + "position": { + "x": -1054, + "y": -190 + }, + "count": 0, + "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" + }, { "id": "524fda6a-d71b-4754-b673-ffc91fd753fc", "shape": "erdRelation", @@ -12817,34 +12645,24 @@ "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" }, { - "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", + "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac", "shape": "table", "position": { - "x": -1054, - "y": -190 + "x": -3215.5, + "y": 699 }, "count": 0, - "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" + "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7" }, { "id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977", "shape": "table", - "position": { - "x": -3220, - "y": -69.5 - }, - "count": 0, - "originKey": "120166EB-7E57-44E5-816C-B8414CB849E9" - }, - { - "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac", - "shape": "table", "position": { "x": -3215.5, - "y": 699 + "y": -109.5 }, "count": 0, - "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7" + "originKey": "120166EB-7E57-44E5-816C-B8414CB849E9" } ] },