From 40fc1c78abc7b75b48a1601caa995e0d88f214b7 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Tue, 21 Feb 2023 13:20:34 +0800 Subject: [PATCH] 1 --- BBWY.Test/Program.cs | 36 +- ...数据库-backup-2023221131929.pdma.json} | 685 +++++++++------- ...数据库-backup-2023221132004.pdma.json} | 714 +++++++++-------- ...数据库-backup-2023221132027.pdma.json} | 735 +++++++++++------- doc/步步为盈数据库.pdma.json | 485 ++++++++++-- 5 files changed, 1671 insertions(+), 984 deletions(-) rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023221041019.pdma.json => 步步为盈数据库-backup-2023221131929.pdma.json} (97%) rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023221005259.pdma.json => 步步为盈数据库-backup-2023221132004.pdma.json} (97%) rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023221041016.pdma.json => 步步为盈数据库-backup-2023221132027.pdma.json} (97%) diff --git a/BBWY.Test/Program.cs b/BBWY.Test/Program.cs index 0b783f2c..e32c03c0 100644 --- a/BBWY.Test/Program.cs +++ b/BBWY.Test/Program.cs @@ -33,37 +33,11 @@ namespace BBWY.Test //var token = "44c19a1c1fbd4641957e6e8985ed1358jmtl"; //森王玩具 - - IJdClient client = GetJdClient(appkey, appSecret); - { - - var skuList = new List() { -10025658468477, -10026219782038, -10026279996161, -10026279996162, -10026279996163, -10026463915671, -10029572468081, -10029572468082, -10029572468083, -10029572468084, -10030302993587, -10063391438691, -10063391438692, -10063391438693, -10063391438694 - }; - - foreach (var sku in skuList) - { - var jdClient = GetJdClient(appkey, appSecret); - var req = new StockReadFindSkuStockRequest(); - req.skuId = sku; - var res = jdClient.Execute(req, token, DateTime.Now.ToLocalTime()); - } - } - + var qtAppId = "BBWY2023022001"; + var qtAppSecret = "908e131365d5448ca651ba20ed7ddefe"; + var spu = 208; + var callTime = DateTime.Now.ToString("yyyyMMddHHmmss"); + var _params = JsonConvert.SerializeObject(new object[] { }); Console.ReadKey(); } } diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221041019.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221131929.pdma.json similarity index 97% rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221041019.pdma.json rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221131929.pdma.json index e798d3b8..05a86bc1 100644 --- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221041019.pdma.json +++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221131929.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.1.3", "createdTime": "2022-10-3 12:39:39", - "updatedTime": "2023-2-21 04:10:16", + "updatedTime": "2023-2-21 13:19:13", "dbConns": [], "profile": { "default": { @@ -340,7 +340,7 @@ "generatorDoc": { "docTemplate": "" }, - "relationFieldSize": 30, + "relationFieldSize": 100, "uiHint": [ { "defKey": "Input", @@ -608,7 +608,7 @@ }, { "defKey": "ReturnDirection", - "defName": "退货去向", + "defName": "退货去向(退货仓=0,采购商=1,原返=2,无退货=3)", "comment": "", "type": "", "len": "", @@ -624,12 +624,11 @@ "id": "9265E466-833C-469B-B421-7680B69CB86F" }, { - "defKey": "ProductResult", - "defName": "商品处理方式", + "defKey": "ProductHealth", + "defName": "商品健康状态 (残次品=0 良品=1)", "comment": "", - "domain": "", - "type": "INT", - "len": 11, + "type": "", + "len": "", "scale": "", "primaryKey": false, "notNull": false, @@ -637,13 +636,65 @@ "defaultValue": "", "hideInGraph": false, "refDict": "", - "id": "EA02D3B6-F0E3-4C49-AA93-3897B0F7F2C7", - "extProps": {} + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "583278B5-2792-427E-8F74-E4ACC716EC96" }, { - "defKey": "ProductHealth", - "defName": "商品情况", + "defKey": "ProductFunction", + "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": "9C1278FC-219C-4F91-A35A-54C947CD6DA1" + }, + { + "defKey": "ProductAppearance", + "defName": "产品外观 (严重损=0 轻微损=1 新=2)", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "A4E69875-9372-4902-95E6-8E827C2FA968" + }, + { + "defKey": "ProductPackage", + "defName": "产品包装(无=0 非新=1 新=2)", "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "268869F2-BAC8-4CC5-AE28-1FCE08821F05" + }, + { + "defKey": "ProductHealth2", + "defName": "商品情况(定义待变更)", + "comment": "名称待定，以前的商品情况，叶总需要更换定义", "domain": "", "type": "INT", "len": 11, @@ -652,7 +703,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": false, + "hideInGraph": true, "refDict": "", "id": "84E2BC8B-BAEF-463B-AB9A-23771BAB1E7B", "extProps": {} @@ -1047,6 +1098,23 @@ "refDict": "", "id": "1DEEC868-894F-41A0-815C-4EBBC88F2F4C", "extProps": {} + }, + { + "defKey": "ProductResult", + "defName": "商品处理方式", + "comment": "弃用", + "domain": "", + "type": "INT", + "len": 11, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "id": "EA02D3B6-F0E3-4C49-AA93-3897B0F7F2C7", + "extProps": {} } ], "indexes": [], @@ -2215,72 +2283,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "CD64DEB3-500E-48AF-896E-123922A03290", - "refField": "672717A5-A65E-4A6C-9F10-C4689C92FD45", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E", - "refField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1", - "refField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", - "refField": "C2FE946F-02B4-4B24-9AA4-433A6E98F7A9", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74", - "refField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "379D48BE-3522-413B-8FA3-752D65ADB597", - "refField": "65A1A6ED-EF2C-4369-8CCB-B6E762EEF9D0", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "70EFBBA5-586A-41A9-9051-03B037561DE3", - "refField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "30E9507B-707C-4BCF-99F2-104066BCC3F9", - "refField": "88311B02-719F-45ED-9603-84EEA4F6F802", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "CD64DEB3-500E-48AF-896E-123922A03290", @@ -4704,16 +4707,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "0EE3108C-0995-4D82-AA03-FF63F0D62626", - "refEntity": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9", - "refField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9", @@ -5268,16 +5262,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "1012CEB5-702E-428F-ABEF-17BD9856E4E3", - "refEntity": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", - "refField": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95", @@ -5765,32 +5750,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "B503CFCF-19DA-4D5B-9416-C3DD65E477CD", - "refEntity": "379D48BE-3522-413B-8FA3-752D65ADB597", - "refField": "E85EE812-0F49-49B3-8FBD-E6435CF08CDA", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "3F567BD5-256D-4843-ADDF-0805BE706112", - "refEntity": "30E9507B-707C-4BCF-99F2-104066BCC3F9", - "refField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "3F567BD5-256D-4843-ADDF-0805BE706112", - "refEntity": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", - "refField": "93852E9B-AD50-40B6-A131-B62EFFE3438C", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "DACA02F0-DE03-4869-82DF-6DB92B0C5D26", @@ -6114,16 +6074,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF", - "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", - "refField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", @@ -6370,24 +6321,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", - "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", - "refField": "98F8F005-A630-4C98-8C1F-ECCA64E65996", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", - "refEntity": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", - "refField": "61C58DEB-2779-451F-82AD-3B03BC9C795D", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", @@ -6600,16 +6534,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "41BFEC37-8F13-42D0-B8ED-123071447D18", - "refEntity": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", - "refField": "4C09B365-4B2A-4613-9133-DF0421BFC85C", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", @@ -7295,24 +7220,7 @@ "id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9" } ], - "correlations": [ - { - "myField": "81703BD3-514F-4E8E-8898-54FDBFF90D7A", - "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386", - "refField": "16E62919-C979-4830-930A-EAE234252B2F", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "ED33CB09-DBB2-4FD6-B3E9-BEE77BD14B63", - "refEntity": "DA24C713-1155-424A-AC92-2B2DF62789CD", - "refField": "5F519CD5-5B0E-4C18-99AD-CD24BADE9ED3", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -7624,32 +7532,7 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "correlations": [ - { - "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "refEntity": "91555D00-CE97-4666-94BA-E83996533E52", - "refField": "A3C3A9A6-05BF-4514-9789-15C5732F7241", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386", - "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "refEntity": "DA24C713-1155-424A-AC92-2B2DF62789CD", - "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -7978,16 +7861,7 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "correlations": [ - { - "myField": "16E62919-C979-4830-930A-EAE234252B2F", - "refEntity": "DA24C713-1155-424A-AC92-2B2DF62789CD", - "refField": "58444AC3-3BDE-408A-BE47-3C063EC54731", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -8755,6 +8629,233 @@ ], "correlations": [], "indexes": [] + }, + { + "id": "94B4B4F3-C3BE-4864-B348-569B98883A7B", + "env": { + "base": { + "nameSpace": "", + "codeRoot": "" + } + }, + "defKey": "ExpressOrder", + "defName": "快递单表", + "comment": "", + "properties": { + "partitioned by": "(date string)", + "row format delimited": "", + "fields terminated by ','": "", + "collection items terminated by '-'": "", + "map keys terminated by ':'": "", + "store as textfile;": "" + }, + "nameTemplate": "{defKey}[{defName}]", + "headers": [ + { + "refKey": "hideInGraph", + "hideInGraph": true + }, + { + "refKey": "defKey", + "hideInGraph": false + }, + { + "refKey": "defName", + "hideInGraph": false + }, + { + "refKey": "primaryKey", + "hideInGraph": false + }, + { + "refKey": "notNull", + "hideInGraph": true + }, + { + "refKey": "autoIncrement", + "hideInGraph": true + }, + { + "refKey": "domain", + "hideInGraph": true + }, + { + "refKey": "type", + "hideInGraph": false + }, + { + "refKey": "len", + "hideInGraph": false + }, + { + "refKey": "scale", + "hideInGraph": false + }, + { + "refKey": "comment", + "hideInGraph": true + }, + { + "refKey": "refDict", + "hideInGraph": true + }, + { + "refKey": "defaultValue", + "hideInGraph": true + }, + { + "refKey": "isStandard", + "hideInGraph": false + }, + { + "refKey": "uiHint", + "hideInGraph": true + }, + { + "refKey": "extProps", + "hideInGraph": true + } + ], + "fields": [ + { + "defKey": "Id", + "defName": "", + "comment": "", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "086E73E3-16A5-4DB2-B7F3-1D6B46500A35" + }, + { + "defKey": "WayBillNo", + "defName": "快递单号", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "C57EFD3C-B87A-4172-A917-B9F0B37BFB42" + }, + { + "defKey": "ExpressName", + "defName": "快递公司名称", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "1C4B4271-9640-4A78-A0DA-E13584257C9E" + }, + { + "defKey": "TransportDetails", + "defName": "运输详情", + "comment": "", + "type": "VARCHAR", + "len": 1000, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "424E3E7E-798E-4219-A41C-E17C09EDF8C1" + }, + { + "defKey": "ServiceId", + "defName": "服务单Id", + "comment": "可空", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "B20CC0B7-A0CF-4B6F-A104-C90AA0EF8C0A" + }, + { + "defKey": "PurchaseOrderId", + "defName": "采购单Id", + "comment": "可空", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "D9669169-6530-4BD3-9409-E2D6722965B6" + }, + { + "defKey": "OrderId", + "defName": "订单Id", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "3613C402-199D-4642-A8A6-A6A470013475" + }, + { + "defKey": "PackageType", + "defName": "包裹类型(采购包裹=0 退货包裹=1)", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "ED963E0A-8F45-4C2B-A2E2-6926E5F2C966" + } + ], + "correlations": [], + "indexes": [] } ], "views": [], @@ -9469,6 +9570,66 @@ "count": 0, "originKey": "91555D00-CE97-4666-94BA-E83996533E52" }, + { + "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": "33dd1974-86a6-4344-9c56-ed081a79fa7f", + "shape": "table", + "position": { + "x": -560, + "y": -190 + }, + "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": "b9769f40-c4a3-4bc8-9301-e74876370eed", + "shape": "table", + "position": { + "x": -810, + "y": -874 + }, + "count": 0, + "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD" + }, + { + "id": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d", + "shape": "table", + "position": { + "x": -810, + "y": -1222 + }, + "count": 0, + "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022" + }, { "id": "524fda6a-d71b-4754-b673-ffc91fd753fc", "shape": "erdRelation", @@ -9879,36 +10040,6 @@ ], "fillColor": "#ACDAFC" }, - { - "id": "98934117-29b1-4645-a97b-71f379b61bd9", - "shape": "table", - "position": { - "x": 562, - "y": 487 - }, - "count": 0, - "originKey": "379D48BE-3522-413B-8FA3-752D65ADB597" - }, - { - "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", - "shape": "table", - "position": { - "x": 560, - "y": 140 - }, - "count": 0, - "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" - }, - { - "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431", - "shape": "table", - "position": { - "x": 560, - "y": -167 - }, - "count": 0, - "originKey": "CD64DEB3-500E-48AF-896E-123922A03290" - }, { "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", "shape": "table", @@ -9930,74 +10061,54 @@ "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" }, { - "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": "33dd1974-86a6-4344-9c56-ed081a79fa7f", + "id": "98934117-29b1-4645-a97b-71f379b61bd9", "shape": "table", "position": { - "x": -560, - "y": -190 + "x": 562, + "y": 487 }, "count": 0, - "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" + "originKey": "379D48BE-3522-413B-8FA3-752D65ADB597" }, { - "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", + "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", "shape": "table", "position": { - "x": -1054, - "y": -190 + "x": 560, + "y": 140 }, "count": 0, - "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" + "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" }, { - "id": "b9769f40-c4a3-4bc8-9301-e74876370eed", + "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431", "shape": "table", "position": { - "x": -810, - "y": -874 + "x": 560, + "y": -167 }, "count": 0, - "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD" + "originKey": "CD64DEB3-500E-48AF-896E-123922A03290" }, { - "id": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d", + "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", "shape": "table", "position": { - "x": -810, - "y": -1222 + "x": 40, + "y": -1000 }, "count": 0, - "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022" + "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" }, { - "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", + "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833", "shape": "table", "position": { - "x": -50, - "y": -980 + "x": 750, + "y": -923 }, "count": 0, - "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" + "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B" } ] }, diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221005259.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221132004.pdma.json similarity index 97% rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221005259.pdma.json rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221132004.pdma.json index 919d55d1..4b3b6283 100644 --- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221005259.pdma.json +++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221132004.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.1.3", "createdTime": "2022-10-3 12:39:39", - "updatedTime": "2023-2-21 00:49:47", + "updatedTime": "2023-2-21 13:19:29", "dbConns": [], "profile": { "default": { @@ -340,7 +340,7 @@ "generatorDoc": { "docTemplate": "" }, - "relationFieldSize": 30, + "relationFieldSize": 100, "uiHint": [ { "defKey": "Input", @@ -572,6 +572,23 @@ "id": "A2037B10-D1F4-4581-B5E2-0993DB461735", "extProps": {} }, + { + "defKey": "Status", + "defName": "服务单状态", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "064C3D14-C368-4C93-AB4C-281839B8CF68" + }, { "defKey": "ServiceResult", "defName": "服务单处理结果", @@ -590,12 +607,11 @@ "extProps": {} }, { - "defKey": "ProductResult", - "defName": "商品处理方式", + "defKey": "ReturnDirection", + "defName": "退货去向(退货仓=0,采购商=1,原返=2,无退货=3)", "comment": "", - "domain": "", - "type": "INT", - "len": 11, + "type": "", + "len": "", "scale": "", "primaryKey": false, "notNull": false, @@ -603,13 +619,82 @@ "defaultValue": "", "hideInGraph": false, "refDict": "", - "id": "EA02D3B6-F0E3-4C49-AA93-3897B0F7F2C7", - "extProps": {} + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "9265E466-833C-469B-B421-7680B69CB86F" }, { "defKey": "ProductHealth", - "defName": "商品情况", + "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": "583278B5-2792-427E-8F74-E4ACC716EC96" + }, + { + "defKey": "ProductFunction", + "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": "9C1278FC-219C-4F91-A35A-54C947CD6DA1" + }, + { + "defKey": "ProductAppearance", + "defName": "产品外观 (严重损=0 轻微损=1 新=2)", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "A4E69875-9372-4902-95E6-8E827C2FA968" + }, + { + "defKey": "ProductPackage", + "defName": "产品包装(无=0 非新=1 新=2)", "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "268869F2-BAC8-4CC5-AE28-1FCE08821F05" + }, + { + "defKey": "ProductHealth2", + "defName": "商品情况(定义待变更)", + "comment": "名称待定，以前的商品情况，叶总需要更换定义", "domain": "", "type": "INT", "len": 11, @@ -618,7 +703,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": false, + "hideInGraph": true, "refDict": "", "id": "84E2BC8B-BAEF-463B-AB9A-23771BAB1E7B", "extProps": {} @@ -703,7 +788,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "0.00", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "0458BB5D-D7DF-47AD-B4EE-ADFF22D1354B", "extProps": {} @@ -720,7 +805,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "0.00", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "ACD06B50-55CA-488F-8AB7-6B66D28285D4", "extProps": {} @@ -737,7 +822,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "0.00", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "E960E17C-19DC-49A0-A9E1-98DBDD28490E", "extProps": {} @@ -754,7 +839,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "0.00", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "770849F4-E1AC-472F-90B0-8549D3C4F820", "extProps": {} @@ -771,7 +856,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "0.00", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "28CCF9D2-AF1C-4B6A-8F90-20E112355D95", "extProps": {} @@ -788,7 +873,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "0.00", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "61F6A665-482C-4D2E-A78E-D3EE78793E0F", "extProps": {} @@ -805,7 +890,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "0.00", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "DF576889-E6D1-4F87-9684-AF3A7D3AC9FC", "extProps": {} @@ -822,7 +907,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "0.00", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "CEEDB675-0830-4B10-8694-1945FCE788D7", "extProps": {} @@ -839,7 +924,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "07C710D1-A4A9-40E3-A896-7B5F68F94B64", "extProps": {} @@ -856,7 +941,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "56C7761E-B9AD-4296-89A9-484DE6876E01", "extProps": {} @@ -873,7 +958,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "0.00", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "1AFB6943-4498-405E-AA68-416497991CDB", "extProps": {} @@ -890,7 +975,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "0.00", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "674C7BE9-8594-46B8-9DC1-F3415A27B91C", "extProps": {} @@ -907,7 +992,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "F2B0501D-4763-485F-804E-88FA791912EA", "extProps": {} @@ -924,7 +1009,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "EE2A67F8-A949-406F-9DB6-768D9477CFB6", "extProps": {} @@ -941,7 +1026,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": true, + "hideInGraph": false, "refDict": "", "id": "E0140A92-903C-410C-8317-6FDE9C1237E8", "extProps": {} @@ -1013,6 +1098,23 @@ "refDict": "", "id": "1DEEC868-894F-41A0-815C-4EBBC88F2F4C", "extProps": {} + }, + { + "defKey": "ProductResult", + "defName": "商品处理方式", + "comment": "弃用", + "domain": "", + "type": "INT", + "len": 11, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "id": "EA02D3B6-F0E3-4C49-AA93-3897B0F7F2C7", + "extProps": {} } ], "indexes": [], @@ -2181,72 +2283,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "CD64DEB3-500E-48AF-896E-123922A03290", - "refField": "672717A5-A65E-4A6C-9F10-C4689C92FD45", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E", - "refField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1", - "refField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", - "refField": "C2FE946F-02B4-4B24-9AA4-433A6E98F7A9", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74", - "refField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "379D48BE-3522-413B-8FA3-752D65ADB597", - "refField": "65A1A6ED-EF2C-4369-8CCB-B6E762EEF9D0", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "70EFBBA5-586A-41A9-9051-03B037561DE3", - "refField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "30E9507B-707C-4BCF-99F2-104066BCC3F9", - "refField": "88311B02-719F-45ED-9603-84EEA4F6F802", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "CD64DEB3-500E-48AF-896E-123922A03290", @@ -4670,16 +4707,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "0EE3108C-0995-4D82-AA03-FF63F0D62626", - "refEntity": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9", - "refField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9", @@ -5234,16 +5262,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "1012CEB5-702E-428F-ABEF-17BD9856E4E3", - "refEntity": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", - "refField": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95", @@ -5731,32 +5750,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "B503CFCF-19DA-4D5B-9416-C3DD65E477CD", - "refEntity": "379D48BE-3522-413B-8FA3-752D65ADB597", - "refField": "E85EE812-0F49-49B3-8FBD-E6435CF08CDA", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "3F567BD5-256D-4843-ADDF-0805BE706112", - "refEntity": "30E9507B-707C-4BCF-99F2-104066BCC3F9", - "refField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "3F567BD5-256D-4843-ADDF-0805BE706112", - "refEntity": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", - "refField": "93852E9B-AD50-40B6-A131-B62EFFE3438C", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "DACA02F0-DE03-4869-82DF-6DB92B0C5D26", @@ -6080,16 +6074,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF", - "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", - "refField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", @@ -6336,24 +6321,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", - "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", - "refField": "98F8F005-A630-4C98-8C1F-ECCA64E65996", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", - "refEntity": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", - "refField": "61C58DEB-2779-451F-82AD-3B03BC9C795D", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", @@ -6566,16 +6534,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "41BFEC37-8F13-42D0-B8ED-123071447D18", - "refEntity": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", - "refField": "4C09B365-4B2A-4613-9133-DF0421BFC85C", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", @@ -7261,24 +7220,7 @@ "id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9" } ], - "correlations": [ - { - "myField": "81703BD3-514F-4E8E-8898-54FDBFF90D7A", - "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386", - "refField": "16E62919-C979-4830-930A-EAE234252B2F", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "ED33CB09-DBB2-4FD6-B3E9-BEE77BD14B63", - "refEntity": "DA24C713-1155-424A-AC92-2B2DF62789CD", - "refField": "5F519CD5-5B0E-4C18-99AD-CD24BADE9ED3", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -7590,32 +7532,7 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "correlations": [ - { - "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "refEntity": "91555D00-CE97-4666-94BA-E83996533E52", - "refField": "A3C3A9A6-05BF-4514-9789-15C5732F7241", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386", - "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "refEntity": "DA24C713-1155-424A-AC92-2B2DF62789CD", - "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -7944,16 +7861,7 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "correlations": [ - { - "myField": "16E62919-C979-4830-930A-EAE234252B2F", - "refEntity": "DA24C713-1155-424A-AC92-2B2DF62789CD", - "refField": "58444AC3-3BDE-408A-BE47-3C063EC54731", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -8702,29 +8610,153 @@ ], "fields": [ { - "defKey": "TENANT_ID", - "defName": "租户号", + "defKey": "ServiceId", + "defName": "服务单Id", "comment": "", - "type": "", - "len": 32, + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "94F9043E-0427-440B-A567-8B76C10C4139" + } + ], + "correlations": [], + "indexes": [] + }, + { + "id": "94B4B4F3-C3BE-4864-B348-569B98883A7B", + "env": { + "base": { + "nameSpace": "", + "codeRoot": "" + } + }, + "defKey": "ExpressOrder", + "defName": "快递单表", + "comment": "", + "properties": { + "partitioned by": "(date string)", + "row format delimited": "", + "fields terminated by ','": "", + "collection items terminated by '-'": "", + "map keys terminated by ':'": "", + "store as textfile;": "" + }, + "nameTemplate": "{defKey}[{defName}]", + "headers": [ + { + "refKey": "hideInGraph", + "hideInGraph": true + }, + { + "refKey": "defKey", + "hideInGraph": false + }, + { + "refKey": "defName", + "hideInGraph": false + }, + { + "refKey": "primaryKey", + "hideInGraph": false + }, + { + "refKey": "notNull", + "hideInGraph": true + }, + { + "refKey": "autoIncrement", + "hideInGraph": true + }, + { + "refKey": "domain", + "hideInGraph": true + }, + { + "refKey": "type", + "hideInGraph": false + }, + { + "refKey": "len", + "hideInGraph": false + }, + { + "refKey": "scale", + "hideInGraph": false + }, + { + "refKey": "comment", + "hideInGraph": true + }, + { + "refKey": "refDict", + "hideInGraph": true + }, + { + "refKey": "defaultValue", + "hideInGraph": true + }, + { + "refKey": "isStandard", + "hideInGraph": false + }, + { + "refKey": "uiHint", + "hideInGraph": true + }, + { + "refKey": "extProps", + "hideInGraph": true + } + ], + "fields": [ + { + "defKey": "Id", + "defName": "", + "comment": "", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "086E73E3-16A5-4DB2-B7F3-1D6B46500A35" + }, + { + "defKey": "WayBillNo", + "defName": "快递单号", + "comment": "", + "type": "VARCHAR", + "len": 100, "scale": "", "primaryKey": false, "notNull": false, "autoIncrement": false, "defaultValue": "", "hideInGraph": false, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", "refDict": "", - "uiHint": "", - "id": "CDE6EECB-3893-4AD0-9E44-AEB1E82AF30F" + "extProps": {}, + "domain": "", + "id": "C57EFD3C-B87A-4172-A917-B9F0B37BFB42" }, { - "defKey": "REVISION", - "defName": "乐观锁", + "defKey": "ExpressName", + "defName": "快递公司名称", "comment": "", - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "type": "", - "len": 32, + "type": "VARCHAR", + "len": 100, "scale": "", "primaryKey": false, "notNull": false, @@ -8732,16 +8764,50 @@ "defaultValue": "", "hideInGraph": false, "refDict": "", - "uiHint": "", - "id": "2D7707B2-4DC3-40FF-9D73-8ABFDDACEF37" + "extProps": {}, + "domain": "", + "id": "1C4B4271-9640-4A78-A0DA-E13584257C9E" }, { - "defKey": "CREATED_BY", - "defName": "创建人", + "defKey": "TransportDetails", + "defName": "运输详情", "comment": "", - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "type": "VARCHAR", + "len": 1000, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "424E3E7E-798E-4219-A41C-E17C09EDF8C1" + }, + { + "defKey": "ServiceId", + "defName": "服务单Id", + "comment": "可空", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "B20CC0B7-A0CF-4B6F-A104-C90AA0EF8C0A" + }, + { + "defKey": "PurchaseOrderId", + "defName": "采购单Id", + "comment": "可空", "type": "", - "len": 32, + "len": "", "scale": "", "primaryKey": false, "notNull": false, @@ -8749,14 +8815,31 @@ "defaultValue": "", "hideInGraph": false, "refDict": "", - "uiHint": "", - "id": "B3A2D81F-5AEE-4013-8BB1-D09F9E949F79" + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "D9669169-6530-4BD3-9409-E2D6722965B6" }, { - "defKey": "CREATED_TIME", - "defName": "创建时间", + "defKey": "OrderId", + "defName": "订单Id", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "3613C402-199D-4642-A8A6-A6A470013475" + }, + { + "defKey": "PackageType", + "defName": "包裹类型(采购包裹=0 退货包裹=1)", "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", "type": "", "len": "", "scale": "", @@ -8766,16 +8849,16 @@ "defaultValue": "", "hideInGraph": false, "refDict": "", - "uiHint": "", - "id": "886B318A-1FBB-468D-9DAA-8E989B1DACBB" + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "ED963E0A-8F45-4C2B-A2E2-6926E5F2C966" }, { - "defKey": "UPDATED_BY", - "defName": "更新人", + "defKey": "CreateTime", + "defName": "", "comment": "", - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", "type": "", - "len": 32, + "len": "", "scale": "", "primaryKey": false, "notNull": false, @@ -8783,14 +8866,14 @@ "defaultValue": "", "hideInGraph": false, "refDict": "", - "uiHint": "", - "id": "A154A382-B679-4929-86B5-D843EBE34AB5" + "extProps": {}, + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "id": "3429613A-A50F-45B6-AD8E-6D036FD62C76" }, { - "defKey": "UPDATED_TIME", - "defName": "更新时间", + "defKey": "UpdateTime", + "defName": "", "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", "type": "", "len": "", "scale": "", @@ -8800,8 +8883,9 @@ "defaultValue": "", "hideInGraph": false, "refDict": "", - "uiHint": "", - "id": "233CBEA3-32A3-4CC4-992A-70AE142F9FBF" + "extProps": {}, + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "id": "8624878C-B971-4FF8-9034-C622E64F87DC" } ], "correlations": [], @@ -9491,94 +9575,94 @@ "originKey": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2" }, { - "id": "fa539400-f09d-485c-af47-7055dd7beeaa", + "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c", "shape": "table", "position": { - "x": -560, - "y": 527 + "x": -450.5, + "y": -368 }, "count": 0, - "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" + "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213" }, { - "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "id": "653b5ef3-a1d2-4553-9629-d3525cd0f6cb", "shape": "table", "position": { - "x": 30, - "y": 487 + "x": -250, + "y": -1510 }, "count": 0, - "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" + "originKey": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386" }, { - "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", + "id": "8e17e14e-a20d-4206-9139-347098cd35fe", "shape": "table", "position": { - "x": -461, - "y": 180 + "x": -814, + "y": -1510 }, "count": 0, - "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" + "originKey": "91555D00-CE97-4666-94BA-E83996533E52" }, { - "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", + "id": "fa539400-f09d-485c-af47-7055dd7beeaa", "shape": "table", "position": { - "x": -1054, - "y": -190 + "x": -560, + "y": 527 }, "count": 0, - "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" + "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" }, { - "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c", + "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", "shape": "table", "position": { - "x": -450.5, - "y": -368 + "x": -461, + "y": 180 }, "count": 0, - "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213" + "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" }, { - "id": "653b5ef3-a1d2-4553-9629-d3525cd0f6cb", + "id": "33dd1974-86a6-4344-9c56-ed081a79fa7f", "shape": "table", "position": { - "x": -250, - "y": -1510 + "x": -560, + "y": -190 }, "count": 0, - "originKey": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386" + "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" }, { - "id": "8e17e14e-a20d-4206-9139-347098cd35fe", + "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", "shape": "table", "position": { - "x": -814, - "y": -1510 + "x": -1054, + "y": -190 }, "count": 0, - "originKey": "91555D00-CE97-4666-94BA-E83996533E52" + "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" }, { - "id": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d", + "id": "b9769f40-c4a3-4bc8-9301-e74876370eed", "shape": "table", "position": { "x": -810, - "y": -1222 + "y": -874 }, "count": 0, - "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022" + "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD" }, { - "id": "b9769f40-c4a3-4bc8-9301-e74876370eed", + "id": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d", "shape": "table", "position": { "x": -810, - "y": -874 + "y": -1222 }, "count": 0, - "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD" + "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022" }, { "id": "524fda6a-d71b-4754-b673-ffc91fd753fc", @@ -9991,14 +10075,24 @@ "fillColor": "#ACDAFC" }, { - "id": "33dd1974-86a6-4344-9c56-ed081a79fa7f", + "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", "shape": "table", "position": { - "x": -560, - "y": -190 + "x": 30, + "y": 80 }, "count": 0, - "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" + "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" + }, + { + "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", + "shape": "table", + "position": { + "x": 30, + "y": 487 + }, + "count": 0, + "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" }, { "id": "98934117-29b1-4645-a97b-71f379b61bd9", @@ -10034,21 +10128,21 @@ "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", "shape": "table", "position": { - "x": 30, - "y": -302 + "x": 40, + "y": -1000 }, "count": 0, "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" }, { - "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", + "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833", "shape": "table", "position": { - "x": 30, - "y": 71 + "x": 750, + "y": -923 }, "count": 0, - "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" + "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B" } ] }, diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221041016.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221132027.pdma.json similarity index 97% rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221041016.pdma.json rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221132027.pdma.json index c2911b21..0b76c0f4 100644 --- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221041016.pdma.json +++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221132027.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.1.3", "createdTime": "2022-10-3 12:39:39", - "updatedTime": "2023-2-21 00:52:59", + "updatedTime": "2023-2-21 13:20:04", "dbConns": [], "profile": { "default": { @@ -340,7 +340,7 @@ "generatorDoc": { "docTemplate": "" }, - "relationFieldSize": 30, + "relationFieldSize": 100, "uiHint": [ { "defKey": "Input", @@ -572,6 +572,23 @@ "id": "A2037B10-D1F4-4581-B5E2-0993DB461735", "extProps": {} }, + { + "defKey": "Status", + "defName": "服务单状态", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "064C3D14-C368-4C93-AB4C-281839B8CF68" + }, { "defKey": "ServiceResult", "defName": "服务单处理结果", @@ -590,12 +607,11 @@ "extProps": {} }, { - "defKey": "ProductResult", - "defName": "商品处理方式", + "defKey": "ReturnDirection", + "defName": "退货去向(退货仓=0,采购商=1,原返=2,无退货=3)", "comment": "", - "domain": "", - "type": "INT", - "len": 11, + "type": "", + "len": "", "scale": "", "primaryKey": false, "notNull": false, @@ -603,13 +619,82 @@ "defaultValue": "", "hideInGraph": false, "refDict": "", - "id": "EA02D3B6-F0E3-4C49-AA93-3897B0F7F2C7", - "extProps": {} + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "9265E466-833C-469B-B421-7680B69CB86F" }, { "defKey": "ProductHealth", - "defName": "商品情况", + "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": "583278B5-2792-427E-8F74-E4ACC716EC96" + }, + { + "defKey": "ProductFunction", + "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": "9C1278FC-219C-4F91-A35A-54C947CD6DA1" + }, + { + "defKey": "ProductAppearance", + "defName": "产品外观 (严重损=0 轻微损=1 新=2)", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "A4E69875-9372-4902-95E6-8E827C2FA968" + }, + { + "defKey": "ProductPackage", + "defName": "产品包装(无=0 非新=1 新=2)", "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "268869F2-BAC8-4CC5-AE28-1FCE08821F05" + }, + { + "defKey": "ProductHealth2", + "defName": "商品情况(定义待变更)", + "comment": "名称待定，以前的商品情况，叶总需要更换定义", "domain": "", "type": "INT", "len": 11, @@ -618,7 +703,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": false, + "hideInGraph": true, "refDict": "", "id": "84E2BC8B-BAEF-463B-AB9A-23771BAB1E7B", "extProps": {} @@ -1013,6 +1098,23 @@ "refDict": "", "id": "1DEEC868-894F-41A0-815C-4EBBC88F2F4C", "extProps": {} + }, + { + "defKey": "ProductResult", + "defName": "商品处理方式", + "comment": "弃用", + "domain": "", + "type": "INT", + "len": 11, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "id": "EA02D3B6-F0E3-4C49-AA93-3897B0F7F2C7", + "extProps": {} } ], "indexes": [], @@ -2181,72 +2283,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "CD64DEB3-500E-48AF-896E-123922A03290", - "refField": "672717A5-A65E-4A6C-9F10-C4689C92FD45", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E", - "refField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1", - "refField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", - "refField": "C2FE946F-02B4-4B24-9AA4-433A6E98F7A9", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74", - "refField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "379D48BE-3522-413B-8FA3-752D65ADB597", - "refField": "65A1A6ED-EF2C-4369-8CCB-B6E762EEF9D0", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "70EFBBA5-586A-41A9-9051-03B037561DE3", - "refField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76", - "refEntity": "30E9507B-707C-4BCF-99F2-104066BCC3F9", - "refField": "88311B02-719F-45ED-9603-84EEA4F6F802", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "CD64DEB3-500E-48AF-896E-123922A03290", @@ -4670,16 +4707,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "0EE3108C-0995-4D82-AA03-FF63F0D62626", - "refEntity": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9", - "refField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9", @@ -5234,16 +5262,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "1012CEB5-702E-428F-ABEF-17BD9856E4E3", - "refEntity": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", - "refField": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95", @@ -5731,32 +5750,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "B503CFCF-19DA-4D5B-9416-C3DD65E477CD", - "refEntity": "379D48BE-3522-413B-8FA3-752D65ADB597", - "refField": "E85EE812-0F49-49B3-8FBD-E6435CF08CDA", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "3F567BD5-256D-4843-ADDF-0805BE706112", - "refEntity": "30E9507B-707C-4BCF-99F2-104066BCC3F9", - "refField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "3F567BD5-256D-4843-ADDF-0805BE706112", - "refEntity": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A", - "refField": "93852E9B-AD50-40B6-A131-B62EFFE3438C", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "DACA02F0-DE03-4869-82DF-6DB92B0C5D26", @@ -6080,16 +6074,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF", - "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", - "refField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32", @@ -6336,24 +6321,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", - "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", - "refField": "98F8F005-A630-4C98-8C1F-ECCA64E65996", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF", - "refEntity": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", - "refField": "61C58DEB-2779-451F-82AD-3B03BC9C795D", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A", @@ -6566,16 +6534,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "41BFEC37-8F13-42D0-B8ED-123071447D18", - "refEntity": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", - "refField": "4C09B365-4B2A-4613-9133-DF0421BFC85C", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ] + "correlations": [] }, { "id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2", @@ -7261,24 +7220,7 @@ "id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9" } ], - "correlations": [ - { - "myField": "81703BD3-514F-4E8E-8898-54FDBFF90D7A", - "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386", - "refField": "16E62919-C979-4830-930A-EAE234252B2F", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "ED33CB09-DBB2-4FD6-B3E9-BEE77BD14B63", - "refEntity": "DA24C713-1155-424A-AC92-2B2DF62789CD", - "refField": "5F519CD5-5B0E-4C18-99AD-CD24BADE9ED3", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -7590,32 +7532,7 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "correlations": [ - { - "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "refEntity": "91555D00-CE97-4666-94BA-E83996533E52", - "refField": "A3C3A9A6-05BF-4514-9789-15C5732F7241", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386", - "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "myRows": "n", - "refRows": "1", - "innerType": "" - }, - { - "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "refEntity": "DA24C713-1155-424A-AC92-2B2DF62789CD", - "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -7944,16 +7861,7 @@ "id": "07FFE4B1-4275-4407-832A-1F2193E3DA37" } ], - "correlations": [ - { - "myField": "16E62919-C979-4830-930A-EAE234252B2F", - "refEntity": "DA24C713-1155-424A-AC92-2B2DF62789CD", - "refField": "58444AC3-3BDE-408A-BE47-3C063EC54731", - "myRows": "n", - "refRows": "1", - "innerType": "" - } - ], + "correlations": [], "indexes": [] }, { @@ -8721,6 +8629,267 @@ ], "correlations": [], "indexes": [] + }, + { + "id": "94B4B4F3-C3BE-4864-B348-569B98883A7B", + "env": { + "base": { + "nameSpace": "", + "codeRoot": "" + } + }, + "defKey": "ExpressOrder", + "defName": "快递单表", + "comment": "", + "properties": { + "partitioned by": "(date string)", + "row format delimited": "", + "fields terminated by ','": "", + "collection items terminated by '-'": "", + "map keys terminated by ':'": "", + "store as textfile;": "" + }, + "nameTemplate": "{defKey}[{defName}]", + "headers": [ + { + "refKey": "hideInGraph", + "hideInGraph": true + }, + { + "refKey": "defKey", + "hideInGraph": false + }, + { + "refKey": "defName", + "hideInGraph": false + }, + { + "refKey": "primaryKey", + "hideInGraph": false + }, + { + "refKey": "notNull", + "hideInGraph": true + }, + { + "refKey": "autoIncrement", + "hideInGraph": true + }, + { + "refKey": "domain", + "hideInGraph": true + }, + { + "refKey": "type", + "hideInGraph": false + }, + { + "refKey": "len", + "hideInGraph": false + }, + { + "refKey": "scale", + "hideInGraph": false + }, + { + "refKey": "comment", + "hideInGraph": true + }, + { + "refKey": "refDict", + "hideInGraph": true + }, + { + "refKey": "defaultValue", + "hideInGraph": true + }, + { + "refKey": "isStandard", + "hideInGraph": false + }, + { + "refKey": "uiHint", + "hideInGraph": true + }, + { + "refKey": "extProps", + "hideInGraph": true + } + ], + "fields": [ + { + "defKey": "Id", + "defName": "", + "comment": "", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "086E73E3-16A5-4DB2-B7F3-1D6B46500A35" + }, + { + "defKey": "WayBillNo", + "defName": "快递单号", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "C57EFD3C-B87A-4172-A917-B9F0B37BFB42" + }, + { + "defKey": "ExpressName", + "defName": "快递公司名称", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "1C4B4271-9640-4A78-A0DA-E13584257C9E" + }, + { + "defKey": "TransportDetails", + "defName": "运输详情", + "comment": "", + "type": "VARCHAR", + "len": 1000, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "424E3E7E-798E-4219-A41C-E17C09EDF8C1" + }, + { + "defKey": "ServiceId", + "defName": "服务单Id", + "comment": "可空", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "B20CC0B7-A0CF-4B6F-A104-C90AA0EF8C0A" + }, + { + "defKey": "PurchaseOrderId", + "defName": "采购单Id", + "comment": "可空", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "D9669169-6530-4BD3-9409-E2D6722965B6" + }, + { + "defKey": "OrderId", + "defName": "订单Id", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "3613C402-199D-4642-A8A6-A6A470013475" + }, + { + "defKey": "PackageType", + "defName": "包裹类型(采购包裹=0 退货包裹=1)", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "ED963E0A-8F45-4C2B-A2E2-6926E5F2C966" + }, + { + "defKey": "CreateTime", + "defName": "", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "id": "3429613A-A50F-45B6-AD8E-6D036FD62C76" + }, + { + "defKey": "UpdateTime", + "defName": "", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "id": "8624878C-B971-4FF8-9034-C622E64F87DC" + } + ], + "correlations": [], + "indexes": [] } ], "views": [], @@ -9405,16 +9574,6 @@ "count": 0, "originKey": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2" }, - { - "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", - "shape": "table", - "position": { - "x": -461, - "y": 180 - }, - "count": 0, - "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" - }, { "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c", "shape": "table", @@ -9446,14 +9605,44 @@ "originKey": "91555D00-CE97-4666-94BA-E83996533E52" }, { - "id": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d", + "id": "fa539400-f09d-485c-af47-7055dd7beeaa", "shape": "table", "position": { - "x": -810, - "y": -1222 + "x": -560, + "y": 527 }, "count": 0, - "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022" + "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": "33dd1974-86a6-4344-9c56-ed081a79fa7f", + "shape": "table", + "position": { + "x": -560, + "y": -190 + }, + "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": "b9769f40-c4a3-4bc8-9301-e74876370eed", @@ -9465,6 +9654,16 @@ "count": 0, "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD" }, + { + "id": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d", + "shape": "table", + "position": { + "x": -810, + "y": -1222 + }, + "count": 0, + "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022" + }, { "id": "524fda6a-d71b-4754-b673-ffc91fd753fc", "shape": "erdRelation", @@ -9876,34 +10075,14 @@ "fillColor": "#ACDAFC" }, { - "id": "98934117-29b1-4645-a97b-71f379b61bd9", - "shape": "table", - "position": { - "x": 562, - "y": 487 - }, - "count": 0, - "originKey": "379D48BE-3522-413B-8FA3-752D65ADB597" - }, - { - "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", - "shape": "table", - "position": { - "x": 560, - "y": 140 - }, - "count": 0, - "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" - }, - { - "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431", + "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", "shape": "table", "position": { - "x": 560, - "y": -167 + "x": 30, + "y": 80 }, "count": 0, - "originKey": "CD64DEB3-500E-48AF-896E-123922A03290" + "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" }, { "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0", @@ -9916,64 +10095,54 @@ "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" }, { - "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", - "shape": "table", - "position": { - "x": 30, - "y": -302 - }, - "count": 0, - "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" - }, - { - "id": "33dd1974-86a6-4344-9c56-ed081a79fa7f", + "id": "98934117-29b1-4645-a97b-71f379b61bd9", "shape": "table", "position": { - "x": -560, - "y": -190 + "x": 562, + "y": 487 }, "count": 0, - "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" + "originKey": "379D48BE-3522-413B-8FA3-752D65ADB597" }, { - "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c", + "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5", "shape": "table", "position": { - "x": 30, - "y": 71 + "x": 560, + "y": 140 }, "count": 0, - "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A" + "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E" }, { - "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", + "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431", "shape": "table", "position": { - "x": -1054, - "y": -190 + "x": 560, + "y": -167 }, "count": 0, - "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" + "originKey": "CD64DEB3-500E-48AF-896E-123922A03290" }, { - "id": "fa539400-f09d-485c-af47-7055dd7beeaa", + "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", "shape": "table", "position": { - "x": -560, - "y": 527 + "x": 40, + "y": -1000 }, "count": 0, - "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" + "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" }, { - "id": "498192bd-da69-4179-96e2-1df15809b981", + "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833", "shape": "table", "position": { - "x": 58, - "y": 1105 + "x": 750, + "y": -923 }, "count": 0, - "originKey": "D20E0B29-FACC-4319-8493-0ADCB3D479F4" + "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B" } ] }, diff --git a/doc/步步为盈数据库.pdma.json b/doc/步步为盈数据库.pdma.json index 9f838a51..962d37e8 100644 --- a/doc/步步为盈数据库.pdma.json +++ b/doc/步步为盈数据库.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.1.3", "createdTime": "2022-10-3 12:39:39", - "updatedTime": "2023-2-21 04:10:19", + "updatedTime": "2023-2-21 13:20:27", "dbConns": [], "profile": { "default": { @@ -340,7 +340,7 @@ "generatorDoc": { "docTemplate": "" }, - "relationFieldSize": 30, + "relationFieldSize": 100, "uiHint": [ { "defKey": "Input", @@ -608,7 +608,7 @@ }, { "defKey": "ReturnDirection", - "defName": "退货去向", + "defName": "退货去向(退货仓=0,采购商=1,原返=2,无退货=3)", "comment": "", "type": "", "len": "", @@ -624,12 +624,11 @@ "id": "9265E466-833C-469B-B421-7680B69CB86F" }, { - "defKey": "ProductResult", - "defName": "商品处理方式", + "defKey": "ProductHealth", + "defName": "商品健康状态 (残次品=0 良品=1)", "comment": "", - "domain": "", - "type": "INT", - "len": 11, + "type": "", + "len": "", "scale": "", "primaryKey": false, "notNull": false, @@ -637,13 +636,65 @@ "defaultValue": "", "hideInGraph": false, "refDict": "", - "id": "EA02D3B6-F0E3-4C49-AA93-3897B0F7F2C7", - "extProps": {} + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "583278B5-2792-427E-8F74-E4ACC716EC96" }, { - "defKey": "ProductHealth", - "defName": "商品情况", + "defKey": "ProductFunction", + "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": "9C1278FC-219C-4F91-A35A-54C947CD6DA1" + }, + { + "defKey": "ProductAppearance", + "defName": "产品外观 (严重损=0 轻微损=1 新=2)", "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "A4E69875-9372-4902-95E6-8E827C2FA968" + }, + { + "defKey": "ProductPackage", + "defName": "产品包装(无=0 非新=1 新=2)", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "268869F2-BAC8-4CC5-AE28-1FCE08821F05" + }, + { + "defKey": "ProductHealth2", + "defName": "商品情况(定义待变更)", + "comment": "名称待定，以前的商品情况，叶总需要更换定义", "domain": "", "type": "INT", "len": 11, @@ -652,7 +703,7 @@ "notNull": false, "autoIncrement": false, "defaultValue": "", - "hideInGraph": false, + "hideInGraph": true, "refDict": "", "id": "84E2BC8B-BAEF-463B-AB9A-23771BAB1E7B", "extProps": {} @@ -1047,6 +1098,23 @@ "refDict": "", "id": "1DEEC868-894F-41A0-815C-4EBBC88F2F4C", "extProps": {} + }, + { + "defKey": "ProductResult", + "defName": "商品处理方式", + "comment": "弃用", + "domain": "", + "type": "INT", + "len": 11, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "id": "EA02D3B6-F0E3-4C49-AA93-3897B0F7F2C7", + "extProps": {} } ], "indexes": [], @@ -8755,6 +8823,267 @@ ], "correlations": [], "indexes": [] + }, + { + "id": "94B4B4F3-C3BE-4864-B348-569B98883A7B", + "env": { + "base": { + "nameSpace": "", + "codeRoot": "" + } + }, + "defKey": "ExpressOrder", + "defName": "快递单表", + "comment": "", + "properties": { + "partitioned by": "(date string)", + "row format delimited": "", + "fields terminated by ','": "", + "collection items terminated by '-'": "", + "map keys terminated by ':'": "", + "store as textfile;": "" + }, + "nameTemplate": "{defKey}[{defName}]", + "headers": [ + { + "refKey": "hideInGraph", + "hideInGraph": true + }, + { + "refKey": "defKey", + "hideInGraph": false + }, + { + "refKey": "defName", + "hideInGraph": false + }, + { + "refKey": "primaryKey", + "hideInGraph": false + }, + { + "refKey": "notNull", + "hideInGraph": true + }, + { + "refKey": "autoIncrement", + "hideInGraph": true + }, + { + "refKey": "domain", + "hideInGraph": true + }, + { + "refKey": "type", + "hideInGraph": false + }, + { + "refKey": "len", + "hideInGraph": false + }, + { + "refKey": "scale", + "hideInGraph": false + }, + { + "refKey": "comment", + "hideInGraph": true + }, + { + "refKey": "refDict", + "hideInGraph": true + }, + { + "refKey": "defaultValue", + "hideInGraph": true + }, + { + "refKey": "isStandard", + "hideInGraph": false + }, + { + "refKey": "uiHint", + "hideInGraph": true + }, + { + "refKey": "extProps", + "hideInGraph": true + } + ], + "fields": [ + { + "defKey": "Id", + "defName": "", + "comment": "", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "086E73E3-16A5-4DB2-B7F3-1D6B46500A35" + }, + { + "defKey": "WayBillNo", + "defName": "快递单号", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "C57EFD3C-B87A-4172-A917-B9F0B37BFB42" + }, + { + "defKey": "ExpressName", + "defName": "快递公司名称", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "1C4B4271-9640-4A78-A0DA-E13584257C9E" + }, + { + "defKey": "TransportDetails", + "defName": "运输详情", + "comment": "", + "type": "VARCHAR", + "len": 1000, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "424E3E7E-798E-4219-A41C-E17C09EDF8C1" + }, + { + "defKey": "ServiceId", + "defName": "服务单Id", + "comment": "可空", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "B20CC0B7-A0CF-4B6F-A104-C90AA0EF8C0A" + }, + { + "defKey": "PurchaseOrderId", + "defName": "采购单Id", + "comment": "可空", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "D9669169-6530-4BD3-9409-E2D6722965B6" + }, + { + "defKey": "OrderId", + "defName": "订单Id", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "3613C402-199D-4642-A8A6-A6A470013475" + }, + { + "defKey": "PackageType", + "defName": "包裹类型(采购包裹=0 退货包裹=1)", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "ED963E0A-8F45-4C2B-A2E2-6926E5F2C966" + }, + { + "defKey": "CreateTime", + "defName": "", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "id": "3429613A-A50F-45B6-AD8E-6D036FD62C76" + }, + { + "defKey": "UpdateTime", + "defName": "", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "id": "8624878C-B971-4FF8-9034-C622E64F87DC" + } + ], + "correlations": [], + "indexes": [] } ], "views": [], @@ -9359,16 +9688,6 @@ "relationType": "field", "canvasData": { "cells": [ - { - "id": "ddf927a6-e081-4c05-937d-bc64f59fc32a", - "shape": "table", - "position": { - "x": 1220, - "y": -523 - }, - "count": 0, - "originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E" - }, { "id": "3de2bd13-2384-4816-85e5-dcf4240a6cb7", "shape": "table", @@ -9379,26 +9698,6 @@ "count": 0, "originKey": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1" }, - { - "id": "da49dd57-b256-4f89-9653-8f35edef5a02", - "shape": "table", - "position": { - "x": 1220, - "y": -805 - }, - "count": 0, - "originKey": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9" - }, - { - "id": "e417b0e0-85e2-4073-977c-60fe6a7479ae", - "shape": "table", - "position": { - "x": 1220, - "y": -1057 - }, - "count": 0, - "originKey": "6036D7E4-7ECB-4888-9D74-58DA414447F8" - }, { "id": "c59993ba-6d74-4c9d-9340-a2a882ca2cea", "shape": "table", @@ -9469,6 +9768,56 @@ "count": 0, "originKey": "91555D00-CE97-4666-94BA-E83996533E52" }, + { + "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": "33dd1974-86a6-4344-9c56-ed081a79fa7f", + "shape": "table", + "position": { + "x": -560, + "y": -190 + }, + "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": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d", + "shape": "table", + "position": { + "x": -810, + "y": -1222 + }, + "count": 0, + "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022" + }, { "id": "524fda6a-d71b-4754-b673-ffc91fd753fc", "shape": "erdRelation", @@ -9930,44 +10279,44 @@ "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95" }, { - "id": "fa539400-f09d-485c-af47-7055dd7beeaa", + "id": "e417b0e0-85e2-4073-977c-60fe6a7479ae", "shape": "table", "position": { - "x": -560, - "y": 527 + "x": 1420, + "y": -1040 }, "count": 0, - "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9" + "originKey": "6036D7E4-7ECB-4888-9D74-58DA414447F8" }, { - "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2", + "id": "da49dd57-b256-4f89-9653-8f35edef5a02", "shape": "table", "position": { - "x": -461, - "y": 180 + "x": 1420, + "y": -793.5 }, "count": 0, - "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74" + "originKey": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9" }, { - "id": "33dd1974-86a6-4344-9c56-ed081a79fa7f", + "id": "ddf927a6-e081-4c05-937d-bc64f59fc32a", "shape": "table", "position": { - "x": -560, - "y": -190 + "x": 1390, + "y": -520 }, "count": 0, - "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A" + "originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E" }, { - "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c", + "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", "shape": "table", "position": { - "x": -1054, - "y": -190 + "x": -3270, + "y": -1440.5 }, "count": 0, - "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE" + "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" }, { "id": "b9769f40-c4a3-4bc8-9301-e74876370eed", @@ -9980,24 +10329,14 @@ "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD" }, { - "id": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d", + "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833", "shape": "table", "position": { - "x": -810, - "y": -1222 + "x": -2570, + "y": -1440.5 }, "count": 0, - "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022" - }, - { - "id": "6eba7e01-588a-4631-a8a3-9eb43b950339", - "shape": "table", - "position": { - "x": -50, - "y": -980 - }, - "count": 0, - "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3" + "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B" } ] },