diff --git a/BBWYB.Client/BBWYB.Client.csproj b/BBWYB.Client/BBWYB.Client.csproj index 1cbe17b..88c521c 100644 --- a/BBWYB.Client/BBWYB.Client.csproj +++ b/BBWYB.Client/BBWYB.Client.csproj @@ -33,6 +33,7 @@ + diff --git a/BBWYB.Client/ViewModels/MainViewModel.cs b/BBWYB.Client/ViewModels/MainViewModel.cs index d0b23d5..bc720e4 100644 --- a/BBWYB.Client/ViewModels/MainViewModel.cs +++ b/BBWYB.Client/ViewModels/MainViewModel.cs @@ -102,6 +102,15 @@ namespace BBWYB.Client.ViewModels } }); MenuList.Add(new MenuModel() + { + Name = "Web版", + ChildList = new List() + { + new MenuModel(){ Name="订单列表Bata",Url="/Views/WebB/WebB.xaml" }, + //new MenuModel(){ Name="团队配置",Url="/Views/Setting/TeamSetting.xaml" } + } + }); + MenuList.Add(new MenuModel() { Name = "设置", ChildList = new List() diff --git a/BBWYB.Client/Views/MainWindow.xaml.cs b/BBWYB.Client/Views/MainWindow.xaml.cs index 19591ee..22934b6 100644 --- a/BBWYB.Client/Views/MainWindow.xaml.cs +++ b/BBWYB.Client/Views/MainWindow.xaml.cs @@ -1,6 +1,8 @@ using CommunityToolkit.Mvvm.Messaging; +using Microsoft.Web.WebView2.Core; using SJ.Controls; using System; +using System.Threading; using System.Windows; namespace BBWYB.Client.Views @@ -20,7 +22,28 @@ namespace BBWYB.Client.Views private void MainWindow_Loaded(object sender, RoutedEventArgs e) { - + if (!CheckWebview2Runtime()) + { + MessageBox.Show("缺少webview2 runtime,请下载安装之后重新运行bbwyb"); + //下载webview2 runtime + //Task.Factory.StartNew(DownloadWebview2Runtime); + var webview2RuntimeUrl = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/238fc310-c6c1-4a3e-a806-4a7c3c17b377/MicrosoftEdgeWebView2RuntimeInstallerX64.exe"; + try + { + System.Diagnostics.Process.Start("explorer.exe", webview2RuntimeUrl); + Thread.Sleep(1000); + } + catch (Exception ex) + { + Clipboard.SetText(webview2RuntimeUrl); + MessageBox.Show($"{ex.Message}\r\n调用浏览器失败,网页链接已复制到剪切板,请手动打开浏览器访问", "提示"); + } + finally + { + Environment.Exit(Environment.ExitCode); + } + } + } private void frame_Navigated(object sender, System.Windows.Navigation.NavigationEventArgs e) @@ -28,5 +51,19 @@ namespace BBWYB.Client.Views if (frame.CanGoBack) frame.RemoveBackEntry(); } + + private bool CheckWebview2Runtime() + { + bool isInstall = false; + try + { + isInstall = !string.IsNullOrEmpty(CoreWebView2Environment.GetAvailableBrowserVersionString()); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + } + return isInstall; + } } } diff --git a/BBWYB.Client/Views/WebB/WebB.xaml b/BBWYB.Client/Views/WebB/WebB.xaml new file mode 100644 index 0000000..d5f413b --- /dev/null +++ b/BBWYB.Client/Views/WebB/WebB.xaml @@ -0,0 +1,14 @@ + + + + + + diff --git a/BBWYB.Client/Views/WebB/WebB.xaml.cs b/BBWYB.Client/Views/WebB/WebB.xaml.cs new file mode 100644 index 0000000..09cf5c8 --- /dev/null +++ b/BBWYB.Client/Views/WebB/WebB.xaml.cs @@ -0,0 +1,18 @@ +using System.Windows.Controls; + +namespace BBWYB.Client.Views.WebB +{ + /// + /// WebB.xaml 的交互逻辑 + /// + public partial class WebB : Page + { + private WebView2Manager w2m; + private bool isNavigated; + + public WebB() + { + InitializeComponent(); + } + } +} diff --git a/BBWYB.Client/WebView2Manager.cs b/BBWYB.Client/WebView2Manager.cs new file mode 100644 index 0000000..c978669 --- /dev/null +++ b/BBWYB.Client/WebView2Manager.cs @@ -0,0 +1,69 @@ +using BBWYB.Common.Models; +using Microsoft.Web.WebView2.Core; +using Microsoft.Web.WebView2.Wpf; +using System; +using io = System.IO; + +namespace BBWYB.Client +{ + public class WebView2Manager : IDenpendency + { + public WebView2 wb2 { get; private set; } + //public WebView2Manager() + //{ + // Init(); + //} + public void Init() + { + if (wb2 == null) + { + wb2 = new WebView2(); + var wb2Setting = CoreWebView2Environment.CreateAsync(userDataFolder: io.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "WebView2UserData")).Result; + wb2.EnsureCoreWebView2Async(wb2Setting); + wb2.CoreWebView2InitializationCompleted += Wb2_CoreWebView2InitializationCompleted; + wb2.NavigationCompleted += Wb2_NavigationCompleted; + wb2.WebMessageReceived += Wb2_WebMessageReceived; + } + } + + public Action OnWebMessageReceived; + public Action OnNavigationCompleted; + public Action CoreWebView2InitializationCompleted; + public bool IsInitializationCompleted { get ; private set; } + + private void Wb2_WebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs e) + { + OnWebMessageReceived?.Invoke(e); + } + + private void Wb2_NavigationCompleted(object sender, CoreWebView2NavigationCompletedEventArgs e) + { + OnNavigationCompleted?.Invoke(e); + } + + private void Wb2_CoreWebView2InitializationCompleted(object sender, CoreWebView2InitializationCompletedEventArgs e) + { + CoreWebView2InitializationCompleted?.Invoke(e); + IsInitializationCompleted = true; + } + + public void Close() + { + if (wb2 != null && wb2.CoreWebView2 != null) + { + IsInitializationCompleted = false; + wb2.CoreWebView2InitializationCompleted -= Wb2_CoreWebView2InitializationCompleted; + wb2.NavigationCompleted -= Wb2_NavigationCompleted; + wb2.WebMessageReceived -= Wb2_WebMessageReceived; + var udf = wb2.CoreWebView2.Environment.UserDataFolder; + wb2.Dispose(); + wb2 = null; + try + { + io.Directory.Delete(udf, true); + } + catch { } + } + } + } +} diff --git a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs index 6dda589..57d9af9 100644 --- a/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs +++ b/BBWYB.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs @@ -177,6 +177,7 @@ namespace BBWYB.Server.Business List insertOrderPurchaseInfos = new List(); List insertOrderPurchaseSkuInfos = new List(); List updatePurchaseTimeSchemeIdList = new List(); + List insertOrderPurchaseRelationInfoList = new List(); IInsert insertOrderCost = null; IUpdate updateOrderCost = null; var totalPurchaseAmount = 0M; @@ -225,6 +226,23 @@ namespace BBWYB.Server.Business OrderId = createOrderResponse.OrderId }); + foreach (var cargoParam in cargoParamGroup.CargoParamList) + { + insertOrderPurchaseRelationInfoList.Add(new OrderPurchaseRelationInfo() + { + Id = idGenerator.NewLong(), + BelongSkuId = cargoParam.BelongSkuId, + CreateTime = DateTime.Now, + OrderId = request.OrderId, + PurchaseOrderId = purchaseOrderSimpleInfo.OrderId, + PurchaseProductId = cargoParam.ProductId, + PurchaseSkuId = cargoParam.SkuId, + PurchaseSpecId = cargoParam.SpecId, + Quantity = cargoParam.Quantity, + SchemeId = cargoParam.SchemeId + }); + } + totalPurchaseAmount += purchaseOrderSimpleInfo.TotalAmount; var belongSkuGroups = cargoParamGroup.CargoParamList.GroupBy(p => p.BelongSkuId); @@ -337,6 +355,7 @@ namespace BBWYB.Server.Business fsql.Insert(insertOrderCostDetails).ExecuteAffrows(); fsql.Insert(insertOrderPurchaseInfos).ExecuteAffrows(); fsql.Insert(insertOrderPurchaseSkuInfos).ExecuteAffrows(); + fsql.Insert(insertOrderPurchaseRelationInfoList).ExecuteAffrows(); updateOrderCost?.ExecuteAffrows(); insertOrderCost?.ExecuteAffrows(); if (updatePurchaseTimeSchemeIdList.Count() > 0) @@ -655,7 +674,7 @@ namespace BBWYB.Server.Business }); totalPurchaseAmount += purchaseOrderSimpleInfo.TotalAmount; } - + //var oldTotalAmount = dbOrderCost.PurchaseAmount; //var oldProductAmount = dbOrderCostDetailList.Sum(ocd => ocd.SkuAmount); diff --git a/BBWYB.Server.Model/Db/Order/OrderPurchaseRelationinfo.cs b/BBWYB.Server.Model/Db/Order/OrderPurchaseRelationinfo.cs new file mode 100644 index 0000000..c541335 --- /dev/null +++ b/BBWYB.Server.Model/Db/Order/OrderPurchaseRelationinfo.cs @@ -0,0 +1,69 @@ +using FreeSql.DataAnnotations; + +namespace BBWYB.Server.Model.Db +{ + + /// + /// 采购订单关系表 + /// + [Table(Name = "orderpurchaserelationinfo", DisableSyncStructure = true)] + public partial class OrderPurchaseRelationInfo { + + /// + /// 主键 + /// + [Column(IsPrimary = true)] + public long Id { get; set; } + + /// + /// 归属SkuId(拳探) + /// + [Column(StringLength = 100)] + public string BelongSkuId { get; set; } + + [Column(DbType = "datetime")] + public DateTime? CreateTime { get; set; } + + /// + /// 订单Id + /// + [Column(StringLength = 100)] + public string OrderId { get; set; } + + /// + /// 采购单Id + /// + [Column(StringLength = 100)] + public string PurchaseOrderId { get; set; } + + /// + /// 采购Spu + /// + [Column(StringLength = 100)] + public string PurchaseProductId { get; set; } + + /// + /// 采购Sku + /// + [Column(StringLength = 100)] + public string PurchaseSkuId { get; set; } + + /// + /// 采购Spec(1688) + /// + [Column(StringLength = 100)] + public string PurchaseSpecId { get; set; } + + /// + /// 采购数量 + /// + public int? Quantity { get; set; } + + /// + /// 采购方案Id + /// + public long? SchemeId { get; set; } + + } + +} diff --git a/doc/.back_bbwyB端库/bbwyB端库-backup-2023514100221.pdma.json b/doc/.back_bbwyB端库/bbwyB端库-backup-2023517184355.pdma.json similarity index 96% rename from doc/.back_bbwyB端库/bbwyB端库-backup-2023514100221.pdma.json rename to doc/.back_bbwyB端库/bbwyB端库-backup-2023517184355.pdma.json index 2bac757..3b3b0fc 100644 --- a/doc/.back_bbwyB端库/bbwyB端库-backup-2023514100221.pdma.json +++ b/doc/.back_bbwyB端库/bbwyB端库-backup-2023517184355.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2023-5-12 20:56:05", - "updatedTime": "2023-5-14 09:51:29", + "updatedTime": "2023-5-17 18:43:53", "dbConns": [], "profile": { "default": { @@ -3678,6 +3678,23 @@ "attr9": "", "id": "1A165F66-FE0D-4A2E-AF71-EE7F6EBDDCFA", "extProps": {} + }, + { + "defKey": "BelongSkuId", + "defName": "来源Sku", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "1A0C9CCD-B348-4916-83C2-D02754D94E1D" } ], "indexes": [ @@ -3831,7 +3848,8 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [], + "notes": {} }, { "id": "474E5807-5650-43BD-8C5C-E16F36D58F85", @@ -5113,7 +5131,7 @@ "fields": [ { "defKey": "Id", - "defName": "", + "defName": "采购Sku订单Id(来自采购平台)", "comment": "", "type": "bigint", "len": "", @@ -5248,9 +5266,238 @@ "id": "329B45D7-BCE9-4895-B52D-C953E95DB4B2" }, { - "defKey": "PurchaseSkuOrderId", - "defName": "采购Sku订单Id", - "comment": "1688 OrderEntryId", + "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": "FB279AC5-DB2B-498B-9DC9-5EE05BCED570" + } + ], + "correlations": [], + "indexes": [] + }, + { + "id": "1ED24FEC-604E-4B36-9E51-17D572021F0C", + "env": { + "base": { + "nameSpace": "", + "codeRoot": "" + } + }, + "defKey": "orderPurchaseRelationInfo", + "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}]", + "notes": {}, + "headers": [ + { + "refKey": "hideInGraph", + "hideInGraph": true + }, + { + "refKey": "defKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "defName", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "primaryKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "notNull", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "autoIncrement", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "domain", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "type", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "len", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "scale", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "comment", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "refDict", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "defaultValue", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "isStandard", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "uiHint", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "extProps", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr1", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr2", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr3", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr4", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr5", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr6", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr7", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr8", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr9", + "freeze": false, + "hideInGraph": true + } + ], + "fields": [ + { + "defKey": "Id", + "defName": "主键", + "comment": "", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "notes": {}, + "attr1": "", + "attr2": "", + "attr3": "", + "attr4": "", + "attr5": "", + "attr6": "", + "attr7": "", + "attr8": "", + "attr9": "", + "id": "7B939B66-4149-4D8C-BCD3-E99B425C3327" + }, + { + "defKey": "OrderId", + "defName": "订单Id", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "19E4CACC-5E58-4016-9654-FBDA15B17BE7" + }, + { + "defKey": "PurchaseOrderId", + "defName": "采购单Id", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "55EB7910-E4F0-49A6-8A53-EB0167E5ED34" + }, + { + "defKey": "PurchaseProductId", + "defName": "采购Spu", + "comment": "", "type": "VARCHAR", "len": 100, "scale": "", @@ -5262,7 +5509,92 @@ "refDict": "", "extProps": {}, "domain": "", - "id": "0910A21A-CFB1-4401-A2DA-47332E67EA6B" + "id": "3B0E5CF8-DBCF-447F-B49C-2096C0B2D402" + }, + { + "defKey": "PurchaseSkuId", + "defName": "采购Sku", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "8024FAE2-F559-40AF-A1D6-D1725CF9E267" + }, + { + "defKey": "PurchaseSpecId", + "defName": "采购Spec(1688)", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "29B35FE1-220E-46A2-8636-BA833A60B4A0" + }, + { + "defKey": "BelongSkuId", + "defName": "归属SkuId(拳探)", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "5780904B-4B79-4357-A9CB-331DD828C920" + }, + { + "defKey": "Quantity", + "defName": "采购数量", + "comment": "", + "type": "INT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "4471FF5A-423F-453C-A31B-7F2B36433FE1" + }, + { + "defKey": "SchemeId", + "defName": "采购方案Id", + "comment": "", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "C4728627-12F6-4B95-8931-E32E8913C578" }, { "defKey": "CreateTime", @@ -5279,7 +5611,24 @@ "refDict": "", "extProps": {}, "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "id": "FB279AC5-DB2B-498B-9DC9-5EE05BCED570" + "id": "C76F8758-9EEC-4108-9F30-ECE489720FC8" + }, + { + "defKey": "PruchaseOrderEntryId", + "defName": "采购Sku订单Id(来自采购平台)", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "8B25DD45-6396-4F51-969D-EE6FA1CA8719" } ], "correlations": [], @@ -5535,6 +5884,46 @@ "relationType": "field", "canvasData": { "cells": [ + { + "id": "bae79cdf-e627-427b-aa66-728f637effcb", + "shape": "table", + "position": { + "x": -260, + "y": -290 + }, + "count": 0, + "originKey": "AF1D8C00-44CE-478C-BBE6-013CF93AF22D" + }, + { + "id": "34567615-fdb5-4d1d-b6ee-a8b61faa04b8", + "shape": "table", + "position": { + "x": 1690, + "y": -73.5 + }, + "count": 0, + "originKey": "474E5807-5650-43BD-8C5C-E16F36D58F85" + }, + { + "id": "33443e42-a883-42ec-acc0-46cc1446218d", + "shape": "table", + "position": { + "x": 1690, + "y": 614 + }, + "count": 0, + "originKey": "1E65E858-7177-4B30-9B39-32A6D1CB104C" + }, + { + "id": "129cac0b-4f1e-4d05-972f-73b2c710b6e0", + "shape": "table", + "position": { + "x": 1690, + "y": 388 + }, + "count": 0, + "originKey": "4CDAE2F8-5F79-4A75-8F5A-27226FDD1ACE" + }, { "id": "c9cd6035-3abe-4d8f-8830-bc876fe240af", "shape": "erdRelation", @@ -5558,9 +5947,6 @@ } ], "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5580,9 +5966,6 @@ }, "relation": "1:n", "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5608,9 +5991,6 @@ } ], "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5630,9 +6010,6 @@ }, "relation": "1:n", "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5658,45 +6035,12 @@ } ], "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" } } }, - { - "id": "bae79cdf-e627-427b-aa66-728f637effcb", - "shape": "table", - "position": { - "x": -260, - "y": -290 - }, - "count": 0, - "originKey": "AF1D8C00-44CE-478C-BBE6-013CF93AF22D" - }, - { - "id": "9afa8d28-f5b8-4c34-8df4-b386c4dd32b9", - "shape": "table", - "position": { - "x": -250, - "y": 380 - }, - "count": 0, - "originKey": "93074B87-BE55-41BF-8358-B0E84C4E249A" - }, - { - "id": "53bec785-6ee3-497e-bfa6-0318b99147db", - "shape": "table", - "position": { - "x": -260, - "y": 64.5 - }, - "count": 0, - "originKey": "C52E23C2-6CC5-4404-92A5-7CCE77E8AB1E" - }, { "id": "7771087b-7bda-4ec6-a831-c50dc06395e9", "shape": "erdRelation", @@ -5710,9 +6054,6 @@ }, "relation": "1:n", "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5720,44 +6061,54 @@ } }, { - "id": "34567615-fdb5-4d1d-b6ee-a8b61faa04b8", + "id": "6593da18-d55c-47e3-bb4c-cf75fc56702a", "shape": "table", "position": { "x": 1690, - "y": -73.5 + "y": 83 }, "count": 0, - "originKey": "474E5807-5650-43BD-8C5C-E16F36D58F85" + "originKey": "03EA3614-C1F5-4909-96A0-0687EDEABD4B" }, { - "id": "33443e42-a883-42ec-acc0-46cc1446218d", + "id": "53bec785-6ee3-497e-bfa6-0318b99147db", "shape": "table", "position": { - "x": 1690, - "y": 614 + "x": -260, + "y": 64.5 }, "count": 0, - "originKey": "1E65E858-7177-4B30-9B39-32A6D1CB104C" + "originKey": "C52E23C2-6CC5-4404-92A5-7CCE77E8AB1E" }, { - "id": "129cac0b-4f1e-4d05-972f-73b2c710b6e0", + "id": "9afa8d28-f5b8-4c34-8df4-b386c4dd32b9", "shape": "table", "position": { - "x": 1690, - "y": 388 + "x": -250, + "y": 380 }, "count": 0, - "originKey": "4CDAE2F8-5F79-4A75-8F5A-27226FDD1ACE" + "originKey": "93074B87-BE55-41BF-8358-B0E84C4E249A" }, { - "id": "6593da18-d55c-47e3-bb4c-cf75fc56702a", + "id": "2c258cf1-71de-432b-835a-7fe52c849443", "shape": "table", "position": { - "x": 1690, - "y": 83 + "x": 1100, + "y": -90 }, "count": 0, - "originKey": "03EA3614-C1F5-4909-96A0-0687EDEABD4B" + "originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214" + }, + { + "id": "471ac35d-30de-48a3-8743-eec20f919eba", + "shape": "table", + "position": { + "x": 1100, + "y": 614 + }, + "count": 0, + "originKey": "1ED24FEC-604E-4B36-9E51-17D572021F0C" }, { "id": "414ef58f-57e8-4362-971a-85af3ea9a44f", @@ -5784,20 +6135,10 @@ "shape": "table", "position": { "x": 1100, - "y": 349 + "y": 342 }, "count": 0, "originKey": "EE319D46-61D9-47DB-80AD-AD97D460ACB4" - }, - { - "id": "2c258cf1-71de-432b-835a-7fe52c849443", - "shape": "table", - "position": { - "x": 1100, - "y": -90 - }, - "count": 0, - "originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214" } ] }, diff --git a/doc/.back_bbwyB端库/bbwyB端库-backup-2023514095129.pdma.json b/doc/.back_bbwyB端库/bbwyB端库-backup-2023517184403.pdma.json similarity index 96% rename from doc/.back_bbwyB端库/bbwyB端库-backup-2023514095129.pdma.json rename to doc/.back_bbwyB端库/bbwyB端库-backup-2023517184403.pdma.json index da44f44..fbafecb 100644 --- a/doc/.back_bbwyB端库/bbwyB端库-backup-2023514095129.pdma.json +++ b/doc/.back_bbwyB端库/bbwyB端库-backup-2023517184403.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2023-5-12 20:56:05", - "updatedTime": "2023-5-13 01:45:49", + "updatedTime": "2023-5-17 18:43:55", "dbConns": [], "profile": { "default": { @@ -1780,16 +1780,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "144B14DF-B01B-4EF7-9163-24A3124BB808", - "refEntity": "3A48F81A-49D5-423B-8A92-228615DCEA6F", - "refField": "31AF4355-53ED-42E2-AB7F-A8AC17D17DBB", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "C52E23C2-6CC5-4404-92A5-7CCE77E8AB1E", @@ -2143,16 +2134,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "E9728883-C797-4973-82A6-58F0DD7306F7", - "refEntity": "3A48F81A-49D5-423B-8A92-228615DCEA6F", - "refField": "31AF4355-53ED-42E2-AB7F-A8AC17D17DBB", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [] }, { "id": "93074B87-BE55-41BF-8358-B0E84C4E249A", @@ -2838,16 +2820,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "C972C40D-0C81-455D-8598-37DC80F7A538", - "refEntity": "3A48F81A-49D5-423B-8A92-228615DCEA6F", - "refField": "31AF4355-53ED-42E2-AB7F-A8AC17D17DBB", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ], + "correlations": [], "notes": {} }, { @@ -3358,16 +3331,7 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "DD093BC7-0374-421D-A4B5-7D471C5444B2", - "refEntity": "3A48F81A-49D5-423B-8A92-228615DCEA6F", - "refField": "31AF4355-53ED-42E2-AB7F-A8AC17D17DBB", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ], + "correlations": [], "notes": {} }, { @@ -3714,6 +3678,23 @@ "attr9": "", "id": "1A165F66-FE0D-4A2E-AF71-EE7F6EBDDCFA", "extProps": {} + }, + { + "defKey": "BelongSkuId", + "defName": "来源Sku", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "1A0C9CCD-B348-4916-83C2-D02754D94E1D" } ], "indexes": [ @@ -3867,16 +3848,8 @@ "hideInGraph": true } ], - "correlations": [ - { - "myField": "2CE3E553-81E6-40B3-A711-98A8EBF41716", - "refEntity": "3A48F81A-49D5-423B-8A92-228615DCEA6F", - "refField": "31AF4355-53ED-42E2-AB7F-A8AC17D17DBB", - "myRows": "1", - "refRows": "n", - "innerType": "" - } - ] + "correlations": [], + "notes": {} }, { "id": "474E5807-5650-43BD-8C5C-E16F36D58F85", @@ -5158,13 +5131,13 @@ "fields": [ { "defKey": "Id", - "defName": "", + "defName": "采购Sku订单Id(来自采购平台)", "comment": "", "type": "bigint", "len": "", "scale": "", - "primaryKey": false, - "notNull": false, + "primaryKey": true, + "notNull": true, "autoIncrement": false, "defaultValue": "", "hideInGraph": false, @@ -5293,9 +5266,204 @@ "id": "329B45D7-BCE9-4895-B52D-C953E95DB4B2" }, { - "defKey": "PurchaseSkuOrderId", - "defName": "采购Sku订单Id", - "comment": "1688 OrderEntryId", + "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": "FB279AC5-DB2B-498B-9DC9-5EE05BCED570" + } + ], + "correlations": [], + "indexes": [] + }, + { + "id": "1ED24FEC-604E-4B36-9E51-17D572021F0C", + "env": { + "base": { + "nameSpace": "", + "codeRoot": "" + } + }, + "defKey": "orderPurchaseRelationInfo", + "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}]", + "notes": {}, + "headers": [ + { + "refKey": "hideInGraph", + "hideInGraph": true + }, + { + "refKey": "defKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "defName", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "primaryKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "notNull", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "autoIncrement", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "domain", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "type", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "len", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "scale", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "comment", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "refDict", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "defaultValue", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "isStandard", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "uiHint", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "extProps", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr1", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr2", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr3", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr4", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr5", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr6", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr7", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr8", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr9", + "freeze": false, + "hideInGraph": true + } + ], + "fields": [ + { + "defKey": "Id", + "defName": "主键", + "comment": "", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "notes": {}, + "attr1": "", + "attr2": "", + "attr3": "", + "attr4": "", + "attr5": "", + "attr6": "", + "attr7": "", + "attr8": "", + "attr9": "", + "id": "7B939B66-4149-4D8C-BCD3-E99B425C3327" + }, + { + "defKey": "OrderId", + "defName": "订单Id", + "comment": "", "type": "VARCHAR", "len": 100, "scale": "", @@ -5307,7 +5475,126 @@ "refDict": "", "extProps": {}, "domain": "", - "id": "0910A21A-CFB1-4401-A2DA-47332E67EA6B" + "id": "19E4CACC-5E58-4016-9654-FBDA15B17BE7" + }, + { + "defKey": "PurchaseOrderId", + "defName": "采购单Id", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "55EB7910-E4F0-49A6-8A53-EB0167E5ED34" + }, + { + "defKey": "PurchaseProductId", + "defName": "采购Spu", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "3B0E5CF8-DBCF-447F-B49C-2096C0B2D402" + }, + { + "defKey": "PurchaseSkuId", + "defName": "采购Sku", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "8024FAE2-F559-40AF-A1D6-D1725CF9E267" + }, + { + "defKey": "PurchaseSpecId", + "defName": "采购Spec(1688)", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "29B35FE1-220E-46A2-8636-BA833A60B4A0" + }, + { + "defKey": "BelongSkuId", + "defName": "归属SkuId(拳探)", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "5780904B-4B79-4357-A9CB-331DD828C920" + }, + { + "defKey": "Quantity", + "defName": "采购数量", + "comment": "", + "type": "INT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "4471FF5A-423F-453C-A31B-7F2B36433FE1" + }, + { + "defKey": "SchemeId", + "defName": "采购方案Id", + "comment": "", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "C4728627-12F6-4B95-8931-E32E8913C578" }, { "defKey": "CreateTime", @@ -5324,19 +5611,27 @@ "refDict": "", "extProps": {}, "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "id": "FB279AC5-DB2B-498B-9DC9-5EE05BCED570" - } - ], - "correlations": [ - { - "myField": "1AC7EBFF-8FCC-40C9-A17B-2BACE1030CAB", - "refEntity": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214", - "refField": "36136AA8-299D-4616-8F98-7172BFB06DDB", - "myRows": "1", - "refRows": "n", - "innerType": "" + "id": "C76F8758-9EEC-4108-9F30-ECE489720FC8" + }, + { + "defKey": "PruchaseOrderEntryId", + "defName": "采购Sku订单Id(来自采购平台)", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "8B25DD45-6396-4F51-969D-EE6FA1CA8719" } ], + "correlations": [], "indexes": [] } ], @@ -5589,6 +5884,46 @@ "relationType": "field", "canvasData": { "cells": [ + { + "id": "bae79cdf-e627-427b-aa66-728f637effcb", + "shape": "table", + "position": { + "x": -260, + "y": -290 + }, + "count": 0, + "originKey": "AF1D8C00-44CE-478C-BBE6-013CF93AF22D" + }, + { + "id": "34567615-fdb5-4d1d-b6ee-a8b61faa04b8", + "shape": "table", + "position": { + "x": 1690, + "y": -73.5 + }, + "count": 0, + "originKey": "474E5807-5650-43BD-8C5C-E16F36D58F85" + }, + { + "id": "33443e42-a883-42ec-acc0-46cc1446218d", + "shape": "table", + "position": { + "x": 1690, + "y": 614 + }, + "count": 0, + "originKey": "1E65E858-7177-4B30-9B39-32A6D1CB104C" + }, + { + "id": "129cac0b-4f1e-4d05-972f-73b2c710b6e0", + "shape": "table", + "position": { + "x": 1690, + "y": 388 + }, + "count": 0, + "originKey": "4CDAE2F8-5F79-4A75-8F5A-27226FDD1ACE" + }, { "id": "c9cd6035-3abe-4d8f-8830-bc876fe240af", "shape": "erdRelation", @@ -5612,9 +5947,6 @@ } ], "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5634,9 +5966,6 @@ }, "relation": "1:n", "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5662,9 +5991,6 @@ } ], "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5684,9 +6010,6 @@ }, "relation": "1:n", "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5712,45 +6035,12 @@ } ], "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" } } }, - { - "id": "bae79cdf-e627-427b-aa66-728f637effcb", - "shape": "table", - "position": { - "x": -260, - "y": -290 - }, - "count": 0, - "originKey": "AF1D8C00-44CE-478C-BBE6-013CF93AF22D" - }, - { - "id": "9afa8d28-f5b8-4c34-8df4-b386c4dd32b9", - "shape": "table", - "position": { - "x": -250, - "y": 380 - }, - "count": 0, - "originKey": "93074B87-BE55-41BF-8358-B0E84C4E249A" - }, - { - "id": "53bec785-6ee3-497e-bfa6-0318b99147db", - "shape": "table", - "position": { - "x": -260, - "y": 64.5 - }, - "count": 0, - "originKey": "C52E23C2-6CC5-4404-92A5-7CCE77E8AB1E" - }, { "id": "7771087b-7bda-4ec6-a831-c50dc06395e9", "shape": "erdRelation", @@ -5764,9 +6054,6 @@ }, "relation": "1:n", "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5774,44 +6061,54 @@ } }, { - "id": "34567615-fdb5-4d1d-b6ee-a8b61faa04b8", + "id": "6593da18-d55c-47e3-bb4c-cf75fc56702a", "shape": "table", "position": { "x": 1690, - "y": -73.5 + "y": 83 }, "count": 0, - "originKey": "474E5807-5650-43BD-8C5C-E16F36D58F85" + "originKey": "03EA3614-C1F5-4909-96A0-0687EDEABD4B" }, { - "id": "33443e42-a883-42ec-acc0-46cc1446218d", + "id": "53bec785-6ee3-497e-bfa6-0318b99147db", "shape": "table", "position": { - "x": 1690, - "y": 614 + "x": -260, + "y": 64.5 }, "count": 0, - "originKey": "1E65E858-7177-4B30-9B39-32A6D1CB104C" + "originKey": "C52E23C2-6CC5-4404-92A5-7CCE77E8AB1E" }, { - "id": "129cac0b-4f1e-4d05-972f-73b2c710b6e0", + "id": "9afa8d28-f5b8-4c34-8df4-b386c4dd32b9", "shape": "table", "position": { - "x": 1690, - "y": 388 + "x": -250, + "y": 380 }, "count": 0, - "originKey": "4CDAE2F8-5F79-4A75-8F5A-27226FDD1ACE" + "originKey": "93074B87-BE55-41BF-8358-B0E84C4E249A" }, { - "id": "6593da18-d55c-47e3-bb4c-cf75fc56702a", + "id": "2c258cf1-71de-432b-835a-7fe52c849443", "shape": "table", "position": { - "x": 1690, - "y": 83 + "x": 1100, + "y": -90 }, "count": 0, - "originKey": "03EA3614-C1F5-4909-96A0-0687EDEABD4B" + "originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214" + }, + { + "id": "471ac35d-30de-48a3-8743-eec20f919eba", + "shape": "table", + "position": { + "x": 1100, + "y": 614 + }, + "count": 0, + "originKey": "1ED24FEC-604E-4B36-9E51-17D572021F0C" }, { "id": "414ef58f-57e8-4362-971a-85af3ea9a44f", @@ -5838,20 +6135,10 @@ "shape": "table", "position": { "x": 1100, - "y": 349 + "y": 342 }, "count": 0, "originKey": "EE319D46-61D9-47DB-80AD-AD97D460ACB4" - }, - { - "id": "2c258cf1-71de-432b-835a-7fe52c849443", - "shape": "table", - "position": { - "x": 1100, - "y": -90 - }, - "count": 0, - "originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214" } ] }, diff --git a/doc/.back_bbwyB端库/bbwyB端库-backup-2023514100225.pdma.json b/doc/.back_bbwyB端库/bbwyB端库-backup-2023517191218.pdma.json similarity index 96% rename from doc/.back_bbwyB端库/bbwyB端库-backup-2023514100225.pdma.json rename to doc/.back_bbwyB端库/bbwyB端库-backup-2023517191218.pdma.json index a8e32d2..69ba597 100644 --- a/doc/.back_bbwyB端库/bbwyB端库-backup-2023514100225.pdma.json +++ b/doc/.back_bbwyB端库/bbwyB端库-backup-2023517191218.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2023-5-12 20:56:05", - "updatedTime": "2023-5-14 10:02:21", + "updatedTime": "2023-5-17 18:44:03", "dbConns": [], "profile": { "default": { @@ -3678,6 +3678,23 @@ "attr9": "", "id": "1A165F66-FE0D-4A2E-AF71-EE7F6EBDDCFA", "extProps": {} + }, + { + "defKey": "BelongSkuId", + "defName": "来源Sku", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "1A0C9CCD-B348-4916-83C2-D02754D94E1D" } ], "indexes": [ @@ -3831,7 +3848,8 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [], + "notes": {} }, { "id": "474E5807-5650-43BD-8C5C-E16F36D58F85", @@ -5267,6 +5285,354 @@ ], "correlations": [], "indexes": [] + }, + { + "id": "1ED24FEC-604E-4B36-9E51-17D572021F0C", + "env": { + "base": { + "nameSpace": "", + "codeRoot": "" + } + }, + "defKey": "orderPurchaseRelationInfo", + "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}]", + "notes": {}, + "headers": [ + { + "refKey": "hideInGraph", + "hideInGraph": true + }, + { + "refKey": "defKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "defName", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "primaryKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "notNull", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "autoIncrement", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "domain", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "type", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "len", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "scale", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "comment", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "refDict", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "defaultValue", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "isStandard", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "uiHint", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "extProps", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr1", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr2", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr3", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr4", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr5", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr6", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr7", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr8", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr9", + "freeze": false, + "hideInGraph": true + } + ], + "fields": [ + { + "defKey": "Id", + "defName": "主键", + "comment": "", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "notes": {}, + "attr1": "", + "attr2": "", + "attr3": "", + "attr4": "", + "attr5": "", + "attr6": "", + "attr7": "", + "attr8": "", + "attr9": "", + "id": "7B939B66-4149-4D8C-BCD3-E99B425C3327" + }, + { + "defKey": "PruchaseOrderEntryId", + "defName": "采购Sku订单Id(来自采购平台)", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "8B25DD45-6396-4F51-969D-EE6FA1CA8719" + }, + { + "defKey": "OrderId", + "defName": "订单Id", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "19E4CACC-5E58-4016-9654-FBDA15B17BE7" + }, + { + "defKey": "PurchaseOrderId", + "defName": "采购单Id", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "55EB7910-E4F0-49A6-8A53-EB0167E5ED34" + }, + { + "defKey": "PurchaseProductId", + "defName": "采购Spu", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "3B0E5CF8-DBCF-447F-B49C-2096C0B2D402" + }, + { + "defKey": "PurchaseSkuId", + "defName": "采购Sku", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "8024FAE2-F559-40AF-A1D6-D1725CF9E267" + }, + { + "defKey": "PurchaseSpecId", + "defName": "采购Spec(1688)", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "29B35FE1-220E-46A2-8636-BA833A60B4A0" + }, + { + "defKey": "BelongSkuId", + "defName": "归属SkuId(拳探)", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "5780904B-4B79-4357-A9CB-331DD828C920" + }, + { + "defKey": "Quantity", + "defName": "采购数量", + "comment": "", + "type": "INT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "4471FF5A-423F-453C-A31B-7F2B36433FE1" + }, + { + "defKey": "SchemeId", + "defName": "采购方案Id", + "comment": "", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "C4728627-12F6-4B95-8931-E32E8913C578" + }, + { + "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": "C76F8758-9EEC-4108-9F30-ECE489720FC8" + } + ], + "correlations": [], + "indexes": [] } ], "views": [], @@ -5518,6 +5884,46 @@ "relationType": "field", "canvasData": { "cells": [ + { + "id": "bae79cdf-e627-427b-aa66-728f637effcb", + "shape": "table", + "position": { + "x": -260, + "y": -290 + }, + "count": 0, + "originKey": "AF1D8C00-44CE-478C-BBE6-013CF93AF22D" + }, + { + "id": "34567615-fdb5-4d1d-b6ee-a8b61faa04b8", + "shape": "table", + "position": { + "x": 1690, + "y": -73.5 + }, + "count": 0, + "originKey": "474E5807-5650-43BD-8C5C-E16F36D58F85" + }, + { + "id": "33443e42-a883-42ec-acc0-46cc1446218d", + "shape": "table", + "position": { + "x": 1690, + "y": 614 + }, + "count": 0, + "originKey": "1E65E858-7177-4B30-9B39-32A6D1CB104C" + }, + { + "id": "129cac0b-4f1e-4d05-972f-73b2c710b6e0", + "shape": "table", + "position": { + "x": 1690, + "y": 388 + }, + "count": 0, + "originKey": "4CDAE2F8-5F79-4A75-8F5A-27226FDD1ACE" + }, { "id": "c9cd6035-3abe-4d8f-8830-bc876fe240af", "shape": "erdRelation", @@ -5541,9 +5947,6 @@ } ], "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5563,9 +5966,6 @@ }, "relation": "1:n", "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5591,9 +5991,6 @@ } ], "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5613,9 +6010,6 @@ }, "relation": "1:n", "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5641,45 +6035,12 @@ } ], "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" } } }, - { - "id": "bae79cdf-e627-427b-aa66-728f637effcb", - "shape": "table", - "position": { - "x": -260, - "y": -290 - }, - "count": 0, - "originKey": "AF1D8C00-44CE-478C-BBE6-013CF93AF22D" - }, - { - "id": "9afa8d28-f5b8-4c34-8df4-b386c4dd32b9", - "shape": "table", - "position": { - "x": -250, - "y": 380 - }, - "count": 0, - "originKey": "93074B87-BE55-41BF-8358-B0E84C4E249A" - }, - { - "id": "53bec785-6ee3-497e-bfa6-0318b99147db", - "shape": "table", - "position": { - "x": -260, - "y": 64.5 - }, - "count": 0, - "originKey": "C52E23C2-6CC5-4404-92A5-7CCE77E8AB1E" - }, { "id": "7771087b-7bda-4ec6-a831-c50dc06395e9", "shape": "erdRelation", @@ -5693,9 +6054,6 @@ }, "relation": "1:n", "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5703,44 +6061,54 @@ } }, { - "id": "34567615-fdb5-4d1d-b6ee-a8b61faa04b8", + "id": "6593da18-d55c-47e3-bb4c-cf75fc56702a", "shape": "table", "position": { "x": 1690, - "y": -73.5 + "y": 83 }, "count": 0, - "originKey": "474E5807-5650-43BD-8C5C-E16F36D58F85" + "originKey": "03EA3614-C1F5-4909-96A0-0687EDEABD4B" }, { - "id": "33443e42-a883-42ec-acc0-46cc1446218d", + "id": "53bec785-6ee3-497e-bfa6-0318b99147db", "shape": "table", "position": { - "x": 1690, - "y": 614 + "x": -260, + "y": 64.5 }, "count": 0, - "originKey": "1E65E858-7177-4B30-9B39-32A6D1CB104C" + "originKey": "C52E23C2-6CC5-4404-92A5-7CCE77E8AB1E" }, { - "id": "129cac0b-4f1e-4d05-972f-73b2c710b6e0", + "id": "9afa8d28-f5b8-4c34-8df4-b386c4dd32b9", "shape": "table", "position": { - "x": 1690, - "y": 388 + "x": -250, + "y": 380 }, "count": 0, - "originKey": "4CDAE2F8-5F79-4A75-8F5A-27226FDD1ACE" + "originKey": "93074B87-BE55-41BF-8358-B0E84C4E249A" }, { - "id": "6593da18-d55c-47e3-bb4c-cf75fc56702a", + "id": "2c258cf1-71de-432b-835a-7fe52c849443", "shape": "table", "position": { - "x": 1690, - "y": 83 + "x": 1100, + "y": -90 }, "count": 0, - "originKey": "03EA3614-C1F5-4909-96A0-0687EDEABD4B" + "originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214" + }, + { + "id": "471ac35d-30de-48a3-8743-eec20f919eba", + "shape": "table", + "position": { + "x": 1100, + "y": 614 + }, + "count": 0, + "originKey": "1ED24FEC-604E-4B36-9E51-17D572021F0C" }, { "id": "414ef58f-57e8-4362-971a-85af3ea9a44f", @@ -5767,20 +6135,10 @@ "shape": "table", "position": { "x": 1100, - "y": 349 + "y": 342 }, "count": 0, "originKey": "EE319D46-61D9-47DB-80AD-AD97D460ACB4" - }, - { - "id": "2c258cf1-71de-432b-835a-7fe52c849443", - "shape": "table", - "position": { - "x": 1100, - "y": -90 - }, - "count": 0, - "originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214" } ] }, diff --git a/doc/bbwyB端库.pdma.json b/doc/bbwyB端库.pdma.json index 94e4290..2d80fbb 100644 --- a/doc/bbwyB端库.pdma.json +++ b/doc/bbwyB端库.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2023-5-12 20:56:05", - "updatedTime": "2023-5-14 10:02:25", + "updatedTime": "2023-5-17 19:12:18", "dbConns": [], "profile": { "default": { @@ -1780,7 +1780,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "144B14DF-B01B-4EF7-9163-24A3124BB808", + "refEntity": "3A48F81A-49D5-423B-8A92-228615DCEA6F", + "refField": "31AF4355-53ED-42E2-AB7F-A8AC17D17DBB", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "C52E23C2-6CC5-4404-92A5-7CCE77E8AB1E", @@ -2134,7 +2143,16 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "E9728883-C797-4973-82A6-58F0DD7306F7", + "refEntity": "3A48F81A-49D5-423B-8A92-228615DCEA6F", + "refField": "31AF4355-53ED-42E2-AB7F-A8AC17D17DBB", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ] }, { "id": "93074B87-BE55-41BF-8358-B0E84C4E249A", @@ -2820,7 +2838,16 @@ "hideInGraph": true } ], - "correlations": [], + "correlations": [ + { + "myField": "C972C40D-0C81-455D-8598-37DC80F7A538", + "refEntity": "3A48F81A-49D5-423B-8A92-228615DCEA6F", + "refField": "31AF4355-53ED-42E2-AB7F-A8AC17D17DBB", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "notes": {} }, { @@ -3331,7 +3358,16 @@ "hideInGraph": true } ], - "correlations": [], + "correlations": [ + { + "myField": "DD093BC7-0374-421D-A4B5-7D471C5444B2", + "refEntity": "3A48F81A-49D5-423B-8A92-228615DCEA6F", + "refField": "31AF4355-53ED-42E2-AB7F-A8AC17D17DBB", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "notes": {} }, { @@ -3678,6 +3714,23 @@ "attr9": "", "id": "1A165F66-FE0D-4A2E-AF71-EE7F6EBDDCFA", "extProps": {} + }, + { + "defKey": "BelongSkuId", + "defName": "来源Sku", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "1A0C9CCD-B348-4916-83C2-D02754D94E1D" } ], "indexes": [ @@ -3831,7 +3884,17 @@ "hideInGraph": true } ], - "correlations": [] + "correlations": [ + { + "myField": "2CE3E553-81E6-40B3-A711-98A8EBF41716", + "refEntity": "3A48F81A-49D5-423B-8A92-228615DCEA6F", + "refField": "31AF4355-53ED-42E2-AB7F-A8AC17D17DBB", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], + "notes": {} }, { "id": "474E5807-5650-43BD-8C5C-E16F36D58F85", @@ -5265,7 +5328,356 @@ "id": "FB279AC5-DB2B-498B-9DC9-5EE05BCED570" } ], - "correlations": [], + "correlations": [ + { + "myField": "1AC7EBFF-8FCC-40C9-A17B-2BACE1030CAB", + "refEntity": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214", + "refField": "36136AA8-299D-4616-8F98-7172BFB06DDB", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], + "indexes": [] + }, + { + "id": "1ED24FEC-604E-4B36-9E51-17D572021F0C", + "env": { + "base": { + "nameSpace": "", + "codeRoot": "" + } + }, + "defKey": "orderPurchaseRelationInfo", + "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}]", + "notes": {}, + "headers": [ + { + "refKey": "hideInGraph", + "hideInGraph": true + }, + { + "refKey": "defKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "defName", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "primaryKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "notNull", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "autoIncrement", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "domain", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "type", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "len", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "scale", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "comment", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "refDict", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "defaultValue", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "isStandard", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "uiHint", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "extProps", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr1", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr2", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr3", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr4", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr5", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr6", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr7", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr8", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr9", + "freeze": false, + "hideInGraph": true + } + ], + "fields": [ + { + "defKey": "Id", + "defName": "主键", + "comment": "", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "notes": {}, + "attr1": "", + "attr2": "", + "attr3": "", + "attr4": "", + "attr5": "", + "attr6": "", + "attr7": "", + "attr8": "", + "attr9": "", + "id": "7B939B66-4149-4D8C-BCD3-E99B425C3327" + }, + { + "defKey": "OrderId", + "defName": "订单Id", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "19E4CACC-5E58-4016-9654-FBDA15B17BE7" + }, + { + "defKey": "PurchaseOrderId", + "defName": "采购单Id", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "55EB7910-E4F0-49A6-8A53-EB0167E5ED34" + }, + { + "defKey": "PurchaseProductId", + "defName": "采购Spu", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "3B0E5CF8-DBCF-447F-B49C-2096C0B2D402" + }, + { + "defKey": "PurchaseSkuId", + "defName": "采购Sku", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "8024FAE2-F559-40AF-A1D6-D1725CF9E267" + }, + { + "defKey": "PurchaseSpecId", + "defName": "采购Spec(1688)", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "29B35FE1-220E-46A2-8636-BA833A60B4A0" + }, + { + "defKey": "BelongSkuId", + "defName": "归属SkuId(拳探)", + "comment": "", + "type": "VARCHAR", + "len": 100, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "5780904B-4B79-4357-A9CB-331DD828C920" + }, + { + "defKey": "Quantity", + "defName": "采购数量", + "comment": "", + "type": "INT", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "4471FF5A-423F-453C-A31B-7F2B36433FE1" + }, + { + "defKey": "SchemeId", + "defName": "采购方案Id", + "comment": "", + "type": "bigint", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "C4728627-12F6-4B95-8931-E32E8913C578" + }, + { + "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": "C76F8758-9EEC-4108-9F30-ECE489720FC8" + } + ], + "correlations": [ + { + "myField": "8B25DD45-6396-4F51-969D-EE6FA1CA8719", + "refEntity": "EE319D46-61D9-47DB-80AD-AD97D460ACB4", + "refField": "667BC789-09BB-49B8-A7BF-0EBAEE7FC36C", + "myRows": "1", + "refRows": "n", + "innerType": "" + } + ], "indexes": [] } ], @@ -5518,6 +5930,46 @@ "relationType": "field", "canvasData": { "cells": [ + { + "id": "bae79cdf-e627-427b-aa66-728f637effcb", + "shape": "table", + "position": { + "x": -260, + "y": -290 + }, + "count": 0, + "originKey": "AF1D8C00-44CE-478C-BBE6-013CF93AF22D" + }, + { + "id": "34567615-fdb5-4d1d-b6ee-a8b61faa04b8", + "shape": "table", + "position": { + "x": 1690, + "y": -73.5 + }, + "count": 0, + "originKey": "474E5807-5650-43BD-8C5C-E16F36D58F85" + }, + { + "id": "33443e42-a883-42ec-acc0-46cc1446218d", + "shape": "table", + "position": { + "x": 1690, + "y": 614 + }, + "count": 0, + "originKey": "1E65E858-7177-4B30-9B39-32A6D1CB104C" + }, + { + "id": "129cac0b-4f1e-4d05-972f-73b2c710b6e0", + "shape": "table", + "position": { + "x": 1690, + "y": 388 + }, + "count": 0, + "originKey": "4CDAE2F8-5F79-4A75-8F5A-27226FDD1ACE" + }, { "id": "c9cd6035-3abe-4d8f-8830-bc876fe240af", "shape": "erdRelation", @@ -5541,9 +5993,6 @@ } ], "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5563,9 +6012,6 @@ }, "relation": "1:n", "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5591,9 +6037,6 @@ } ], "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5613,9 +6056,6 @@ }, "relation": "1:n", "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5641,45 +6081,12 @@ } ], "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" } } }, - { - "id": "bae79cdf-e627-427b-aa66-728f637effcb", - "shape": "table", - "position": { - "x": -260, - "y": -290 - }, - "count": 0, - "originKey": "AF1D8C00-44CE-478C-BBE6-013CF93AF22D" - }, - { - "id": "9afa8d28-f5b8-4c34-8df4-b386c4dd32b9", - "shape": "table", - "position": { - "x": -250, - "y": 380 - }, - "count": 0, - "originKey": "93074B87-BE55-41BF-8358-B0E84C4E249A" - }, - { - "id": "53bec785-6ee3-497e-bfa6-0318b99147db", - "shape": "table", - "position": { - "x": -260, - "y": 64.5 - }, - "count": 0, - "originKey": "C52E23C2-6CC5-4404-92A5-7CCE77E8AB1E" - }, { "id": "7771087b-7bda-4ec6-a831-c50dc06395e9", "shape": "erdRelation", @@ -5693,9 +6100,6 @@ }, "relation": "1:n", "fillColor": "#ACDAFC", - "router": { - "name": "manhattan" - }, "attrs": { "line": { "strokeDasharray": "" @@ -5703,34 +6107,34 @@ } }, { - "id": "34567615-fdb5-4d1d-b6ee-a8b61faa04b8", + "id": "53bec785-6ee3-497e-bfa6-0318b99147db", "shape": "table", "position": { - "x": 1690, - "y": -73.5 + "x": -260, + "y": 64.5 }, "count": 0, - "originKey": "474E5807-5650-43BD-8C5C-E16F36D58F85" + "originKey": "C52E23C2-6CC5-4404-92A5-7CCE77E8AB1E" }, { - "id": "33443e42-a883-42ec-acc0-46cc1446218d", + "id": "9afa8d28-f5b8-4c34-8df4-b386c4dd32b9", "shape": "table", "position": { - "x": 1690, - "y": 614 + "x": -250, + "y": 380 }, "count": 0, - "originKey": "1E65E858-7177-4B30-9B39-32A6D1CB104C" + "originKey": "93074B87-BE55-41BF-8358-B0E84C4E249A" }, { - "id": "129cac0b-4f1e-4d05-972f-73b2c710b6e0", + "id": "414ef58f-57e8-4362-971a-85af3ea9a44f", "shape": "table", "position": { - "x": 1690, - "y": 388 + "x": 390, + "y": -90 }, "count": 0, - "originKey": "4CDAE2F8-5F79-4A75-8F5A-27226FDD1ACE" + "originKey": "3A48F81A-49D5-423B-8A92-228615DCEA6F" }, { "id": "6593da18-d55c-47e3-bb4c-cf75fc56702a", @@ -5743,44 +6147,72 @@ "originKey": "03EA3614-C1F5-4909-96A0-0687EDEABD4B" }, { - "id": "414ef58f-57e8-4362-971a-85af3ea9a44f", + "id": "ff369484-e2eb-4af8-9b98-6fd2d9f202f9", "shape": "table", "position": { - "x": 390, - "y": -90 + "x": 501, + "y": 587 }, "count": 0, - "originKey": "3A48F81A-49D5-423B-8A92-228615DCEA6F" + "originKey": "B0921F8C-064A-48FC-A028-C849BD1EAC09" }, { - "id": "ff369484-e2eb-4af8-9b98-6fd2d9f202f9", + "id": "2c258cf1-71de-432b-835a-7fe52c849443", "shape": "table", "position": { - "x": 501, - "y": 587 + "x": 1100, + "y": -90 }, "count": 0, - "originKey": "B0921F8C-064A-48FC-A028-C849BD1EAC09" + "originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214" }, { - "id": "b968f678-c31b-4396-b761-dd3269ba6fb8", + "id": "21f63eec-82ac-4156-aa34-1ea862ff1eb5", + "shape": "erdRelation", + "source": { + "cell": "471ac35d-30de-48a3-8743-eec20f919eba", + "port": "8B25DD45-6396-4F51-969D-EE6FA1CA8719%in" + }, + "target": { + "cell": "b968f678-c31b-4396-b761-dd3269ba6fb8", + "port": "667BC789-09BB-49B8-A7BF-0EBAEE7FC36C%in" + }, + "relation": "1:n", + "vertices": [ + { + "x": 980, + "y": 382 + } + ], + "fillColor": "#ACDAFC", + "router": { + "name": "manhattan" + }, + "attrs": { + "line": { + "strokeDasharray": "" + } + } + }, + { + "id": "471ac35d-30de-48a3-8743-eec20f919eba", "shape": "table", "position": { "x": 1100, - "y": 349 + "y": 614 }, "count": 0, - "originKey": "EE319D46-61D9-47DB-80AD-AD97D460ACB4" + "originKey": "1ED24FEC-604E-4B36-9E51-17D572021F0C" }, { - "id": "2c258cf1-71de-432b-835a-7fe52c849443", + "id": "b968f678-c31b-4396-b761-dd3269ba6fb8", "shape": "table", "position": { "x": 1100, - "y": -90 + "y": 342 }, "count": 0, - "originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214" + "originKey": "EE319D46-61D9-47DB-80AD-AD97D460ACB4" } ] },