From 693a87992c2092f7211bf2bb08eaa59919b79359 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Tue, 4 Apr 2023 22:52:31 +0800
Subject: [PATCH 01/43] 1
---
BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
index 01674da6..1f89c33c 100644
--- a/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
+++ b/BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
@@ -83,6 +83,8 @@ namespace BBWY.Server.Business
var payStatus = !string.IsNullOrEmpty(qtResponse.Data.PayStatus) ? qtResponse.Data.PayStatus.ToLower() : string.Empty;
if (payStatus != "success")
throw new BusinessException($"拳探账户余额不足,支付失败,请前往拳探进行手动支付");
+
+ //对接支付接口
return new CreateOnlinePurchaseOrderResponse()
{
PurchaseOrderId = qtResponse.Data.OrderId
From 1e0e0ca32152c1209854dcceae8641065f2ab1f1 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 5 Apr 2023 12:47:21 +0800
Subject: [PATCH 02/43] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9A=82=E5=81=9C?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B4=A7=E6=AC=BE=E7=AD=89=E4=BA=8E0?=
=?UTF-8?q?=E6=97=B6=E9=80=A0=E6=88=90=E5=88=A9=E6=B6=A6=E4=B8=BA=E8=B4=9F?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BBWY.Server.Business/Sync/OrderSyncBusiness.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
index 4655069d..50202211 100644
--- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
@@ -321,7 +321,7 @@ namespace BBWY.Server.Business
WaybillNo = waybillNo,
StoreOrder = storeOrder,
StoreId = storeId,
- IsGift = orderTotalPrice == 0M || orderSellerPrice == 0M,
+ IsGift = orderSellerPrice == 0M,
StorageType = storageType
};
@@ -457,7 +457,7 @@ namespace BBWY.Server.Business
orderState != Enums.OrderState.已取消)
{
var orderCost = dbOrderCostList.FirstOrDefault(oc => oc.OrderId == dbOrder.Id);
- if (orderCost == null && orderTotalPrice > 0M)
+ if (orderCost == null && orderSellerPrice > 0M)
{
if (isNewOrder && dbOrder.StorageType == Enums.StorageType.SD && sDCalculationCostRequest != null)
{
@@ -610,7 +610,7 @@ namespace BBWY.Server.Business
.SetIf(sellerPreferentialAmount != dbOrder.SellerPreferentialAmount, o => o.SellerPreferentialAmount, sellerPreferentialAmount)
.SetIf(orderSellerPrice != dbOrder.OrderSellerPrice, o => o.OrderSellerPrice, orderSellerPrice)
.SetIf(orderTotalPrice != dbOrder.OrderTotalPrice, o => o.OrderTotalPrice, orderTotalPrice)
- .SetIf(orderTotalPrice != dbOrder.OrderTotalPrice && orderTotalPrice > 0M, o => o.IsGift, false)
+ .SetIf(orderSellerPrice > 0M, o => o.IsGift, false)
.SetIf(storeOrder != dbOrder.StoreOrder, o => o.StoreOrder, storeOrder)
.SetIf(storeOrder != dbOrder.StoreOrder, o => o.StorageType, storageType)
.SetIf(preferentialAmount != dbOrder.PreferentialAmount, o => o.PreferentialAmount, preferentialAmount)
From ead34c07aeafcc21c8c9a6e3f0a342e5244cead8 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 5 Apr 2023 12:49:04 +0800
Subject: [PATCH 03/43] 1
---
BBWY.Server.Business/Sync/OrderSyncBusiness.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
index 50202211..a536cd55 100644
--- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
@@ -610,7 +610,7 @@ namespace BBWY.Server.Business
.SetIf(sellerPreferentialAmount != dbOrder.SellerPreferentialAmount, o => o.SellerPreferentialAmount, sellerPreferentialAmount)
.SetIf(orderSellerPrice != dbOrder.OrderSellerPrice, o => o.OrderSellerPrice, orderSellerPrice)
.SetIf(orderTotalPrice != dbOrder.OrderTotalPrice, o => o.OrderTotalPrice, orderTotalPrice)
- .SetIf(orderSellerPrice > 0M, o => o.IsGift, false)
+ .SetIf(orderSellerPrice > 0M && dbOrder.IsGift == true, o => o.IsGift, false)
.SetIf(storeOrder != dbOrder.StoreOrder, o => o.StoreOrder, storeOrder)
.SetIf(storeOrder != dbOrder.StoreOrder, o => o.StorageType, storageType)
.SetIf(preferentialAmount != dbOrder.PreferentialAmount, o => o.PreferentialAmount, preferentialAmount)
From 1719d97cba16f1ec44f0dc9484b9f7bad48546bc Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 6 Apr 2023 00:22:30 +0800
Subject: [PATCH 04/43] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dosku=E7=9A=84=E5=95=86?=
=?UTF-8?q?=E5=93=81Id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/OrderSyncController.cs | 28 +++++++++++------
.../Sync/OrderSyncBusiness.cs | 31 +++++++++++++++++++
2 files changed, 49 insertions(+), 10 deletions(-)
diff --git a/BBWY.Server.API/Controllers/OrderSyncController.cs b/BBWY.Server.API/Controllers/OrderSyncController.cs
index 9598fd0f..a3323cab 100644
--- a/BBWY.Server.API/Controllers/OrderSyncController.cs
+++ b/BBWY.Server.API/Controllers/OrderSyncController.cs
@@ -47,16 +47,16 @@ namespace BBWY.Server.API.Controllers
orderSyncBusiness.ManualSyncOrder(shopId, orderIds, null, null);
}
- ///
- /// 订单批量删除
- ///
- ///
- ///
- [HttpPost("{shopId}")]
- public void OrderDelete([FromRoute]long shopId, [FromBody]IList orderIds)
- {
- orderSyncBusiness.OrderDelete(shopId, orderIds);
- }
+ /////
+ ///// 订单批量删除
+ /////
+ /////
+ /////
+ //[HttpPost("{shopId}")]
+ //public void OrderDelete([FromRoute]long shopId, [FromBody]IList orderIds)
+ //{
+ // orderSyncBusiness.OrderDelete(shopId, orderIds);
+ //}
///
/// 根据日期同步
@@ -105,5 +105,13 @@ namespace BBWY.Server.API.Controllers
orderSyncBusiness.DeleteTimeOutWaitPayOrder();
}
+ ///
+ /// 修复订单Sku缺少的spu
+ ///
+ [HttpPost]
+ public void RepairOrderSkuProductId()
+ {
+ orderSyncBusiness.RepairOrderSkuProductId();
+ }
}
}
diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
index a536cd55..522107fc 100644
--- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
@@ -866,6 +866,37 @@ namespace BBWY.Server.Business
var deleteTime = DateTime.Now.AddHours(-24);
fsql.Delete().Where(w => w.CreateTime <= deleteTime).ExecuteAffrows();
}
+
+ ///
+ /// 修复订单Sku缺少的spu
+ ///
+ public void RepairOrderSkuProductId()
+ {
+ var date = DateTime.Now.AddHours(-2);
+ var waitRepairOrderSkuList = fsql.Select()
+ .InnerJoin((osku, psku) => osku.SkuId == psku.Id)
+ .Where((osku, psku) => osku.CreateTime >= date && string.IsNullOrEmpty(osku.ProductId) && osku.Price > 0)
+ .ToList((osku, psku) => new
+ {
+ Id = osku.Id,
+ SkuId = osku.SkuId,
+ ProductId = psku.ProductId
+ });
+ if (waitRepairOrderSkuList.Count() == 0)
+ return;
+
+ var waitRepairOrderSkuGroupList = waitRepairOrderSkuList.GroupBy(s => s.ProductId);
+
+ fsql.Transaction(() =>
+ {
+ foreach (var group in waitRepairOrderSkuGroupList)
+ {
+ var orderSkuIds = group.Select(g => g.Id).ToList();
+ var productId = group.Key;
+ fsql.Update(orderSkuIds).Set(osku => osku.ProductId, productId).ExecuteAffrows();
+ }
+ });
+ }
#endregion
}
}
From 5d2c53536e4dcdc954e91ceda2caf121e529c432 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 7 Apr 2023 11:55:58 +0800
Subject: [PATCH 05/43] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BBWY.Server.Business/Sync/OrderSyncBusiness.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
index 522107fc..8a4a8c2a 100644
--- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
@@ -248,7 +248,8 @@ namespace BBWY.Server.Business
OrderTotalPrice = o.OrderTotalPrice,
StoreOrder = o.StoreOrder,
PreferentialAmount = o.PreferentialAmount,
- StoreId = o.StoreId
+ StoreId = o.StoreId,
+ IsGift = o.IsGift
}); //数据库订单
var dbOrderConsigneeList = fsql.Select().Where(oc => interfaceOrderIdList.Contains(oc.OrderId)).ToList(); //数据库订单收货信息
var dbOrderCostList = fsql.Select().Where(oc => interfaceOrderIdList.Contains(oc.OrderId)).ToList(); //数据库订单成本信息
From 5e3cd8534401d9ad486bc7e83dd5f13b3f281fe4 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 7 Apr 2023 12:04:11 +0800
Subject: [PATCH 06/43] 1
---
BBWY.Server.Business/Sync/OrderSyncBusiness.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
index 8a4a8c2a..3724745c 100644
--- a/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
+++ b/BBWY.Server.Business/Sync/OrderSyncBusiness.cs
@@ -595,6 +595,7 @@ namespace BBWY.Server.Business
orderPayment != dbOrder.OrderPayment ||
sellerPreferentialAmount != dbOrder.SellerPreferentialAmount ||
orderSellerPrice != dbOrder.OrderSellerPrice ||
+ (orderSellerPrice > 0M && dbOrder.IsGift) ||
orderTotalPrice != dbOrder.OrderTotalPrice ||
storeOrder != dbOrder.StoreOrder ||
preferentialAmount != dbOrder.PreferentialAmount ||
From 7c2d496d7db7e00ff6af0bf30be69fef2589aa3e Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Mon, 10 Apr 2023 02:31:16 +0800
Subject: [PATCH 07/43] 1
---
BBWY.Client/Views/Order/OrderListControl.xaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/BBWY.Client/Views/Order/OrderListControl.xaml b/BBWY.Client/Views/Order/OrderListControl.xaml
index 9e523bf1..9c9d1301 100644
--- a/BBWY.Client/Views/Order/OrderListControl.xaml
+++ b/BBWY.Client/Views/Order/OrderListControl.xaml
@@ -31,7 +31,6 @@
-
From fc76d15014036a640ebcc49bee9f7eed6734e06e Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Tue, 11 Apr 2023 00:43:01 +0800
Subject: [PATCH 08/43] 1
---
...数据库-backup-2023411004157.pdma.json} | 3156 +++++++++++++--
...数据库-backup-2023411004239.pdma.json} | 3156 +++++++++++++--
...数据库-backup-2023411004245.pdma.json} | 3446 +++++++++++++++--
doc/步步为盈数据库.pdma.json | 3351 +++++++++++++---
4 files changed, 11531 insertions(+), 1578 deletions(-)
rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023221132004.pdma.json => 步步为盈数据库-backup-2023411004157.pdma.json} (86%)
rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023221132027.pdma.json => 步步为盈数据库-backup-2023411004239.pdma.json} (86%)
rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023221131929.pdma.json => 步步为盈数据库-backup-2023411004245.pdma.json} (84%)
diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221132004.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004157.pdma.json
similarity index 86%
rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221132004.pdma.json
rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004157.pdma.json
index 4b3b6283..84dde971 100644
--- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221132004.pdma.json
+++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004157.pdma.json
@@ -2,9 +2,9 @@
"name": "步步为盈数据库",
"describe": "步步为盈数据库关系图",
"avatar": "",
- "version": "4.1.3",
+ "version": "4.5.1",
"createdTime": "2022-10-3 12:39:39",
- "updatedTime": "2023-2-21 13:19:29",
+ "updatedTime": "2023-4-11 00:41:51",
"dbConns": [],
"profile": {
"default": {
@@ -401,63 +401,156 @@
"headers": [
{
"refKey": "defKey",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "字段代码",
+ "freeze": false
},
{
"refKey": "defName",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "显示名称",
+ "freeze": false
},
{
"refKey": "primaryKey",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "主键",
+ "freeze": false
},
{
"refKey": "notNull",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "不为空",
+ "freeze": false
},
{
"refKey": "autoIncrement",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "自增",
+ "freeze": false
+ },
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true,
+ "value": "默认值",
+ "freeze": false
},
{
"refKey": "domain",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "数据域",
+ "freeze": false
},
{
"refKey": "type",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "数据类型",
+ "freeze": false
},
{
"refKey": "len",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "长度",
+ "freeze": false
},
{
"refKey": "scale",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "小数位数",
+ "freeze": false
},
{
"refKey": "comment",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "说明",
+ "freeze": false
},
{
"refKey": "refDict",
- "hideInGraph": true
- },
- {
- "refKey": "defaultValue",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "数据字典",
+ "freeze": false
},
{
"refKey": "isStandard",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "标准字段",
+ "freeze": false
},
{
"refKey": "uiHint",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "UI建议",
+ "freeze": false
},
{
"refKey": "extProps",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "拓展属性",
+ "freeze": false
+ },
+ {
+ "refKey": "attr1",
+ "value": "拓展字段1",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr2",
+ "value": "拓展字段2",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr3",
+ "value": "拓展字段3",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr4",
+ "value": "拓展字段4",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr5",
+ "value": "拓展字段5",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr6",
+ "value": "拓展字段6",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr7",
+ "value": "拓展字段7",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr8",
+ "value": "拓展字段8",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr9",
+ "value": "拓展字段9",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
}
],
"menuWidth": "269px"
@@ -1150,6 +1243,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -1180,11 +1278,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -1199,6 +1292,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -1601,6 +1739,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -1631,11 +1774,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -1650,6 +1788,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -2232,6 +2415,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -2262,11 +2450,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -2281,6 +2464,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -2513,6 +2741,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -2543,11 +2776,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -2562,6 +2790,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -2896,6 +3169,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -2926,11 +3204,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -2945,6 +3218,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -3335,7 +3653,12 @@
},
{
"freeze": false,
- "refKey": "domain",
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
+ {
+ "freeze": false,
+ "refKey": "domain",
"hideInGraph": true
},
{
@@ -3363,11 +3686,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -3382,6 +3700,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -3544,6 +3907,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -3574,11 +3942,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -3593,6 +3956,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -3891,6 +4299,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -3921,11 +4334,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -3940,6 +4348,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -4218,6 +4671,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -4248,11 +4706,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4267,6 +4720,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -4397,6 +4895,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -4427,11 +4930,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4446,6 +4944,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -4656,6 +5199,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -4686,11 +5234,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4705,22 +5248,67 @@
"freeze": false,
"refKey": "extProps",
"hideInGraph": true
- }
- ],
- "correlations": []
- },
- {
- "id": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9",
- "defKey": "productsku",
- "defName": "产品Sku表",
- "comment": "",
- "properties": {},
- "fields": [
+ },
{
- "defKey": "Id",
- "defName": "SKU",
- "comment": "",
- "domain": "",
+ "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
+ }
+ ],
+ "correlations": []
+ },
+ {
+ "id": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9",
+ "defKey": "productsku",
+ "defName": "产品Sku表",
+ "comment": "",
+ "properties": {},
+ "fields": [
+ {
+ "defKey": "Id",
+ "defName": "SKU",
+ "comment": "",
+ "domain": "",
"type": "VARCHAR",
"len": 50,
"scale": "",
@@ -4932,6 +5520,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -4962,11 +5555,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4981,6 +5569,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -5211,6 +5844,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -5241,11 +5879,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -5260,6 +5893,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -5699,6 +6377,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -5729,11 +6412,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -5748,6 +6426,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -5878,6 +6601,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -5908,11 +6636,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -5927,6 +6650,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -6023,6 +6791,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6053,11 +6826,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6072,17 +6840,62 @@
"freeze": false,
"refKey": "extProps",
"hideInGraph": true
- }
- ],
- "correlations": []
- },
- {
- "id": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
- "defKey": "purchasescheme",
- "defName": "采购方案表",
- "comment": "",
- "properties": {},
- "fields": [
+ },
+ {
+ "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
+ }
+ ],
+ "correlations": []
+ },
+ {
+ "id": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
+ "defKey": "purchasescheme",
+ "defName": "采购方案表",
+ "comment": "",
+ "properties": {},
+ "fields": [
{
"defKey": "Id",
"defName": "Sku采购方案Id",
@@ -6270,6 +7083,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6300,11 +7118,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6319,6 +7132,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -6483,6 +7341,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6513,11 +7376,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6532,6 +7390,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -6713,6 +7616,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6743,11 +7651,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6762,6 +7665,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -6909,6 +7857,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6939,11 +7892,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6958,6 +7906,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -7007,6 +8000,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -7031,10 +8028,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -7046,24 +8039,69 @@
{
"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": "",
+ "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": {},
+ "domain": "",
"id": "15199F73-CD7A-48E7-AE50-75D567053C30"
},
{
@@ -7268,6 +8306,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -7292,10 +8334,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -7307,6 +8345,51 @@
{
"refKey": "extProps",
"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": [
@@ -7580,6 +8663,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -7604,10 +8691,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -7619,6 +8702,51 @@
{
"refKey": "extProps",
"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": [
@@ -7909,6 +9037,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -7933,10 +9065,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -7948,6 +9076,51 @@
{
"refKey": "extProps",
"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": [
@@ -8204,6 +9377,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -8228,10 +9405,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -8243,6 +9416,51 @@
{
"refKey": "extProps",
"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": [
@@ -8567,6 +9785,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -8591,10 +9813,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -8606,26 +9824,71 @@
{
"refKey": "extProps",
"hideInGraph": true
- }
- ],
- "fields": [
+ },
{
- "defKey": "ServiceId",
- "defName": "服务单Id",
- "comment": "",
- "type": "bigint",
- "len": "",
- "scale": "",
- "primaryKey": true,
- "notNull": true,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "",
- "id": "94F9043E-0427-440B-A567-8B76C10C4139"
- }
+ "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": "ServiceId",
+ "defName": "服务单Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": true,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "94F9043E-0427-440B-A567-8B76C10C4139"
+ }
],
"correlations": [],
"indexes": []
@@ -8675,6 +9938,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -8699,10 +9966,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -8714,6 +9977,51 @@
{
"refKey": "extProps",
"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": [
@@ -8800,92 +10108,1233 @@
"refDict": "",
"extProps": {},
"domain": "",
- "id": "B20CC0B7-A0CF-4B6F-A104-C90AA0EF8C0A"
+ "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": []
+ },
+ {
+ "id": "120166EB-7E57-44E5-816C-B8414CB849E9",
+ "env": {
+ "base": {
+ "nameSpace": "",
+ "codeRoot": ""
+ }
+ },
+ "defKey": "PurchaseOrderV2",
+ "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",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "defName",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "primaryKey",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "notNull",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "autoIncrement",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "defaultValue",
+ "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": "isStandard",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "uiHint",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "extProps",
+ "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": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": true,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "5B59C70B-1BAC-426C-9411-E0AAFE7E23AE"
+ },
+ {
+ "defKey": "ShopId",
+ "defName": "店铺Id",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "0D6455C2-F162-4A53-BB50-A440B07B6124"
+ },
+ {
+ "defKey": "OrderState",
+ "defName": "采购单状态(待付款=0,待发货=1,待收货=2,待质检=3,待打包=4,待结算=5,已完成=6)",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "B4555CB9-B8F9-4504-A3CF-24E2FD021A3C"
+ },
+ {
+ "defKey": "PurchasePlatform",
+ "defName": "采购平台",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "BCB6AD22-1A67-4060-8A48-18784F96F26D"
+ },
+ {
+ "defKey": "ConsigneeContactName",
+ "defName": "收货联系人名称",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 50,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "ECB913D8-FB06-4F71-8841-658E3FDEDD4D"
+ },
+ {
+ "defKey": "ConsigneeMobile",
+ "defName": "收货联系人电话",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 50,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "B8860175-A29B-4220-A304-0F427757A8FE"
+ },
+ {
+ "defKey": "ConsigneeProvince",
+ "defName": "收货省",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "E750B8CC-A468-413B-81BA-4EC5BBB10FBA"
+ },
+ {
+ "defKey": "ConsigneeCity",
+ "defName": "收货市",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "9C53606E-3654-4EB2-8258-F7B7272BF2B0"
+ },
+ {
+ "defKey": "ConsigneeCounty",
+ "defName": "收货区",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "A7EF581E-E892-40BF-80B2-F127103806C1"
+ },
+ {
+ "defKey": "ConsigneeTown",
+ "defName": "收货镇",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "0A6A563C-E622-4457-A3B0-78D93176056A"
+ },
+ {
+ "defKey": "ConsigneeAddress",
+ "defName": "收货详细地址",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "AC3C8987-B0FE-4A7B-9D9F-596440862B34"
+ },
+ {
+ "defKey": "IsSubscribeKuaiDi100",
+ "defName": "是否订阅快递100",
+ "comment": "",
+ "type": "bit",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "52384F84-B941-419F-8F7B-A5CD575261C1"
+ },
+ {
+ "defKey": "WaybillNo",
+ "defName": "快递单号",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "2AFE305D-F7C1-4E7C-B319-546521CBE6CD"
+ },
+ {
+ "defKey": "ExpressName",
+ "defName": "快递公司",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "206B633B-7BA8-4AA6-AF3B-FBB60E11B803"
+ },
+ {
+ "defKey": "PurchaserId",
+ "defName": "商家Id",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 20,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "254CDA6E-6229-4734-8DB9-FD955D0EBCA7"
+ },
+ {
+ "defKey": "PurchaserName",
+ "defName": "商家名称",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "528065AB-9838-43DF-AA9C-5ABFB7FC9FE7"
+ },
+ {
+ "defKey": "PurchaseAccountId",
+ "defName": "采购账号Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "D1260679-C8DE-4EF4-8BA4-8110F6C93E85"
+ },
+ {
+ "defKey": "PurchaseAmount",
+ "defName": "采购金额(采购货款+采购运费)",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "195E2AA0-A2AE-406F-807D-749C230718B7"
+ },
+ {
+ "defKey": "ProductAmount",
+ "defName": "采购货款",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "8C24111F-1182-4FD5-A452-AC612A69F5F7"
+ },
+ {
+ "defKey": "PurchaseFreight",
+ "defName": "采购运费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "46B5C831-B0C5-435B-A46E-A0FB98B5FCE2"
+ },
+ {
+ "defKey": "QualityInspectionAmount",
+ "defName": "质检费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "E6364306-BDAB-4C3A-BF9F-E5FE01A1252F"
+ },
+ {
+ "defKey": "InStorageAmount",
+ "defName": "入仓费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "C4757207-8991-4CA7-9902-63719918B5BB"
+ },
+ {
+ "defKey": "ConsumableAmount",
+ "defName": "打包耗材费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "E511367E-25CC-4FB1-A18B-BD909523DB75"
+ },
+ {
+ "defKey": "FirstFreight",
+ "defName": "头程运费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "45C45A42-72FC-4D57-B121-F0C8AB8B7264"
+ },
+ {
+ "defKey": "IsConvertToStock",
+ "defName": "是否转入库存",
+ "comment": "",
+ "type": "bit",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "38B841BE-111D-42A8-B538-308C71374F17"
+ },
+ {
+ "defKey": "Remark",
+ "defName": "备注信息",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "6E1DEE72-FA9D-49B6-A885-9CD62C5EAEA4"
+ },
+ {
+ "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": "03286487-0FAA-46C3-97CC-6E7C3B8E58FE"
+ },
+ {
+ "defKey": "PayTime",
+ "defName": "支付时间",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "6608DCEC-B512-4F5D-AB8F-AF69F45C690A"
+ },
+ {
+ "defKey": "SignTime",
+ "defName": "签收时间",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "B9418547-11CD-447E-9B55-81563EC99743"
+ },
+ {
+ "defKey": "CompletionTime",
+ "defName": "完成时间",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "2ED49BCC-4CA9-4793-9061-157C85E10A71"
+ }
+ ],
+ "correlations": [],
+ "indexes": []
+ },
+ {
+ "id": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7",
+ "env": {
+ "base": {
+ "nameSpace": "",
+ "codeRoot": ""
+ }
+ },
+ "defKey": "PurchaseOrderSku",
+ "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": "defaultValue",
+ "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": "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": "主键Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "114311D1-CF0B-466C-8C24-BBC4E72B7C93"
+ },
+ {
+ "defKey": "ShopId",
+ "defName": "店铺Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "D5E1527C-D9A2-4497-BAC7-06763A5D4823"
+ },
+ {
+ "defKey": "PurchaseOrderId",
+ "defName": "采购单Id",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "2DCD302B-8BE8-493B-99B8-56B72DAC80E5"
+ },
+ {
+ "defKey": "ProductId",
+ "defName": "",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "79937FBB-2F11-4567-B5DA-783797F6B23D"
+ },
+ {
+ "defKey": "SkuId",
+ "defName": "",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "1AE2E6E1-3795-4E77-884C-EEB65FBE9AD9"
+ },
+ {
+ "defKey": "Price",
+ "defName": "单价",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "4B75BE15-58BD-4848-9E56-2B56BD8FDA97"
+ },
+ {
+ "defKey": "SkuTitle",
+ "defName": "Sku标题",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "22C93BB3-D52A-474A-B438-AEB208F752E1"
+ },
+ {
+ "defKey": "Logo",
+ "defName": "Sku Logo",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "9E416CD0-06B0-49AD-87D2-D600A6C7C57D"
+ },
+ {
+ "defKey": "PurchaseSchemeId",
+ "defName": "采购方案Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "593E7A4A-9BAC-457E-A7E5-33C3FAAAC300"
+ },
+ {
+ "defKey": "PurchaseSkuIds",
+ "defName": "采购SkuId串",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 500,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "A229B942-A759-435B-9CD4-63E9F21667DA"
+ },
+ {
+ "defKey": "PurchaseAmount",
+ "defName": "采购金额(采购货款+采购运费)",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "03F1E202-6794-47E0-AE62-05360149C1C1"
+ },
+ {
+ "defKey": "ProductAmount",
+ "defName": "采购货款",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "8FB8CF3A-0537-46B4-BF7B-E37CE3C48EB1"
+ },
+ {
+ "defKey": "PurchaseFreight",
+ "defName": "采购运费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "6D9E60F3-3A57-4C5F-AA18-947985CD56D8"
},
{
- "defKey": "PurchaseOrderId",
- "defName": "采购单Id",
- "comment": "可空",
- "type": "",
- "len": "",
- "scale": "",
+ "defKey": "QualityInspectionAmount",
+ "defName": "质检费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
- "id": "D9669169-6530-4BD3-9409-E2D6722965B6"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "4EEA782A-4E6A-4A15-9504-165A8C772065"
},
{
- "defKey": "OrderId",
- "defName": "订单Id",
+ "defKey": "InStorageAmount",
+ "defName": "入仓费",
"comment": "",
- "type": "VARCHAR",
- "len": 100,
- "scale": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "",
- "id": "3613C402-199D-4642-A8A6-A6A470013475"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "9F05088C-D1A2-4308-AFCE-009232B773BA"
},
{
- "defKey": "PackageType",
- "defName": "包裹类型(采购包裹=0 退货包裹=1)",
+ "defKey": "ConsumableAmount",
+ "defName": "打包耗材费",
"comment": "",
- "type": "",
- "len": "",
- "scale": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
- "id": "ED963E0A-8F45-4C2B-A2E2-6926E5F2C966"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "2BAD0903-5209-4D8B-B024-2B34E8673491"
},
{
- "defKey": "CreateTime",
- "defName": "",
+ "defKey": "FirstFreight",
+ "defName": "头程运费",
"comment": "",
- "type": "",
- "len": "",
- "scale": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
- "id": "3429613A-A50F-45B6-AD8E-6D036FD62C76"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "DD8B2222-6BDB-40BA-A28F-E0F35382B654"
},
{
- "defKey": "UpdateTime",
- "defName": "",
+ "defKey": "CreateTime",
+ "defName": "创建时间",
"comment": "",
- "type": "",
+ "type": "DATETIME",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
- "id": "8624878C-B971-4FF8-9034-C622E64F87DC"
+ "domain": "",
+ "id": "3052ED56-10A7-4CAE-9932-217D2821CBE7"
}
],
"correlations": [],
@@ -9494,16 +11943,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",
@@ -9514,26 +11953,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",
@@ -9574,16 +11993,6 @@
"count": 0,
"originKey": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2"
},
- {
- "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
- "shape": "table",
- "position": {
- "x": -450.5,
- "y": -368
- },
- "count": 0,
- "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
- },
{
"id": "653b5ef3-a1d2-4553-9629-d3525cd0f6cb",
"shape": "table",
@@ -9605,64 +12014,54 @@
"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",
+ "id": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d",
"shape": "table",
"position": {
- "x": -461,
- "y": 180
+ "x": -810,
+ "y": -1222
},
"count": 0,
- "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
+ "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022"
},
{
- "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": "e417b0e0-85e2-4073-977c-60fe6a7479ae",
"shape": "table",
"position": {
- "x": -1054,
- "y": -190
+ "x": 1420,
+ "y": -1040
},
"count": 0,
- "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
+ "originKey": "6036D7E4-7ECB-4888-9D74-58DA414447F8"
},
{
- "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
+ "id": "da49dd57-b256-4f89-9653-8f35edef5a02",
"shape": "table",
"position": {
- "x": -810,
- "y": -874
+ "x": 1420,
+ "y": -793.5
},
"count": 0,
- "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
+ "originKey": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9"
},
{
- "id": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d",
+ "id": "ddf927a6-e081-4c05-937d-bc64f59fc32a",
"shape": "table",
"position": {
- "x": -810,
- "y": -1222
+ "x": 1390,
+ "y": -520
},
"count": 0,
- "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022"
+ "originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E"
},
{
"id": "524fda6a-d71b-4754-b673-ffc91fd753fc",
@@ -10075,34 +12474,44 @@
"fillColor": "#ACDAFC"
},
{
- "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c",
+ "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431",
"shape": "table",
"position": {
- "x": 30,
- "y": 80
+ "x": 560,
+ "y": -167
},
"count": 0,
- "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A"
+ "originKey": "CD64DEB3-500E-48AF-896E-123922A03290"
},
{
- "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
+ "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
"shape": "table",
"position": {
- "x": 30,
- "y": 487
+ "x": -2570,
+ "y": -1440.5
},
"count": 0,
- "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
+ "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
},
{
- "id": "98934117-29b1-4645-a97b-71f379b61bd9",
+ "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
"shape": "table",
"position": {
- "x": 562,
+ "x": -450.5,
+ "y": -368
+ },
+ "count": 0,
+ "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
+ },
+ {
+ "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
+ "shape": "table",
+ "position": {
+ "x": 30,
"y": 487
},
"count": 0,
- "originKey": "379D48BE-3522-413B-8FA3-752D65ADB597"
+ "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
},
{
"id": "af885e60-05ef-40e3-87eb-e8b947deb9a5",
@@ -10115,38 +12524,99 @@
"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": "33dd1974-86a6-4344-9c56-ed081a79fa7f",
+ "shape": "table",
+ "position": {
+ "x": -560,
+ "y": -190
+ },
+ "count": 0,
+ "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A"
+ },
+ {
+ "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
+ "shape": "table",
+ "position": {
+ "x": -810,
+ "y": -874
+ },
+ "count": 0,
+ "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
+ },
+ {
+ "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
+ "shape": "table",
+ "position": {
+ "x": -1054,
+ "y": -190
+ },
+ "count": 0,
+ "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
+ },
+ {
+ "id": "fa539400-f09d-485c-af47-7055dd7beeaa",
+ "shape": "table",
+ "position": {
+ "x": -560,
+ "y": 527
+ },
+ "count": 0,
+ "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9"
+ },
+ {
+ "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2",
+ "shape": "table",
+ "position": {
+ "x": -461,
+ "y": 180
+ },
+ "count": 0,
+ "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
},
{
"id": "6eba7e01-588a-4631-a8a3-9eb43b950339",
"shape": "table",
"position": {
- "x": 40,
- "y": -1000
+ "x": -3270,
+ "y": -1440.5
},
"count": 0,
"originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
},
{
- "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
+ "id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977",
"shape": "table",
"position": {
- "x": 750,
- "y": -923
+ "x": -3220,
+ "y": -69.5
},
"count": 0,
- "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
+ "originKey": "120166EB-7E57-44E5-816C-B8414CB849E9"
+ },
+ {
+ "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac",
+ "shape": "table",
+ "position": {
+ "x": -3215.5,
+ "y": 662
+ },
+ "count": 0,
+ "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7"
}
]
},
- "id": "BE90AFD1-3769-4B95-9BCC-2ADDCF257440"
+ "id": "BE90AFD1-3769-4B95-9BCC-2ADDCF257440",
+ "comment": ""
}
],
"standardFields": [
diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221132027.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004239.pdma.json
similarity index 86%
rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221132027.pdma.json
rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004239.pdma.json
index 0b76c0f4..20c82a83 100644
--- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221132027.pdma.json
+++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004239.pdma.json
@@ -2,9 +2,9 @@
"name": "步步为盈数据库",
"describe": "步步为盈数据库关系图",
"avatar": "",
- "version": "4.1.3",
+ "version": "4.5.1",
"createdTime": "2022-10-3 12:39:39",
- "updatedTime": "2023-2-21 13:20:04",
+ "updatedTime": "2023-4-11 00:41:57",
"dbConns": [],
"profile": {
"default": {
@@ -401,63 +401,156 @@
"headers": [
{
"refKey": "defKey",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "字段代码",
+ "freeze": false
},
{
"refKey": "defName",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "显示名称",
+ "freeze": false
},
{
"refKey": "primaryKey",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "主键",
+ "freeze": false
},
{
"refKey": "notNull",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "不为空",
+ "freeze": false
},
{
"refKey": "autoIncrement",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "自增",
+ "freeze": false
+ },
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true,
+ "value": "默认值",
+ "freeze": false
},
{
"refKey": "domain",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "数据域",
+ "freeze": false
},
{
"refKey": "type",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "数据类型",
+ "freeze": false
},
{
"refKey": "len",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "长度",
+ "freeze": false
},
{
"refKey": "scale",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "小数位数",
+ "freeze": false
},
{
"refKey": "comment",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "说明",
+ "freeze": false
},
{
"refKey": "refDict",
- "hideInGraph": true
- },
- {
- "refKey": "defaultValue",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "数据字典",
+ "freeze": false
},
{
"refKey": "isStandard",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "标准字段",
+ "freeze": false
},
{
"refKey": "uiHint",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "UI建议",
+ "freeze": false
},
{
"refKey": "extProps",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "拓展属性",
+ "freeze": false
+ },
+ {
+ "refKey": "attr1",
+ "value": "拓展字段1",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr2",
+ "value": "拓展字段2",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr3",
+ "value": "拓展字段3",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr4",
+ "value": "拓展字段4",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr5",
+ "value": "拓展字段5",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr6",
+ "value": "拓展字段6",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr7",
+ "value": "拓展字段7",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr8",
+ "value": "拓展字段8",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr9",
+ "value": "拓展字段9",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
}
],
"menuWidth": "269px"
@@ -1150,6 +1243,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -1180,11 +1278,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -1199,6 +1292,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -1601,6 +1739,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -1631,11 +1774,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -1650,6 +1788,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -2232,6 +2415,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -2262,11 +2450,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -2281,6 +2464,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -2513,6 +2741,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -2543,11 +2776,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -2562,6 +2790,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -2896,6 +3169,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -2926,11 +3204,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -2945,6 +3218,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -3335,7 +3653,12 @@
},
{
"freeze": false,
- "refKey": "domain",
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
+ {
+ "freeze": false,
+ "refKey": "domain",
"hideInGraph": true
},
{
@@ -3363,11 +3686,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -3382,6 +3700,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -3544,6 +3907,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -3574,11 +3942,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -3593,6 +3956,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -3891,6 +4299,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -3921,11 +4334,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -3940,6 +4348,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -4218,6 +4671,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -4248,11 +4706,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4267,6 +4720,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -4397,6 +4895,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -4427,11 +4930,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4446,6 +4944,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -4656,6 +5199,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -4686,11 +5234,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4705,22 +5248,67 @@
"freeze": false,
"refKey": "extProps",
"hideInGraph": true
- }
- ],
- "correlations": []
- },
- {
- "id": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9",
- "defKey": "productsku",
- "defName": "产品Sku表",
- "comment": "",
- "properties": {},
- "fields": [
+ },
{
- "defKey": "Id",
- "defName": "SKU",
- "comment": "",
- "domain": "",
+ "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
+ }
+ ],
+ "correlations": []
+ },
+ {
+ "id": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9",
+ "defKey": "productsku",
+ "defName": "产品Sku表",
+ "comment": "",
+ "properties": {},
+ "fields": [
+ {
+ "defKey": "Id",
+ "defName": "SKU",
+ "comment": "",
+ "domain": "",
"type": "VARCHAR",
"len": 50,
"scale": "",
@@ -4932,6 +5520,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -4962,11 +5555,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4981,6 +5569,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -5211,6 +5844,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -5241,11 +5879,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -5260,6 +5893,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -5699,6 +6377,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -5729,11 +6412,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -5748,6 +6426,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -5878,6 +6601,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -5908,11 +6636,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -5927,6 +6650,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -6023,6 +6791,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6053,11 +6826,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6072,17 +6840,62 @@
"freeze": false,
"refKey": "extProps",
"hideInGraph": true
- }
- ],
- "correlations": []
- },
- {
- "id": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
- "defKey": "purchasescheme",
- "defName": "采购方案表",
- "comment": "",
- "properties": {},
- "fields": [
+ },
+ {
+ "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
+ }
+ ],
+ "correlations": []
+ },
+ {
+ "id": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
+ "defKey": "purchasescheme",
+ "defName": "采购方案表",
+ "comment": "",
+ "properties": {},
+ "fields": [
{
"defKey": "Id",
"defName": "Sku采购方案Id",
@@ -6270,6 +7083,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6300,11 +7118,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6319,6 +7132,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -6483,6 +7341,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6513,11 +7376,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6532,6 +7390,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -6713,6 +7616,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6743,11 +7651,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6762,6 +7665,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -6909,6 +7857,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6939,11 +7892,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6958,6 +7906,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -7007,6 +8000,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -7031,10 +8028,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -7046,24 +8039,69 @@
{
"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": "",
+ "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": {},
+ "domain": "",
"id": "15199F73-CD7A-48E7-AE50-75D567053C30"
},
{
@@ -7268,6 +8306,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -7292,10 +8334,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -7307,6 +8345,51 @@
{
"refKey": "extProps",
"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": [
@@ -7580,6 +8663,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -7604,10 +8691,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -7619,6 +8702,51 @@
{
"refKey": "extProps",
"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": [
@@ -7909,6 +9037,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -7933,10 +9065,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -7948,6 +9076,51 @@
{
"refKey": "extProps",
"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": [
@@ -8204,6 +9377,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -8228,10 +9405,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -8243,6 +9416,51 @@
{
"refKey": "extProps",
"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": [
@@ -8567,6 +9785,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -8591,10 +9813,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -8606,26 +9824,71 @@
{
"refKey": "extProps",
"hideInGraph": true
- }
- ],
- "fields": [
+ },
{
- "defKey": "ServiceId",
- "defName": "服务单Id",
- "comment": "",
- "type": "bigint",
- "len": "",
- "scale": "",
- "primaryKey": true,
- "notNull": true,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "",
- "id": "94F9043E-0427-440B-A567-8B76C10C4139"
- }
+ "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": "ServiceId",
+ "defName": "服务单Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": true,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "94F9043E-0427-440B-A567-8B76C10C4139"
+ }
],
"correlations": [],
"indexes": []
@@ -8675,6 +9938,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -8699,10 +9966,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -8714,6 +9977,51 @@
{
"refKey": "extProps",
"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": [
@@ -8800,92 +10108,1233 @@
"refDict": "",
"extProps": {},
"domain": "",
- "id": "B20CC0B7-A0CF-4B6F-A104-C90AA0EF8C0A"
+ "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": []
+ },
+ {
+ "id": "120166EB-7E57-44E5-816C-B8414CB849E9",
+ "env": {
+ "base": {
+ "nameSpace": "",
+ "codeRoot": ""
+ }
+ },
+ "defKey": "PurchaseOrderV2",
+ "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",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "defName",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "primaryKey",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "notNull",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "autoIncrement",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "defaultValue",
+ "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": "isStandard",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "uiHint",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "extProps",
+ "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": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": true,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "5B59C70B-1BAC-426C-9411-E0AAFE7E23AE"
+ },
+ {
+ "defKey": "ShopId",
+ "defName": "店铺Id",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "0D6455C2-F162-4A53-BB50-A440B07B6124"
+ },
+ {
+ "defKey": "OrderState",
+ "defName": "采购单状态(待付款=0,待发货=1,待收货=2,待质检=3,待打包=4,待结算=5,已完成=6)",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "B4555CB9-B8F9-4504-A3CF-24E2FD021A3C"
+ },
+ {
+ "defKey": "PurchasePlatform",
+ "defName": "采购平台",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "BCB6AD22-1A67-4060-8A48-18784F96F26D"
+ },
+ {
+ "defKey": "ConsigneeContactName",
+ "defName": "收货联系人名称",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 50,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "ECB913D8-FB06-4F71-8841-658E3FDEDD4D"
+ },
+ {
+ "defKey": "ConsigneeMobile",
+ "defName": "收货联系人电话",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 50,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "B8860175-A29B-4220-A304-0F427757A8FE"
+ },
+ {
+ "defKey": "ConsigneeProvince",
+ "defName": "收货省",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "E750B8CC-A468-413B-81BA-4EC5BBB10FBA"
+ },
+ {
+ "defKey": "ConsigneeCity",
+ "defName": "收货市",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "9C53606E-3654-4EB2-8258-F7B7272BF2B0"
+ },
+ {
+ "defKey": "ConsigneeCounty",
+ "defName": "收货区",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "A7EF581E-E892-40BF-80B2-F127103806C1"
+ },
+ {
+ "defKey": "ConsigneeTown",
+ "defName": "收货镇",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "0A6A563C-E622-4457-A3B0-78D93176056A"
+ },
+ {
+ "defKey": "ConsigneeAddress",
+ "defName": "收货详细地址",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "AC3C8987-B0FE-4A7B-9D9F-596440862B34"
+ },
+ {
+ "defKey": "IsSubscribeKuaiDi100",
+ "defName": "是否订阅快递100",
+ "comment": "",
+ "type": "bit",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "52384F84-B941-419F-8F7B-A5CD575261C1"
+ },
+ {
+ "defKey": "WaybillNo",
+ "defName": "快递单号",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "2AFE305D-F7C1-4E7C-B319-546521CBE6CD"
+ },
+ {
+ "defKey": "ExpressName",
+ "defName": "快递公司",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "206B633B-7BA8-4AA6-AF3B-FBB60E11B803"
+ },
+ {
+ "defKey": "PurchaserId",
+ "defName": "商家Id",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 20,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "254CDA6E-6229-4734-8DB9-FD955D0EBCA7"
+ },
+ {
+ "defKey": "PurchaserName",
+ "defName": "商家名称",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "528065AB-9838-43DF-AA9C-5ABFB7FC9FE7"
+ },
+ {
+ "defKey": "PurchaseAccountId",
+ "defName": "采购账号Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "D1260679-C8DE-4EF4-8BA4-8110F6C93E85"
+ },
+ {
+ "defKey": "PurchaseAmount",
+ "defName": "采购金额(采购货款+采购运费)",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "195E2AA0-A2AE-406F-807D-749C230718B7"
+ },
+ {
+ "defKey": "ProductAmount",
+ "defName": "采购货款",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "8C24111F-1182-4FD5-A452-AC612A69F5F7"
+ },
+ {
+ "defKey": "PurchaseFreight",
+ "defName": "采购运费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "46B5C831-B0C5-435B-A46E-A0FB98B5FCE2"
+ },
+ {
+ "defKey": "QualityInspectionAmount",
+ "defName": "质检费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "E6364306-BDAB-4C3A-BF9F-E5FE01A1252F"
+ },
+ {
+ "defKey": "InStorageAmount",
+ "defName": "入仓费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "C4757207-8991-4CA7-9902-63719918B5BB"
+ },
+ {
+ "defKey": "ConsumableAmount",
+ "defName": "打包耗材费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "E511367E-25CC-4FB1-A18B-BD909523DB75"
+ },
+ {
+ "defKey": "FirstFreight",
+ "defName": "头程运费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "45C45A42-72FC-4D57-B121-F0C8AB8B7264"
+ },
+ {
+ "defKey": "IsConvertToStock",
+ "defName": "是否转入库存",
+ "comment": "",
+ "type": "bit",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "38B841BE-111D-42A8-B538-308C71374F17"
+ },
+ {
+ "defKey": "Remark",
+ "defName": "备注信息",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "6E1DEE72-FA9D-49B6-A885-9CD62C5EAEA4"
+ },
+ {
+ "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": "03286487-0FAA-46C3-97CC-6E7C3B8E58FE"
+ },
+ {
+ "defKey": "PayTime",
+ "defName": "支付时间",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "6608DCEC-B512-4F5D-AB8F-AF69F45C690A"
+ },
+ {
+ "defKey": "SignTime",
+ "defName": "签收时间",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "B9418547-11CD-447E-9B55-81563EC99743"
+ },
+ {
+ "defKey": "CompletionTime",
+ "defName": "完成时间",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "2ED49BCC-4CA9-4793-9061-157C85E10A71"
+ }
+ ],
+ "correlations": [],
+ "indexes": []
+ },
+ {
+ "id": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7",
+ "env": {
+ "base": {
+ "nameSpace": "",
+ "codeRoot": ""
+ }
+ },
+ "defKey": "PurchaseOrderSku",
+ "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": "defaultValue",
+ "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": "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": "主键Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "114311D1-CF0B-466C-8C24-BBC4E72B7C93"
+ },
+ {
+ "defKey": "ShopId",
+ "defName": "店铺Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "D5E1527C-D9A2-4497-BAC7-06763A5D4823"
+ },
+ {
+ "defKey": "PurchaseOrderId",
+ "defName": "采购单Id",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "2DCD302B-8BE8-493B-99B8-56B72DAC80E5"
+ },
+ {
+ "defKey": "ProductId",
+ "defName": "",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "79937FBB-2F11-4567-B5DA-783797F6B23D"
+ },
+ {
+ "defKey": "SkuId",
+ "defName": "",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "1AE2E6E1-3795-4E77-884C-EEB65FBE9AD9"
+ },
+ {
+ "defKey": "Price",
+ "defName": "单价",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "4B75BE15-58BD-4848-9E56-2B56BD8FDA97"
+ },
+ {
+ "defKey": "SkuTitle",
+ "defName": "Sku标题",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "22C93BB3-D52A-474A-B438-AEB208F752E1"
+ },
+ {
+ "defKey": "Logo",
+ "defName": "Sku Logo",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "9E416CD0-06B0-49AD-87D2-D600A6C7C57D"
+ },
+ {
+ "defKey": "PurchaseSchemeId",
+ "defName": "采购方案Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "593E7A4A-9BAC-457E-A7E5-33C3FAAAC300"
+ },
+ {
+ "defKey": "PurchaseSkuIds",
+ "defName": "采购SkuId串",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 500,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "A229B942-A759-435B-9CD4-63E9F21667DA"
+ },
+ {
+ "defKey": "PurchaseAmount",
+ "defName": "采购金额(采购货款+采购运费)",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "03F1E202-6794-47E0-AE62-05360149C1C1"
+ },
+ {
+ "defKey": "ProductAmount",
+ "defName": "采购货款",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "8FB8CF3A-0537-46B4-BF7B-E37CE3C48EB1"
+ },
+ {
+ "defKey": "PurchaseFreight",
+ "defName": "采购运费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "6D9E60F3-3A57-4C5F-AA18-947985CD56D8"
},
{
- "defKey": "PurchaseOrderId",
- "defName": "采购单Id",
- "comment": "可空",
- "type": "",
- "len": "",
- "scale": "",
+ "defKey": "QualityInspectionAmount",
+ "defName": "质检费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
- "id": "D9669169-6530-4BD3-9409-E2D6722965B6"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "4EEA782A-4E6A-4A15-9504-165A8C772065"
},
{
- "defKey": "OrderId",
- "defName": "订单Id",
+ "defKey": "InStorageAmount",
+ "defName": "入仓费",
"comment": "",
- "type": "VARCHAR",
- "len": 100,
- "scale": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "",
- "id": "3613C402-199D-4642-A8A6-A6A470013475"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "9F05088C-D1A2-4308-AFCE-009232B773BA"
},
{
- "defKey": "PackageType",
- "defName": "包裹类型(采购包裹=0 退货包裹=1)",
+ "defKey": "ConsumableAmount",
+ "defName": "打包耗材费",
"comment": "",
- "type": "",
- "len": "",
- "scale": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
- "id": "ED963E0A-8F45-4C2B-A2E2-6926E5F2C966"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "2BAD0903-5209-4D8B-B024-2B34E8673491"
},
{
- "defKey": "CreateTime",
- "defName": "",
+ "defKey": "FirstFreight",
+ "defName": "头程运费",
"comment": "",
- "type": "",
- "len": "",
- "scale": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
- "id": "3429613A-A50F-45B6-AD8E-6D036FD62C76"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "DD8B2222-6BDB-40BA-A28F-E0F35382B654"
},
{
- "defKey": "UpdateTime",
- "defName": "",
+ "defKey": "CreateTime",
+ "defName": "创建时间",
"comment": "",
- "type": "",
+ "type": "DATETIME",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
- "id": "8624878C-B971-4FF8-9034-C622E64F87DC"
+ "domain": "",
+ "id": "3052ED56-10A7-4CAE-9932-217D2821CBE7"
}
],
"correlations": [],
@@ -9494,16 +11943,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",
@@ -9514,26 +11953,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",
@@ -9574,16 +11993,6 @@
"count": 0,
"originKey": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2"
},
- {
- "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
- "shape": "table",
- "position": {
- "x": -450.5,
- "y": -368
- },
- "count": 0,
- "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
- },
{
"id": "653b5ef3-a1d2-4553-9629-d3525cd0f6cb",
"shape": "table",
@@ -9605,64 +12014,54 @@
"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",
+ "id": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d",
"shape": "table",
"position": {
- "x": -461,
- "y": 180
+ "x": -810,
+ "y": -1222
},
"count": 0,
- "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
+ "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022"
},
{
- "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": "e417b0e0-85e2-4073-977c-60fe6a7479ae",
"shape": "table",
"position": {
- "x": -1054,
- "y": -190
+ "x": 1420,
+ "y": -1040
},
"count": 0,
- "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
+ "originKey": "6036D7E4-7ECB-4888-9D74-58DA414447F8"
},
{
- "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
+ "id": "da49dd57-b256-4f89-9653-8f35edef5a02",
"shape": "table",
"position": {
- "x": -810,
- "y": -874
+ "x": 1420,
+ "y": -793.5
},
"count": 0,
- "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
+ "originKey": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9"
},
{
- "id": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d",
+ "id": "ddf927a6-e081-4c05-937d-bc64f59fc32a",
"shape": "table",
"position": {
- "x": -810,
- "y": -1222
+ "x": 1390,
+ "y": -520
},
"count": 0,
- "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022"
+ "originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E"
},
{
"id": "524fda6a-d71b-4754-b673-ffc91fd753fc",
@@ -10075,34 +12474,44 @@
"fillColor": "#ACDAFC"
},
{
- "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c",
+ "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431",
"shape": "table",
"position": {
- "x": 30,
- "y": 80
+ "x": 560,
+ "y": -167
},
"count": 0,
- "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A"
+ "originKey": "CD64DEB3-500E-48AF-896E-123922A03290"
},
{
- "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
+ "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
"shape": "table",
"position": {
- "x": 30,
- "y": 487
+ "x": -2570,
+ "y": -1440.5
},
"count": 0,
- "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
+ "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
},
{
- "id": "98934117-29b1-4645-a97b-71f379b61bd9",
+ "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
"shape": "table",
"position": {
- "x": 562,
+ "x": -450.5,
+ "y": -368
+ },
+ "count": 0,
+ "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
+ },
+ {
+ "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
+ "shape": "table",
+ "position": {
+ "x": 30,
"y": 487
},
"count": 0,
- "originKey": "379D48BE-3522-413B-8FA3-752D65ADB597"
+ "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
},
{
"id": "af885e60-05ef-40e3-87eb-e8b947deb9a5",
@@ -10115,38 +12524,99 @@
"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": "33dd1974-86a6-4344-9c56-ed081a79fa7f",
+ "shape": "table",
+ "position": {
+ "x": -560,
+ "y": -190
+ },
+ "count": 0,
+ "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A"
+ },
+ {
+ "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
+ "shape": "table",
+ "position": {
+ "x": -810,
+ "y": -874
+ },
+ "count": 0,
+ "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
+ },
+ {
+ "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
+ "shape": "table",
+ "position": {
+ "x": -1054,
+ "y": -190
+ },
+ "count": 0,
+ "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
+ },
+ {
+ "id": "fa539400-f09d-485c-af47-7055dd7beeaa",
+ "shape": "table",
+ "position": {
+ "x": -560,
+ "y": 527
+ },
+ "count": 0,
+ "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9"
+ },
+ {
+ "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2",
+ "shape": "table",
+ "position": {
+ "x": -461,
+ "y": 180
+ },
+ "count": 0,
+ "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
},
{
"id": "6eba7e01-588a-4631-a8a3-9eb43b950339",
"shape": "table",
"position": {
- "x": 40,
- "y": -1000
+ "x": -3270,
+ "y": -1440.5
},
"count": 0,
"originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
},
{
- "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
+ "id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977",
"shape": "table",
"position": {
- "x": 750,
- "y": -923
+ "x": -3220,
+ "y": -69.5
},
"count": 0,
- "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
+ "originKey": "120166EB-7E57-44E5-816C-B8414CB849E9"
+ },
+ {
+ "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac",
+ "shape": "table",
+ "position": {
+ "x": -3215.5,
+ "y": 662
+ },
+ "count": 0,
+ "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7"
}
]
},
- "id": "BE90AFD1-3769-4B95-9BCC-2ADDCF257440"
+ "id": "BE90AFD1-3769-4B95-9BCC-2ADDCF257440",
+ "comment": ""
}
],
"standardFields": [
diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221131929.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004245.pdma.json
similarity index 84%
rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221131929.pdma.json
rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004245.pdma.json
index 05a86bc1..4298ba45 100644
--- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023221131929.pdma.json
+++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004245.pdma.json
@@ -2,9 +2,9 @@
"name": "步步为盈数据库",
"describe": "步步为盈数据库关系图",
"avatar": "",
- "version": "4.1.3",
+ "version": "4.5.1",
"createdTime": "2022-10-3 12:39:39",
- "updatedTime": "2023-2-21 13:19:13",
+ "updatedTime": "2023-4-11 00:42:39",
"dbConns": [],
"profile": {
"default": {
@@ -401,63 +401,156 @@
"headers": [
{
"refKey": "defKey",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "字段代码",
+ "freeze": false
},
{
"refKey": "defName",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "显示名称",
+ "freeze": false
},
{
"refKey": "primaryKey",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "主键",
+ "freeze": false
},
{
"refKey": "notNull",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "不为空",
+ "freeze": false
},
{
"refKey": "autoIncrement",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "自增",
+ "freeze": false
+ },
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true,
+ "value": "默认值",
+ "freeze": false
},
{
"refKey": "domain",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "数据域",
+ "freeze": false
},
{
"refKey": "type",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "数据类型",
+ "freeze": false
},
{
"refKey": "len",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "长度",
+ "freeze": false
},
{
"refKey": "scale",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "小数位数",
+ "freeze": false
},
{
"refKey": "comment",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "说明",
+ "freeze": false
},
{
"refKey": "refDict",
- "hideInGraph": true
- },
- {
- "refKey": "defaultValue",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "数据字典",
+ "freeze": false
},
{
"refKey": "isStandard",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "标准字段",
+ "freeze": false
},
{
"refKey": "uiHint",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "UI建议",
+ "freeze": false
},
{
"refKey": "extProps",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "拓展属性",
+ "freeze": false
+ },
+ {
+ "refKey": "attr1",
+ "value": "拓展字段1",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr2",
+ "value": "拓展字段2",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr3",
+ "value": "拓展字段3",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr4",
+ "value": "拓展字段4",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr5",
+ "value": "拓展字段5",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr6",
+ "value": "拓展字段6",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr7",
+ "value": "拓展字段7",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr8",
+ "value": "拓展字段8",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr9",
+ "value": "拓展字段9",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
}
],
"menuWidth": "269px"
@@ -1150,6 +1243,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -1180,11 +1278,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -1199,9 +1292,63 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "30E9507B-707C-4BCF-99F2-104066BCC3F9",
@@ -1601,6 +1748,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -1631,11 +1783,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -1650,9 +1797,71 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7",
+ "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
+ "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "88311B02-719F-45ED-9603-84EEA4F6F802",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
@@ -2232,6 +2441,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -2262,11 +2476,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -2281,6 +2490,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -2513,6 +2767,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -2543,11 +2802,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -2562,9 +2816,63 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "672717A5-A65E-4A6C-9F10-C4689C92FD45",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E",
@@ -2896,6 +3204,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -2926,11 +3239,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -2945,38 +3253,92 @@
"freeze": false,
"refKey": "extProps",
"hideInGraph": true
- }
- ],
- "correlations": []
- },
- {
- "id": "379D48BE-3522-413B-8FA3-752D65ADB597",
- "defKey": "ordercostdetail",
- "defName": "订单成本明细表",
- "comment": "",
- "properties": {},
- "fields": [
+ },
{
- "defKey": "Id",
- "defName": "",
- "comment": null,
- "domain": "",
- "type": "BIGINT",
- "len": 20,
- "scale": "",
- "primaryKey": true,
- "notNull": true,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "id": "C0C5E176-74A5-4902-B614-ACA078DF5E63",
- "extProps": {}
+ "refKey": "attr1",
+ "freeze": false,
+ "hideInGraph": true
},
{
- "defKey": "OrderId",
- "defName": "",
- "comment": null,
+ "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
+ }
+ ],
+ "correlations": [
+ {
+ "myField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
+ },
+ {
+ "id": "379D48BE-3522-413B-8FA3-752D65ADB597",
+ "defKey": "ordercostdetail",
+ "defName": "订单成本明细表",
+ "comment": "",
+ "properties": {},
+ "fields": [
+ {
+ "defKey": "Id",
+ "defName": "",
+ "comment": null,
+ "domain": "",
+ "type": "BIGINT",
+ "len": 20,
+ "scale": "",
+ "primaryKey": true,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "id": "C0C5E176-74A5-4902-B614-ACA078DF5E63",
+ "extProps": {}
+ },
+ {
+ "defKey": "OrderId",
+ "defName": "",
+ "comment": null,
"domain": "",
"type": "VARCHAR",
"len": 50,
@@ -3333,6 +3695,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -3363,11 +3730,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -3382,9 +3744,71 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "65A1A6ED-EF2C-4369-8CCB-B6E762EEF9D0",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "E85EE812-0F49-49B3-8FBD-E6435CF08CDA",
+ "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
+ "refField": "B503CFCF-19DA-4D5B-9416-C3DD65E477CD",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1",
@@ -3544,6 +3968,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -3574,11 +4003,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -3593,9 +4017,63 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A",
@@ -3891,6 +4369,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -3921,11 +4404,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -3940,9 +4418,79 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "C2FE946F-02B4-4B24-9AA4-433A6E98F7A9",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9",
+ "refEntity": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
+ "refField": "1012CEB5-702E-428F-ABEF-17BD9856E4E3",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "93852E9B-AD50-40B6-A131-B62EFFE3438C",
+ "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
+ "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74",
@@ -4218,6 +4766,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -4248,11 +4801,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4267,9 +4815,63 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213",
@@ -4399,7 +5001,12 @@
},
{
"freeze": false,
- "refKey": "domain",
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
+ {
+ "freeze": false,
+ "refKey": "domain",
"hideInGraph": true
},
{
@@ -4427,11 +5034,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4446,6 +5048,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -4656,6 +5303,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -4686,11 +5338,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4705,6 +5352,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -4932,6 +5624,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -4962,11 +5659,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4981,9 +5673,63 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE",
+ "refEntity": "6036D7E4-7ECB-4888-9D74-58DA414447F8",
+ "refField": "0EE3108C-0995-4D82-AA03-FF63F0D62626",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
@@ -5211,6 +5957,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -5241,11 +5992,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -5260,6 +6006,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -5699,6 +6490,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -5729,11 +6525,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -5748,6 +6539,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -5878,6 +6714,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -5908,11 +6749,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -5927,20 +6763,65 @@
"freeze": false,
"refKey": "extProps",
"hideInGraph": true
- }
- ],
- "correlations": []
- },
- {
- "id": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE",
- "defKey": "purchaser",
- "defName": "采购商表",
- "comment": "",
- "properties": {},
- "fields": [
+ },
{
- "defKey": "Id",
- "defName": "采购商Id",
+ "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
+ }
+ ],
+ "correlations": []
+ },
+ {
+ "id": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE",
+ "defKey": "purchaser",
+ "defName": "采购商表",
+ "comment": "",
+ "properties": {},
+ "fields": [
+ {
+ "defKey": "Id",
+ "defName": "采购商Id",
"comment": "",
"domain": "",
"type": "VARCHAR",
@@ -6023,6 +6904,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6053,11 +6939,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6072,6 +6953,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -6270,6 +7196,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6300,11 +7231,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6319,9 +7245,63 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E",
+ "refEntity": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE",
+ "refField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
@@ -6483,6 +7463,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6513,11 +7498,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6532,9 +7512,63 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "98F8F005-A630-4C98-8C1F-ECCA64E65996",
+ "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
+ "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2",
@@ -6713,6 +7747,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6743,11 +7782,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6762,9 +7796,71 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "61C58DEB-2779-451F-82AD-3B03BC9C795D",
+ "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
+ "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "4C09B365-4B2A-4613-9133-DF0421BFC85C",
+ "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
+ "refField": "41BFEC37-8F13-42D0-B8ED-123071447D18",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "65A6F4A2-D006-4FC7-BED7-53209273F05E",
@@ -6909,6 +8005,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6939,11 +8040,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6958,14 +8054,59 @@
"freeze": false,
"refKey": "extProps",
"hideInGraph": true
- }
- ],
- "correlations": []
- },
- {
- "id": "91555D00-CE97-4666-94BA-E83996533E52",
- "env": {
- "base": {
+ },
+ {
+ "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
+ }
+ ],
+ "correlations": []
+ },
+ {
+ "id": "91555D00-CE97-4666-94BA-E83996533E52",
+ "env": {
+ "base": {
"nameSpace": "",
"codeRoot": ""
}
@@ -7007,6 +8148,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -7031,10 +8176,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -7046,6 +8187,51 @@
{
"refKey": "extProps",
"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": [
@@ -7220,7 +8406,16 @@
"id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9"
}
],
- "correlations": [],
+ "correlations": [
+ {
+ "myField": "A3C3A9A6-05BF-4514-9789-15C5732F7241",
+ "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
+ "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ],
"indexes": []
},
{
@@ -7268,6 +8463,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -7292,10 +8491,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -7307,6 +8502,51 @@
{
"refKey": "extProps",
"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": [
@@ -7580,6 +8820,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -7604,10 +8848,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -7619,6 +8859,51 @@
{
"refKey": "extProps",
"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": [
@@ -7861,7 +9146,24 @@
"id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
}
],
- "correlations": [],
+ "correlations": [
+ {
+ "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
+ "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "16E62919-C979-4830-930A-EAE234252B2F",
+ "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
+ "refField": "81703BD3-514F-4E8E-8898-54FDBFF90D7A",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ],
"indexes": []
},
{
@@ -7909,6 +9211,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -7933,10 +9239,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -7948,6 +9250,51 @@
{
"refKey": "extProps",
"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": [
@@ -8204,6 +9551,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -8228,10 +9579,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -8243,28 +9590,73 @@
{
"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": "8CED822B-CAC9-4BB7-88C8-22B374C2473D"
+ "refKey": "attr1",
+ "freeze": false,
+ "hideInGraph": true
},
{
- "defKey": "ShopId",
+ "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": {},
+ "domain": "",
+ "id": "8CED822B-CAC9-4BB7-88C8-22B374C2473D"
+ },
+ {
+ "defKey": "ShopId",
"defName": "",
"comment": "",
"type": "bigint",
@@ -8519,7 +9911,32 @@
"id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
}
],
- "correlations": [],
+ "correlations": [
+ {
+ "myField": "5F519CD5-5B0E-4C18-99AD-CD24BADE9ED3",
+ "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
+ "refField": "ED33CB09-DBB2-4FD6-B3E9-BEE77BD14B63",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
+ "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "58444AC3-3BDE-408A-BE47-3C063EC54731",
+ "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386",
+ "refField": "16E62919-C979-4830-930A-EAE234252B2F",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ],
"indexes": []
},
{
@@ -8567,6 +9984,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -8591,10 +10012,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -8606,6 +10023,51 @@
{
"refKey": "extProps",
"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": [
@@ -8675,6 +10137,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -8699,10 +10165,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -8714,6 +10176,51 @@
{
"refKey": "extProps",
"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": [
@@ -8761,84 +10268,1276 @@
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "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": []
+ },
+ {
+ "id": "120166EB-7E57-44E5-816C-B8414CB849E9",
+ "env": {
+ "base": {
+ "nameSpace": "",
+ "codeRoot": ""
+ }
+ },
+ "defKey": "PurchaseOrderV2",
+ "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",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "defName",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "primaryKey",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "notNull",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "autoIncrement",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "defaultValue",
+ "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": "isStandard",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "uiHint",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "extProps",
+ "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": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": true,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "5B59C70B-1BAC-426C-9411-E0AAFE7E23AE"
+ },
+ {
+ "defKey": "ShopId",
+ "defName": "店铺Id",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "0D6455C2-F162-4A53-BB50-A440B07B6124"
+ },
+ {
+ "defKey": "OrderState",
+ "defName": "采购单状态(待付款=0,待发货=1,待收货=2,待质检=3,待打包=4,待结算=5,已完成=6)",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "B4555CB9-B8F9-4504-A3CF-24E2FD021A3C"
+ },
+ {
+ "defKey": "PurchasePlatform",
+ "defName": "采购平台",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "BCB6AD22-1A67-4060-8A48-18784F96F26D"
+ },
+ {
+ "defKey": "ConsigneeContactName",
+ "defName": "收货联系人名称",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 50,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "ECB913D8-FB06-4F71-8841-658E3FDEDD4D"
+ },
+ {
+ "defKey": "ConsigneeMobile",
+ "defName": "收货联系人电话",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 50,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "B8860175-A29B-4220-A304-0F427757A8FE"
+ },
+ {
+ "defKey": "ConsigneeProvince",
+ "defName": "收货省",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "E750B8CC-A468-413B-81BA-4EC5BBB10FBA"
+ },
+ {
+ "defKey": "ConsigneeCity",
+ "defName": "收货市",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "9C53606E-3654-4EB2-8258-F7B7272BF2B0"
+ },
+ {
+ "defKey": "ConsigneeCounty",
+ "defName": "收货区",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "A7EF581E-E892-40BF-80B2-F127103806C1"
+ },
+ {
+ "defKey": "ConsigneeTown",
+ "defName": "收货镇",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "0A6A563C-E622-4457-A3B0-78D93176056A"
+ },
+ {
+ "defKey": "ConsigneeAddress",
+ "defName": "收货详细地址",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "AC3C8987-B0FE-4A7B-9D9F-596440862B34"
+ },
+ {
+ "defKey": "IsSubscribeKuaiDi100",
+ "defName": "是否订阅快递100",
+ "comment": "",
+ "type": "bit",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "52384F84-B941-419F-8F7B-A5CD575261C1"
+ },
+ {
+ "defKey": "WaybillNo",
+ "defName": "快递单号",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "2AFE305D-F7C1-4E7C-B319-546521CBE6CD"
+ },
+ {
+ "defKey": "ExpressName",
+ "defName": "快递公司",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "206B633B-7BA8-4AA6-AF3B-FBB60E11B803"
+ },
+ {
+ "defKey": "PurchaserId",
+ "defName": "商家Id",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 20,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "254CDA6E-6229-4734-8DB9-FD955D0EBCA7"
+ },
+ {
+ "defKey": "PurchaserName",
+ "defName": "商家名称",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "528065AB-9838-43DF-AA9C-5ABFB7FC9FE7"
+ },
+ {
+ "defKey": "PurchaseAccountId",
+ "defName": "采购账号Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "D1260679-C8DE-4EF4-8BA4-8110F6C93E85"
+ },
+ {
+ "defKey": "PurchaseAmount",
+ "defName": "采购金额(采购货款+采购运费)",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "195E2AA0-A2AE-406F-807D-749C230718B7"
+ },
+ {
+ "defKey": "ProductAmount",
+ "defName": "采购货款",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "8C24111F-1182-4FD5-A452-AC612A69F5F7"
+ },
+ {
+ "defKey": "PurchaseFreight",
+ "defName": "采购运费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "46B5C831-B0C5-435B-A46E-A0FB98B5FCE2"
+ },
+ {
+ "defKey": "QualityInspectionAmount",
+ "defName": "质检费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "E6364306-BDAB-4C3A-BF9F-E5FE01A1252F"
+ },
+ {
+ "defKey": "InStorageAmount",
+ "defName": "入仓费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "C4757207-8991-4CA7-9902-63719918B5BB"
+ },
+ {
+ "defKey": "ConsumableAmount",
+ "defName": "打包耗材费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "E511367E-25CC-4FB1-A18B-BD909523DB75"
+ },
+ {
+ "defKey": "FirstFreight",
+ "defName": "头程运费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "45C45A42-72FC-4D57-B121-F0C8AB8B7264"
+ },
+ {
+ "defKey": "IsConvertToStock",
+ "defName": "是否转入库存",
+ "comment": "",
+ "type": "bit",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "38B841BE-111D-42A8-B538-308C71374F17"
+ },
+ {
+ "defKey": "Remark",
+ "defName": "备注信息",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "6E1DEE72-FA9D-49B6-A885-9CD62C5EAEA4"
+ },
+ {
+ "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": "03286487-0FAA-46C3-97CC-6E7C3B8E58FE"
+ },
+ {
+ "defKey": "PayTime",
+ "defName": "支付时间",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "6608DCEC-B512-4F5D-AB8F-AF69F45C690A"
+ },
+ {
+ "defKey": "SignTime",
+ "defName": "签收时间",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "B9418547-11CD-447E-9B55-81563EC99743"
+ },
+ {
+ "defKey": "CompletionTime",
+ "defName": "完成时间",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "2ED49BCC-4CA9-4793-9061-157C85E10A71"
+ }
+ ],
+ "correlations": [],
+ "indexes": []
+ },
+ {
+ "id": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7",
+ "env": {
+ "base": {
+ "nameSpace": "",
+ "codeRoot": ""
+ }
+ },
+ "defKey": "PurchaseOrderSku",
+ "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": "defaultValue",
+ "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": "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": "主键Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "114311D1-CF0B-466C-8C24-BBC4E72B7C93"
+ },
+ {
+ "defKey": "ShopId",
+ "defName": "店铺Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "D5E1527C-D9A2-4497-BAC7-06763A5D4823"
+ },
+ {
+ "defKey": "PurchaseOrderId",
+ "defName": "采购单Id",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "2DCD302B-8BE8-493B-99B8-56B72DAC80E5"
+ },
+ {
+ "defKey": "ProductId",
+ "defName": "",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "79937FBB-2F11-4567-B5DA-783797F6B23D"
+ },
+ {
+ "defKey": "SkuId",
+ "defName": "",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "1AE2E6E1-3795-4E77-884C-EEB65FBE9AD9"
+ },
+ {
+ "defKey": "Price",
+ "defName": "单价",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "4B75BE15-58BD-4848-9E56-2B56BD8FDA97"
+ },
+ {
+ "defKey": "SkuTitle",
+ "defName": "Sku标题",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "22C93BB3-D52A-474A-B438-AEB208F752E1"
+ },
+ {
+ "defKey": "Logo",
+ "defName": "Sku Logo",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "9E416CD0-06B0-49AD-87D2-D600A6C7C57D"
+ },
+ {
+ "defKey": "PurchaseSchemeId",
+ "defName": "采购方案Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "593E7A4A-9BAC-457E-A7E5-33C3FAAAC300"
+ },
+ {
+ "defKey": "PurchaseSkuIds",
+ "defName": "采购SkuId串",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 500,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "A229B942-A759-435B-9CD4-63E9F21667DA"
+ },
+ {
+ "defKey": "PurchaseAmount",
+ "defName": "采购金额(采购货款+采购运费)",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "03F1E202-6794-47E0-AE62-05360149C1C1"
+ },
+ {
+ "defKey": "ProductAmount",
+ "defName": "采购货款",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "8FB8CF3A-0537-46B4-BF7B-E37CE3C48EB1"
+ },
+ {
+ "defKey": "PurchaseFreight",
+ "defName": "采购运费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "6D9E60F3-3A57-4C5F-AA18-947985CD56D8"
+ },
+ {
+ "defKey": "QualityInspectionAmount",
+ "defName": "质检费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "",
- "id": "1C4B4271-9640-4A78-A0DA-E13584257C9E"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "4EEA782A-4E6A-4A15-9504-165A8C772065"
},
{
- "defKey": "TransportDetails",
- "defName": "运输详情",
+ "defKey": "InStorageAmount",
+ "defName": "入仓费",
"comment": "",
- "type": "VARCHAR",
- "len": 1000,
- "scale": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "",
- "id": "424E3E7E-798E-4219-A41C-E17C09EDF8C1"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "9F05088C-D1A2-4308-AFCE-009232B773BA"
},
{
- "defKey": "ServiceId",
- "defName": "服务单Id",
- "comment": "可空",
- "type": "bigint",
- "len": "",
- "scale": "",
+ "defKey": "ConsumableAmount",
+ "defName": "打包耗材费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "",
- "id": "B20CC0B7-A0CF-4B6F-A104-C90AA0EF8C0A"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "2BAD0903-5209-4D8B-B024-2B34E8673491"
},
{
- "defKey": "PurchaseOrderId",
- "defName": "采购单Id",
- "comment": "可空",
- "type": "",
- "len": "",
- "scale": "",
+ "defKey": "FirstFreight",
+ "defName": "头程运费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
- "id": "D9669169-6530-4BD3-9409-E2D6722965B6"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "DD8B2222-6BDB-40BA-A28F-E0F35382B654"
},
{
- "defKey": "OrderId",
- "defName": "订单Id",
+ "defKey": "CreateTime",
+ "defName": "创建时间",
"comment": "",
- "type": "VARCHAR",
- "len": 100,
+ "type": "DATETIME",
+ "len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
- "id": "3613C402-199D-4642-A8A6-A6A470013475"
+ "id": "3052ED56-10A7-4CAE-9932-217D2821CBE7"
},
{
- "defKey": "PackageType",
- "defName": "包裹类型(采购包裹=0 退货包裹=1)",
+ "defKey": "Quantity",
+ "defName": "采购数量",
"comment": "",
"type": "",
"len": "",
@@ -8850,8 +11549,8 @@
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
- "id": "ED963E0A-8F45-4C2B-A2E2-6926E5F2C966"
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "C5FED921-4898-4544-8143-A315F5C49E0B"
}
],
"correlations": [],
@@ -9460,16 +12159,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",
@@ -9480,26 +12169,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",
@@ -9540,16 +12209,6 @@
"count": 0,
"originKey": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2"
},
- {
- "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
- "shape": "table",
- "position": {
- "x": -450.5,
- "y": -368
- },
- "count": 0,
- "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
- },
{
"id": "653b5ef3-a1d2-4553-9629-d3525cd0f6cb",
"shape": "table",
@@ -9571,64 +12230,54 @@
"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",
+ "id": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d",
"shape": "table",
"position": {
- "x": -461,
- "y": 180
+ "x": -810,
+ "y": -1222
},
"count": 0,
- "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
+ "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022"
},
{
- "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": "e417b0e0-85e2-4073-977c-60fe6a7479ae",
"shape": "table",
"position": {
- "x": -1054,
- "y": -190
+ "x": 1420,
+ "y": -1040
},
"count": 0,
- "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
+ "originKey": "6036D7E4-7ECB-4888-9D74-58DA414447F8"
},
{
- "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
+ "id": "da49dd57-b256-4f89-9653-8f35edef5a02",
"shape": "table",
"position": {
- "x": -810,
- "y": -874
+ "x": 1420,
+ "y": -793.5
},
"count": 0,
- "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
+ "originKey": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9"
},
{
- "id": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d",
+ "id": "ddf927a6-e081-4c05-937d-bc64f59fc32a",
"shape": "table",
"position": {
- "x": -810,
- "y": -1222
+ "x": 1390,
+ "y": -520
},
"count": 0,
- "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022"
+ "originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E"
},
{
"id": "524fda6a-d71b-4754-b673-ffc91fd753fc",
@@ -10041,34 +12690,44 @@
"fillColor": "#ACDAFC"
},
{
- "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c",
+ "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431",
"shape": "table",
"position": {
- "x": 30,
- "y": 80
+ "x": 560,
+ "y": -167
},
"count": 0,
- "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A"
+ "originKey": "CD64DEB3-500E-48AF-896E-123922A03290"
},
{
- "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
+ "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
"shape": "table",
"position": {
- "x": 30,
- "y": 487
+ "x": -2570,
+ "y": -1440.5
},
"count": 0,
- "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
+ "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
},
{
- "id": "98934117-29b1-4645-a97b-71f379b61bd9",
+ "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
"shape": "table",
"position": {
- "x": 562,
+ "x": -450.5,
+ "y": -368
+ },
+ "count": 0,
+ "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
+ },
+ {
+ "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
+ "shape": "table",
+ "position": {
+ "x": 30,
"y": 487
},
"count": 0,
- "originKey": "379D48BE-3522-413B-8FA3-752D65ADB597"
+ "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
},
{
"id": "af885e60-05ef-40e3-87eb-e8b947deb9a5",
@@ -10081,38 +12740,99 @@
"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": "33dd1974-86a6-4344-9c56-ed081a79fa7f",
+ "shape": "table",
+ "position": {
+ "x": -560,
+ "y": -190
+ },
+ "count": 0,
+ "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A"
+ },
+ {
+ "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
+ "shape": "table",
+ "position": {
+ "x": -810,
+ "y": -874
+ },
+ "count": 0,
+ "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
+ },
+ {
+ "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
+ "shape": "table",
+ "position": {
+ "x": -1054,
+ "y": -190
+ },
+ "count": 0,
+ "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
+ },
+ {
+ "id": "fa539400-f09d-485c-af47-7055dd7beeaa",
+ "shape": "table",
+ "position": {
+ "x": -560,
+ "y": 527
+ },
+ "count": 0,
+ "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9"
+ },
+ {
+ "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2",
+ "shape": "table",
+ "position": {
+ "x": -461,
+ "y": 180
+ },
+ "count": 0,
+ "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
},
{
"id": "6eba7e01-588a-4631-a8a3-9eb43b950339",
"shape": "table",
"position": {
- "x": 40,
- "y": -1000
+ "x": -3270,
+ "y": -1440.5
},
"count": 0,
"originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
},
{
- "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
+ "id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977",
"shape": "table",
"position": {
- "x": 750,
- "y": -923
+ "x": -3220,
+ "y": -69.5
},
"count": 0,
- "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
+ "originKey": "120166EB-7E57-44E5-816C-B8414CB849E9"
+ },
+ {
+ "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac",
+ "shape": "table",
+ "position": {
+ "x": -3215.5,
+ "y": 699
+ },
+ "count": 0,
+ "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7"
}
]
},
- "id": "BE90AFD1-3769-4B95-9BCC-2ADDCF257440"
+ "id": "BE90AFD1-3769-4B95-9BCC-2ADDCF257440",
+ "comment": ""
}
],
"standardFields": [
diff --git a/doc/步步为盈数据库.pdma.json b/doc/步步为盈数据库.pdma.json
index 962d37e8..a91b31e7 100644
--- a/doc/步步为盈数据库.pdma.json
+++ b/doc/步步为盈数据库.pdma.json
@@ -2,9 +2,9 @@
"name": "步步为盈数据库",
"describe": "步步为盈数据库关系图",
"avatar": "",
- "version": "4.1.3",
+ "version": "4.5.1",
"createdTime": "2022-10-3 12:39:39",
- "updatedTime": "2023-2-21 13:20:27",
+ "updatedTime": "2023-4-11 00:42:45",
"dbConns": [],
"profile": {
"default": {
@@ -401,63 +401,156 @@
"headers": [
{
"refKey": "defKey",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "字段代码",
+ "freeze": false
},
{
"refKey": "defName",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "显示名称",
+ "freeze": false
},
{
"refKey": "primaryKey",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "主键",
+ "freeze": false
},
{
"refKey": "notNull",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "不为空",
+ "freeze": false
},
{
"refKey": "autoIncrement",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "自增",
+ "freeze": false
+ },
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true,
+ "value": "默认值",
+ "freeze": false
},
{
"refKey": "domain",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "数据域",
+ "freeze": false
},
{
"refKey": "type",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "数据类型",
+ "freeze": false
},
{
"refKey": "len",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "长度",
+ "freeze": false
},
{
"refKey": "scale",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "小数位数",
+ "freeze": false
},
{
"refKey": "comment",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "说明",
+ "freeze": false
},
{
"refKey": "refDict",
- "hideInGraph": true
- },
- {
- "refKey": "defaultValue",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "数据字典",
+ "freeze": false
},
{
"refKey": "isStandard",
- "hideInGraph": false
+ "hideInGraph": false,
+ "value": "标准字段",
+ "freeze": false
},
{
"refKey": "uiHint",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "UI建议",
+ "freeze": false
},
{
"refKey": "extProps",
- "hideInGraph": true
+ "hideInGraph": true,
+ "value": "拓展属性",
+ "freeze": false
+ },
+ {
+ "refKey": "attr1",
+ "value": "拓展字段1",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr2",
+ "value": "拓展字段2",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr3",
+ "value": "拓展字段3",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr4",
+ "value": "拓展字段4",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr5",
+ "value": "拓展字段5",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr6",
+ "value": "拓展字段6",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr7",
+ "value": "拓展字段7",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr8",
+ "value": "拓展字段8",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
+ },
+ {
+ "refKey": "attr9",
+ "value": "拓展字段9",
+ "hideInGraph": true,
+ "enable": false,
+ "freeze": false
}
],
"menuWidth": "269px"
@@ -1150,6 +1243,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -1180,11 +1278,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -1199,6 +1292,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -1601,6 +1739,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -1631,11 +1774,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -1650,6 +1788,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -2232,6 +2415,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -2262,11 +2450,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -2281,74 +2464,54 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "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",
@@ -2578,6 +2741,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -2608,11 +2776,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -2627,6 +2790,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -2961,6 +3169,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -2991,11 +3204,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -3010,6 +3218,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -3398,6 +3651,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -3428,11 +3686,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -3447,6 +3700,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -3609,6 +3907,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -3639,11 +3942,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -3658,6 +3956,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -3956,6 +4299,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -3986,11 +4334,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4005,6 +4348,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -4283,6 +4671,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -4313,11 +4706,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4332,6 +4720,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -4462,6 +4895,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -4492,11 +4930,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4511,6 +4944,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -4721,6 +5199,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -4751,11 +5234,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -4770,31 +5248,67 @@
"freeze": false,
"refKey": "extProps",
"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": ""
- }
- ]
- },
- {
- "id": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9",
- "defKey": "productsku",
- "defName": "产品Sku表",
- "comment": "",
- "properties": {},
- "fields": [
+ },
{
- "defKey": "Id",
- "defName": "SKU",
- "comment": "",
- "domain": "",
+ "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
+ }
+ ],
+ "correlations": []
+ },
+ {
+ "id": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9",
+ "defKey": "productsku",
+ "defName": "产品Sku表",
+ "comment": "",
+ "properties": {},
+ "fields": [
+ {
+ "defKey": "Id",
+ "defName": "SKU",
+ "comment": "",
+ "domain": "",
"type": "VARCHAR",
"len": 50,
"scale": "",
@@ -5006,6 +5520,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -5036,11 +5555,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -5055,6 +5569,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -5285,6 +5844,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -5315,11 +5879,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -5334,18 +5893,54 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "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",
@@ -5782,6 +6377,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -5812,11 +6412,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -5831,34 +6426,54 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "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",
@@ -5986,6 +6601,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6016,11 +6636,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6035,6 +6650,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -6131,6 +6791,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6161,11 +6826,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6180,23 +6840,59 @@
"freeze": false,
"refKey": "extProps",
"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": ""
- }
- ]
- },
- {
- "id": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
- "defKey": "purchasescheme",
- "defName": "采购方案表",
+ },
+ {
+ "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
+ }
+ ],
+ "correlations": []
+ },
+ {
+ "id": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
+ "defKey": "purchasescheme",
+ "defName": "采购方案表",
"comment": "",
"properties": {},
"fields": [
@@ -6387,6 +7083,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6417,11 +7118,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6436,26 +7132,54 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "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",
@@ -6617,6 +7341,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6647,11 +7376,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6666,18 +7390,54 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
- "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",
@@ -6856,6 +7616,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -6886,11 +7651,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -6905,6 +7665,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -7052,6 +7857,11 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "freeze": false,
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"freeze": false,
"refKey": "domain",
@@ -7082,11 +7892,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "freeze": false,
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"freeze": false,
"refKey": "isStandard",
@@ -7101,6 +7906,51 @@
"freeze": false,
"refKey": "extProps",
"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
}
],
"correlations": []
@@ -7150,6 +8000,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -7174,10 +8028,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -7189,22 +8039,67 @@
{
"refKey": "extProps",
"hideInGraph": true
- }
- ],
- "fields": [
+ },
{
- "defKey": "Id",
- "defName": "",
- "comment": "",
- "type": "bigint",
- "len": "",
- "scale": "",
- "primaryKey": true,
- "notNull": true,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
+ "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": {},
"domain": "",
"id": "15199F73-CD7A-48E7-AE50-75D567053C30"
@@ -7363,24 +8258,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": []
},
{
@@ -7428,6 +8306,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -7452,10 +8334,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -7467,6 +8345,51 @@
{
"refKey": "extProps",
"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": [
@@ -7692,32 +8615,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": []
},
{
@@ -7765,6 +8663,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -7789,10 +8691,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -7804,6 +8702,51 @@
{
"refKey": "extProps",
"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": [
@@ -8046,16 +8989,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": []
},
{
@@ -8103,6 +9037,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -8127,10 +9065,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -8142,6 +9076,51 @@
{
"refKey": "extProps",
"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": [
@@ -8398,6 +9377,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -8422,10 +9405,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -8437,6 +9416,51 @@
{
"refKey": "extProps",
"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": [
@@ -8761,6 +9785,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -8785,10 +9813,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -8800,19 +9824,64 @@
{
"refKey": "extProps",
"hideInGraph": true
- }
- ],
- "fields": [
+ },
{
- "defKey": "ServiceId",
- "defName": "服务单Id",
- "comment": "",
- "type": "bigint",
- "len": "",
- "scale": "",
- "primaryKey": true,
- "notNull": true,
- "autoIncrement": false,
+ "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": "ServiceId",
+ "defName": "服务单Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": true,
+ "notNull": true,
+ "autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
@@ -8869,6 +9938,10 @@
"refKey": "autoIncrement",
"hideInGraph": true
},
+ {
+ "refKey": "defaultValue",
+ "hideInGraph": true
+ },
{
"refKey": "domain",
"hideInGraph": true
@@ -8893,10 +9966,6 @@
"refKey": "refDict",
"hideInGraph": true
},
- {
- "refKey": "defaultValue",
- "hideInGraph": true
- },
{
"refKey": "isStandard",
"hideInGraph": false
@@ -8908,6 +9977,51 @@
{
"refKey": "extProps",
"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": [
@@ -8926,14 +10040,1136 @@
"refDict": "",
"extProps": {},
"domain": "",
- "id": "086E73E3-16A5-4DB2-B7F3-1D6B46500A35"
+ "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": []
+ },
+ {
+ "id": "120166EB-7E57-44E5-816C-B8414CB849E9",
+ "env": {
+ "base": {
+ "nameSpace": "",
+ "codeRoot": ""
+ }
+ },
+ "defKey": "PurchaseOrderV2",
+ "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",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "defName",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "primaryKey",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "notNull",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "autoIncrement",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "defaultValue",
+ "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": "isStandard",
+ "hideInGraph": false
+ },
+ {
+ "refKey": "uiHint",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "extProps",
+ "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": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": true,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "5B59C70B-1BAC-426C-9411-E0AAFE7E23AE"
+ },
+ {
+ "defKey": "ShopId",
+ "defName": "店铺Id",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "0D6455C2-F162-4A53-BB50-A440B07B6124"
+ },
+ {
+ "defKey": "OrderState",
+ "defName": "采购单状态(待付款=0,待发货=1,待收货=2,待质检=3,待打包=4,待结算=5,已完成=6)",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "B4555CB9-B8F9-4504-A3CF-24E2FD021A3C"
+ },
+ {
+ "defKey": "PurchasePlatform",
+ "defName": "采购平台",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "BCB6AD22-1A67-4060-8A48-18784F96F26D"
+ },
+ {
+ "defKey": "ConsigneeContactName",
+ "defName": "收货联系人名称",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 50,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "ECB913D8-FB06-4F71-8841-658E3FDEDD4D"
+ },
+ {
+ "defKey": "ConsigneeMobile",
+ "defName": "收货联系人电话",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 50,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "B8860175-A29B-4220-A304-0F427757A8FE"
+ },
+ {
+ "defKey": "ConsigneeProvince",
+ "defName": "收货省",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "E750B8CC-A468-413B-81BA-4EC5BBB10FBA"
+ },
+ {
+ "defKey": "ConsigneeCity",
+ "defName": "收货市",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "9C53606E-3654-4EB2-8258-F7B7272BF2B0"
+ },
+ {
+ "defKey": "ConsigneeCounty",
+ "defName": "收货区",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "A7EF581E-E892-40BF-80B2-F127103806C1"
+ },
+ {
+ "defKey": "ConsigneeTown",
+ "defName": "收货镇",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 30,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "0A6A563C-E622-4457-A3B0-78D93176056A"
+ },
+ {
+ "defKey": "ConsigneeAddress",
+ "defName": "收货详细地址",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "AC3C8987-B0FE-4A7B-9D9F-596440862B34"
+ },
+ {
+ "defKey": "IsSubscribeKuaiDi100",
+ "defName": "是否订阅快递100",
+ "comment": "",
+ "type": "bit",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "52384F84-B941-419F-8F7B-A5CD575261C1"
+ },
+ {
+ "defKey": "WaybillNo",
+ "defName": "快递单号",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "2AFE305D-F7C1-4E7C-B319-546521CBE6CD"
+ },
+ {
+ "defKey": "ExpressName",
+ "defName": "快递公司",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "206B633B-7BA8-4AA6-AF3B-FBB60E11B803"
+ },
+ {
+ "defKey": "PurchaserId",
+ "defName": "商家Id",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 20,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "254CDA6E-6229-4734-8DB9-FD955D0EBCA7"
+ },
+ {
+ "defKey": "PurchaserName",
+ "defName": "商家名称",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "528065AB-9838-43DF-AA9C-5ABFB7FC9FE7"
+ },
+ {
+ "defKey": "PurchaseAccountId",
+ "defName": "采购账号Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "D1260679-C8DE-4EF4-8BA4-8110F6C93E85"
+ },
+ {
+ "defKey": "PurchaseAmount",
+ "defName": "采购金额(采购货款+采购运费)",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "195E2AA0-A2AE-406F-807D-749C230718B7"
+ },
+ {
+ "defKey": "ProductAmount",
+ "defName": "采购货款",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "8C24111F-1182-4FD5-A452-AC612A69F5F7"
+ },
+ {
+ "defKey": "PurchaseFreight",
+ "defName": "采购运费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "46B5C831-B0C5-435B-A46E-A0FB98B5FCE2"
+ },
+ {
+ "defKey": "QualityInspectionAmount",
+ "defName": "质检费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "E6364306-BDAB-4C3A-BF9F-E5FE01A1252F"
+ },
+ {
+ "defKey": "InStorageAmount",
+ "defName": "入仓费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "C4757207-8991-4CA7-9902-63719918B5BB"
+ },
+ {
+ "defKey": "ConsumableAmount",
+ "defName": "打包耗材费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "E511367E-25CC-4FB1-A18B-BD909523DB75"
+ },
+ {
+ "defKey": "FirstFreight",
+ "defName": "头程运费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "45C45A42-72FC-4D57-B121-F0C8AB8B7264"
+ },
+ {
+ "defKey": "IsConvertToStock",
+ "defName": "是否转入库存",
+ "comment": "",
+ "type": "bit",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "38B841BE-111D-42A8-B538-308C71374F17"
+ },
+ {
+ "defKey": "Remark",
+ "defName": "备注信息",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "6E1DEE72-FA9D-49B6-A885-9CD62C5EAEA4"
+ },
+ {
+ "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": "03286487-0FAA-46C3-97CC-6E7C3B8E58FE"
+ },
+ {
+ "defKey": "PayTime",
+ "defName": "支付时间",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "6608DCEC-B512-4F5D-AB8F-AF69F45C690A"
+ },
+ {
+ "defKey": "SignTime",
+ "defName": "签收时间",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "B9418547-11CD-447E-9B55-81563EC99743"
+ },
+ {
+ "defKey": "CompletionTime",
+ "defName": "完成时间",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "2ED49BCC-4CA9-4793-9061-157C85E10A71"
+ }
+ ],
+ "correlations": [],
+ "indexes": []
+ },
+ {
+ "id": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7",
+ "env": {
+ "base": {
+ "nameSpace": "",
+ "codeRoot": ""
+ }
+ },
+ "defKey": "PurchaseOrderSku",
+ "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": "defaultValue",
+ "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": "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": "主键Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "114311D1-CF0B-466C-8C24-BBC4E72B7C93"
+ },
+ {
+ "defKey": "ShopId",
+ "defName": "店铺Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "D5E1527C-D9A2-4497-BAC7-06763A5D4823"
+ },
+ {
+ "defKey": "PurchaseOrderId",
+ "defName": "采购单Id",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "2DCD302B-8BE8-493B-99B8-56B72DAC80E5"
+ },
+ {
+ "defKey": "ProductId",
+ "defName": "",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "79937FBB-2F11-4567-B5DA-783797F6B23D"
+ },
+ {
+ "defKey": "SkuId",
+ "defName": "",
+ "comment": "",
+ "type": "VARCHAR",
+ "len": 100,
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "1AE2E6E1-3795-4E77-884C-EEB65FBE9AD9"
+ },
+ {
+ "defKey": "Price",
+ "defName": "单价",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "0.00",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "4B75BE15-58BD-4848-9E56-2B56BD8FDA97"
+ },
+ {
+ "defKey": "SkuTitle",
+ "defName": "Sku标题",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "22C93BB3-D52A-474A-B438-AEB208F752E1"
+ },
+ {
+ "defKey": "Logo",
+ "defName": "Sku Logo",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "9E416CD0-06B0-49AD-87D2-D600A6C7C57D"
+ },
+ {
+ "defKey": "Quantity",
+ "defName": "采购数量",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "C5FED921-4898-4544-8143-A315F5C49E0B"
+ },
+ {
+ "defKey": "PurchaseSchemeId",
+ "defName": "采购方案Id",
+ "comment": "",
+ "type": "bigint",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "593E7A4A-9BAC-457E-A7E5-33C3FAAAC300"
},
{
- "defKey": "WayBillNo",
- "defName": "快递单号",
+ "defKey": "PurchaseSkuIds",
+ "defName": "采购SkuId串",
"comment": "",
"type": "VARCHAR",
- "len": 100,
+ "len": 500,
"scale": "",
"primaryKey": false,
"notNull": false,
@@ -8943,15 +11179,15 @@
"refDict": "",
"extProps": {},
"domain": "",
- "id": "C57EFD3C-B87A-4172-A917-B9F0B37BFB42"
+ "id": "A229B942-A759-435B-9CD4-63E9F21667DA"
},
{
- "defKey": "ExpressName",
- "defName": "快递公司名称",
+ "defKey": "PurchaseAmount",
+ "defName": "采购金额(采购货款+采购运费)",
"comment": "",
- "type": "VARCHAR",
- "len": 100,
- "scale": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
@@ -8960,15 +11196,15 @@
"refDict": "",
"extProps": {},
"domain": "",
- "id": "1C4B4271-9640-4A78-A0DA-E13584257C9E"
+ "id": "03F1E202-6794-47E0-AE62-05360149C1C1"
},
{
- "defKey": "TransportDetails",
- "defName": "运输详情",
+ "defKey": "ProductAmount",
+ "defName": "采购货款",
"comment": "",
- "type": "VARCHAR",
- "len": 1000,
- "scale": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
@@ -8977,15 +11213,15 @@
"refDict": "",
"extProps": {},
"domain": "",
- "id": "424E3E7E-798E-4219-A41C-E17C09EDF8C1"
+ "id": "8FB8CF3A-0537-46B4-BF7B-E37CE3C48EB1"
},
{
- "defKey": "ServiceId",
- "defName": "服务单Id",
- "comment": "可空",
- "type": "bigint",
- "len": "",
- "scale": "",
+ "defKey": "PurchaseFreight",
+ "defName": "采购运费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
@@ -8994,92 +11230,128 @@
"refDict": "",
"extProps": {},
"domain": "",
- "id": "B20CC0B7-A0CF-4B6F-A104-C90AA0EF8C0A"
+ "id": "6D9E60F3-3A57-4C5F-AA18-947985CD56D8"
},
{
- "defKey": "PurchaseOrderId",
- "defName": "采购单Id",
- "comment": "可空",
- "type": "",
- "len": "",
- "scale": "",
+ "defKey": "QualityInspectionAmount",
+ "defName": "质检费",
+ "comment": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
- "id": "D9669169-6530-4BD3-9409-E2D6722965B6"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "4EEA782A-4E6A-4A15-9504-165A8C772065"
},
{
- "defKey": "OrderId",
- "defName": "订单Id",
+ "defKey": "InStorageAmount",
+ "defName": "入仓费",
"comment": "",
- "type": "VARCHAR",
- "len": 100,
- "scale": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "",
- "id": "3613C402-199D-4642-A8A6-A6A470013475"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "9F05088C-D1A2-4308-AFCE-009232B773BA"
},
{
- "defKey": "PackageType",
- "defName": "包裹类型(采购包裹=0 退货包裹=1)",
+ "defKey": "ConsumableAmount",
+ "defName": "打包耗材费",
"comment": "",
- "type": "",
- "len": "",
- "scale": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
- "id": "ED963E0A-8F45-4C2B-A2E2-6926E5F2C966"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "2BAD0903-5209-4D8B-B024-2B34E8673491"
},
{
- "defKey": "CreateTime",
- "defName": "",
+ "defKey": "FirstFreight",
+ "defName": "头程运费",
"comment": "",
- "type": "",
- "len": "",
- "scale": "",
+ "type": "DECIMAL",
+ "len": 18,
+ "scale": 2,
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
- "id": "3429613A-A50F-45B6-AD8E-6D036FD62C76"
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "DD8B2222-6BDB-40BA-A28F-E0F35382B654"
},
{
- "defKey": "UpdateTime",
- "defName": "",
+ "defKey": "CreateTime",
+ "defName": "创建时间",
"comment": "",
- "type": "",
+ "type": "DATETIME",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
- "defaultValue": "",
+ "defaultValue": "0.00",
"hideInGraph": false,
"refDict": "",
"extProps": {},
- "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
- "id": "8624878C-B971-4FF8-9034-C622E64F87DC"
+ "domain": "",
+ "id": "3052ED56-10A7-4CAE-9932-217D2821CBE7"
}
],
"correlations": [],
@@ -9738,16 +12010,6 @@
"count": 0,
"originKey": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2"
},
- {
- "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
- "shape": "table",
- "position": {
- "x": -450.5,
- "y": -368
- },
- "count": 0,
- "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
- },
{
"id": "653b5ef3-a1d2-4553-9629-d3525cd0f6cb",
"shape": "table",
@@ -9769,54 +12031,54 @@
"originKey": "91555D00-CE97-4666-94BA-E83996533E52"
},
{
- "id": "fa539400-f09d-485c-af47-7055dd7beeaa",
+ "id": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d",
"shape": "table",
"position": {
- "x": -560,
- "y": 527
+ "x": -810,
+ "y": -1222
},
"count": 0,
- "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9"
+ "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022"
},
{
- "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2",
+ "id": "98934117-29b1-4645-a97b-71f379b61bd9",
"shape": "table",
"position": {
- "x": -461,
- "y": 180
+ "x": 562,
+ "y": 487
},
"count": 0,
- "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
+ "originKey": "379D48BE-3522-413B-8FA3-752D65ADB597"
},
{
- "id": "33dd1974-86a6-4344-9c56-ed081a79fa7f",
+ "id": "e417b0e0-85e2-4073-977c-60fe6a7479ae",
"shape": "table",
"position": {
- "x": -560,
- "y": -190
+ "x": 1420,
+ "y": -1040
},
"count": 0,
- "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A"
+ "originKey": "6036D7E4-7ECB-4888-9D74-58DA414447F8"
},
{
- "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
+ "id": "da49dd57-b256-4f89-9653-8f35edef5a02",
"shape": "table",
"position": {
- "x": -1054,
- "y": -190
+ "x": 1420,
+ "y": -793.5
},
"count": 0,
- "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
+ "originKey": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9"
},
{
- "id": "69bf14ec-33a0-4cc0-b1c9-13f72ee54b3d",
+ "id": "ddf927a6-e081-4c05-937d-bc64f59fc32a",
"shape": "table",
"position": {
- "x": -810,
- "y": -1222
+ "x": 1390,
+ "y": -520
},
"count": 0,
- "originKey": "C70CFE85-2B7B-4409-B60C-0B9D1494C022"
+ "originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E"
},
{
"id": "524fda6a-d71b-4754-b673-ffc91fd753fc",
@@ -10229,34 +12491,54 @@
"fillColor": "#ACDAFC"
},
{
- "id": "98934117-29b1-4645-a97b-71f379b61bd9",
+ "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431",
"shape": "table",
"position": {
- "x": 562,
- "y": 487
+ "x": 560,
+ "y": -167
},
"count": 0,
- "originKey": "379D48BE-3522-413B-8FA3-752D65ADB597"
+ "originKey": "CD64DEB3-500E-48AF-896E-123922A03290"
},
{
- "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5",
+ "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
"shape": "table",
"position": {
- "x": 560,
- "y": 140
+ "x": -2570,
+ "y": -1440.5
},
"count": 0,
- "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E"
+ "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
},
{
- "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431",
+ "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
+ "shape": "table",
+ "position": {
+ "x": -450.5,
+ "y": -368
+ },
+ "count": 0,
+ "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
+ },
+ {
+ "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
+ "shape": "table",
+ "position": {
+ "x": 30,
+ "y": 487
+ },
+ "count": 0,
+ "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
+ },
+ {
+ "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5",
"shape": "table",
"position": {
"x": 560,
- "y": -167
+ "y": 140
},
"count": 0,
- "originKey": "CD64DEB3-500E-48AF-896E-123922A03290"
+ "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E"
},
{
"id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c",
@@ -10269,44 +12551,54 @@
"originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A"
},
{
- "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
+ "id": "33dd1974-86a6-4344-9c56-ed081a79fa7f",
"shape": "table",
"position": {
- "x": 30,
- "y": 487
+ "x": -560,
+ "y": -190
},
"count": 0,
- "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
+ "originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A"
},
{
- "id": "e417b0e0-85e2-4073-977c-60fe6a7479ae",
+ "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
"shape": "table",
"position": {
- "x": 1420,
- "y": -1040
+ "x": -810,
+ "y": -874
},
"count": 0,
- "originKey": "6036D7E4-7ECB-4888-9D74-58DA414447F8"
+ "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
},
{
- "id": "da49dd57-b256-4f89-9653-8f35edef5a02",
+ "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
"shape": "table",
"position": {
- "x": 1420,
- "y": -793.5
+ "x": -1054,
+ "y": -190
},
"count": 0,
- "originKey": "36D3AE16-4B8F-4FB6-B607-0D5F94F647A9"
+ "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
},
{
- "id": "ddf927a6-e081-4c05-937d-bc64f59fc32a",
+ "id": "fa539400-f09d-485c-af47-7055dd7beeaa",
"shape": "table",
"position": {
- "x": 1390,
- "y": -520
+ "x": -560,
+ "y": 527
},
"count": 0,
- "originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E"
+ "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9"
+ },
+ {
+ "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2",
+ "shape": "table",
+ "position": {
+ "x": -461,
+ "y": 180
+ },
+ "count": 0,
+ "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
},
{
"id": "6eba7e01-588a-4631-a8a3-9eb43b950339",
@@ -10319,28 +12611,29 @@
"originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
},
{
- "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
+ "id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977",
"shape": "table",
"position": {
- "x": -810,
- "y": -874
+ "x": -3220,
+ "y": -69.5
},
"count": 0,
- "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
+ "originKey": "120166EB-7E57-44E5-816C-B8414CB849E9"
},
{
- "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
+ "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac",
"shape": "table",
"position": {
- "x": -2570,
- "y": -1440.5
+ "x": -3215.5,
+ "y": 699
},
"count": 0,
- "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
+ "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7"
}
]
},
- "id": "BE90AFD1-3769-4B95-9BCC-2ADDCF257440"
+ "id": "BE90AFD1-3769-4B95-9BCC-2ADDCF257440",
+ "comment": ""
}
],
"standardFields": [
From 893d7c4e20efa390ee11bd023b7922ec30c6e5cf Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Tue, 11 Apr 2023 16:35:05 +0800
Subject: [PATCH 09/43] 1
---
.../PurchaseOrderV2Business.cs | 19 +
.../Db/PurchaseOrder/PurchaseOrderSku.cs | 125 +++++
.../Db/PurchaseOrder/PurchaseOrderV2.cs | 203 ++++++++
.../SearchProductSkuAndSchemeRequest.cs | 11 +
.../ProductSkuWithSchemeResponse.cs | 16 +
...数据库-backup-2023411162951.pdma.json} | 261 +++++-----
...数据库-backup-2023411163151.pdma.json} | 473 +++++++++++++-----
...数据库-backup-2023411163351.pdma.json} | 473 +++++++++++++-----
doc/步步为盈数据库.pdma.json | 448 ++++++++++++-----
9 files changed, 1551 insertions(+), 478 deletions(-)
create mode 100644 BBWY.Server.Business/PurchaseOrderV2/PurchaseOrderV2Business.cs
create mode 100644 BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderSku.cs
create mode 100644 BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs
create mode 100644 BBWY.Server.Model/Dto/Request/PurchaseOrderV2/SearchProductSkuAndSchemeRequest.cs
create mode 100644 BBWY.Server.Model/Dto/Response/PurchaseOrderV2/ProductSkuWithSchemeResponse.cs
rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023411004245.pdma.json => 步步为盈数据库-backup-2023411162951.pdma.json} (99%)
rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023411004157.pdma.json => 步步为盈数据库-backup-2023411163151.pdma.json} (98%)
rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023411004239.pdma.json => 步步为盈数据库-backup-2023411163351.pdma.json} (98%)
diff --git a/BBWY.Server.Business/PurchaseOrderV2/PurchaseOrderV2Business.cs b/BBWY.Server.Business/PurchaseOrderV2/PurchaseOrderV2Business.cs
new file mode 100644
index 00000000..3e215fcc
--- /dev/null
+++ b/BBWY.Server.Business/PurchaseOrderV2/PurchaseOrderV2Business.cs
@@ -0,0 +1,19 @@
+using BBWY.Common.Models;
+using BBWY.Server.Model.Dto;
+using BBWY.Server.Model.Dto.Response.PurchaseOrderV2;
+using Yitter.IdGenerator;
+
+namespace BBWY.Server.Business
+{
+ public class PurchaseOrderV2Business : BaseBusiness, IDenpendency
+ {
+ public PurchaseOrderV2Business(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator) : base(fsql, nLogManager, idGenerator)
+ {
+ }
+
+ public ProductSkuWithSchemeResponse GetProductSkuAndSchemeList(SearchProductSkuAndSchemeRequest request)
+ {
+ return null;
+ }
+ }
+}
diff --git a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderSku.cs b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderSku.cs
new file mode 100644
index 00000000..d8235134
--- /dev/null
+++ b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderSku.cs
@@ -0,0 +1,125 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System;
+
+namespace BBWY.Server.Model.Db
+{
+
+ ///
+ /// 采购商品表
+ ///
+ [Table(Name = "purchaseordersku", DisableSyncStructure = true)]
+ public partial class PurchaseOrderSku
+ {
+
+ ///
+ /// 打包耗材费
+ ///
+ [Column(DbType = "decimal(18,2)")]
+ public decimal? ConsumableAmount { get; set; } = 0.00M;
+
+ ///
+ /// 创建时间
+ ///
+ [Column(DbType = "datetime")]
+ public DateTime? CreateTime { get; set; }
+
+ ///
+ /// 头程运费
+ ///
+ [Column(DbType = "decimal(18,2)")]
+ public decimal? FirstFreight { get; set; } = 0.00M;
+
+ ///
+ /// 主键Id
+ ///
+
+ public long? Id { get; set; }
+
+ ///
+ /// 入仓费
+ ///
+ [Column(DbType = "decimal(18,2)")]
+ public decimal? InStorageAmount { get; set; } = 0.00M;
+
+ ///
+ /// Sku Logo
+ ///
+
+ public string Logo { get; set; }
+
+ ///
+ /// 单价
+ ///
+ [Column(DbType = "decimal(18,2)")]
+ public decimal? Price { get; set; } = 0.00M;
+
+ ///
+ /// 采购货款
+ ///
+ [Column(DbType = "decimal(18,2)")]
+ public decimal? ProductAmount { get; set; }
+
+ [Column(StringLength = 100)]
+ public string ProductId { get; set; }
+
+ ///
+ /// 采购金额(采购货款+采购运费)
+ ///
+ [Column(DbType = "decimal(18,2)")]
+ public decimal? PurchaseAmount { get; set; }
+
+ ///
+ /// 采购运费
+ ///
+ [Column(DbType = "decimal(18,2)")]
+ public decimal? PurchaseFreight { get; set; }
+
+ ///
+ /// 采购单Id
+ ///
+ [Column(StringLength = 100)]
+ public string PurchaseOrderId { get; set; }
+
+ ///
+ /// 采购方案Id
+ ///
+
+ public long? PurchaseSchemeId { get; set; }
+
+ ///
+ /// 采购SkuId串
+ ///
+ [Column(StringLength = 500)]
+ public string PurchaseSkuIds { get; set; }
+
+ ///
+ /// 质检费
+ ///
+ [Column(DbType = "decimal(18,2)")]
+ public decimal? QualityInspectionAmount { get; set; } = 0.00M;
+
+ ///
+ /// 采购数量
+ ///
+
+ public int? Quantity { get; set; }
+
+ ///
+ /// 店铺Id
+ ///
+
+ public long? ShopId { get; set; }
+
+ [Column(StringLength = 100)]
+ public string SkuId { get; set; }
+
+ ///
+ /// Sku标题
+ ///
+
+ public string SkuTitle { get; set; }
+
+ }
+
+}
diff --git a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs
new file mode 100644
index 00000000..1d74e676
--- /dev/null
+++ b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs
@@ -0,0 +1,203 @@
+using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
+using System;
+
+namespace BBWY.Server.Model.Db
+{
+
+ ///
+ /// 采购单表
+ ///
+ [Table(Name = "purchaseorderv2", DisableSyncStructure = true)]
+ public partial class PurchaseOrderV2
+ {
+
+ ///
+ /// 采购单号
+ ///
+ [Column(StringLength = 100, IsPrimary = true, IsNullable = false)]
+ public string Id { get; set; }
+
+ ///
+ /// 完成时间
+ ///
+ [Column(DbType = "datetime")]
+ public DateTime? CompletionTime { get; set; }
+
+ ///
+ /// 收货详细地址
+ ///
+
+ public string ConsigneeAddress { get; set; }
+
+ ///
+ /// 收货市
+ ///
+ [Column(StringLength = 30)]
+ public string ConsigneeCity { get; set; }
+
+ ///
+ /// 收货联系人名称
+ ///
+ [Column(StringLength = 50)]
+ public string ConsigneeContactName { get; set; }
+
+ ///
+ /// 收货区
+ ///
+ [Column(StringLength = 30)]
+ public string ConsigneeCounty { get; set; }
+
+ ///
+ /// 收货联系人电话
+ ///
+ [Column(StringLength = 50)]
+ public string ConsigneeMobile { get; set; }
+
+ ///
+ /// 收货省
+ ///
+ [Column(StringLength = 30)]
+ public string ConsigneeProvince { get; set; }
+
+ ///
+ /// 收货镇
+ ///
+ [Column(StringLength = 30)]
+ public string ConsigneeTown { get; set; }
+
+ ///
+ /// 打包耗材费
+ ///
+ [Column(DbType = "decimal(18,2)")]
+ public decimal? ConsumableAmount { get; set; } = 0.00M;
+
+ ///
+ /// 创建时间
+ ///
+ [Column(DbType = "datetime")]
+ public DateTime? CreateTime { get; set; }
+
+ ///
+ /// 快递公司
+ ///
+ [Column(StringLength = 100)]
+ public string ExpressName { get; set; }
+
+ ///
+ /// 头程运费
+ ///
+ [Column(DbType = "decimal(18,2)")]
+ public decimal? FirstFreight { get; set; } = 0.00M;
+
+ ///
+ /// 入仓费
+ ///
+ [Column(DbType = "decimal(18,2)")]
+ public decimal? InStorageAmount { get; set; } = 0.00M;
+
+ ///
+ /// 是否转入库存
+ ///
+
+ public bool? IsConvertToStock { get; set; } = false;
+
+ ///
+ /// 是否订阅快递100
+ ///
+
+ public bool? IsSubscribeKuaiDi100 { get; set; } = false;
+
+ ///
+ /// 采购单状态(待付款=0,待发货=1,待收货=2,待质检=3,待打包=4,待结算=5,已完成=6)
+ ///
+
+ public int? OrderState { get; set; }
+
+ ///
+ /// 支付时间
+ ///
+ [Column(DbType = "datetime")]
+ public DateTime? PayTime { get; set; }
+
+ ///
+ /// 采购货款
+ ///
+ [Column(DbType = "decimal(18,2)")]
+ public decimal? ProductAmount { get; set; } = 0.00M;
+
+ ///
+ /// 采购账号Id
+ ///
+
+ public long? PurchaseAccountId { get; set; }
+
+ ///
+ /// 采购金额(采购货款+采购运费)
+ ///
+ [Column(DbType = "decimal(18,2)")]
+ public decimal? PurchaseAmount { get; set; } = 0.00M;
+
+ ///
+ /// 采购运费
+ ///
+ [Column(DbType = "decimal(18,2)")]
+ public decimal? PurchaseFreight { get; set; } = 0.00M;
+
+ ///
+ /// 采购平台
+ ///
+
+ public int? PurchasePlatform { get; set; }
+
+ ///
+ /// 商家Id
+ ///
+ [Column(StringLength = 20)]
+ public string PurchaserId { get; set; }
+
+ ///
+ /// 商家名称
+ ///
+ [Column(StringLength = 100)]
+ public string PurchaserName { get; set; }
+
+ ///
+ /// 质检费
+ ///
+ [Column(DbType = "decimal(18,2)")]
+ public decimal? QualityInspectionAmount { get; set; } = 0.00M;
+
+ ///
+ /// 备注信息
+ ///
+
+ public string Remark { get; set; }
+
+ ///
+ /// 店铺Id
+ ///
+
+ public string ShopId { get; set; }
+
+ ///
+ /// 签收时间
+ ///
+ [Column(DbType = "datetime")]
+ public DateTime? SignTime { get; set; }
+
+ ///
+ /// 快递单号
+ ///
+ [Column(StringLength = 100)]
+ public string WaybillNo { get; set; }
+
+ ///
+ /// 采购方式(线上=0, 线下=1)
+ ///
+ [Column(MapType = typeof(int))]
+ public Enums.PurchaseMethod PurchaseMethod { get; set; }
+
+ }
+
+}
diff --git a/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/SearchProductSkuAndSchemeRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/SearchProductSkuAndSchemeRequest.cs
new file mode 100644
index 00000000..f06e45f6
--- /dev/null
+++ b/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/SearchProductSkuAndSchemeRequest.cs
@@ -0,0 +1,11 @@
+namespace BBWY.Server.Model.Dto
+{
+ public class SearchProductSkuAndSchemeRequest : PlatformRequest
+ {
+ public string Spu { get; set; }
+
+ public string Sku { get; set; }
+
+ public Enums.Platform PurchasePlatform { get; set; }
+ }
+}
diff --git a/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/ProductSkuWithSchemeResponse.cs b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/ProductSkuWithSchemeResponse.cs
new file mode 100644
index 00000000..12040fda
--- /dev/null
+++ b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/ProductSkuWithSchemeResponse.cs
@@ -0,0 +1,16 @@
+namespace BBWY.Server.Model.Dto.Response.PurchaseOrderV2
+{
+ ///
+ /// 包含采购方案的Sku商品信息
+ ///
+ public class ProductSkuWithSchemeResponse : ProductSkuResponse
+ {
+ public long PurchaseSchemeId { get; set; }
+
+ public string PurchaserId { get; set; }
+
+ public string PurchaseName { get; set; }
+
+ public Enums.Platform PurchasePlatform { get; set; }
+ }
+}
diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004245.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411162951.pdma.json
similarity index 99%
rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004245.pdma.json
rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411162951.pdma.json
index 4298ba45..bfba2eb7 100644
--- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004245.pdma.json
+++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411162951.pdma.json
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.5.1",
"createdTime": "2022-10-3 12:39:39",
- "updatedTime": "2023-4-11 00:42:39",
+ "updatedTime": "2023-4-11 14:53:32",
"dbConns": [],
"profile": {
"default": {
@@ -11040,6 +11040,23 @@
"extProps": {},
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
"id": "2ED49BCC-4CA9-4793-9061-157C85E10A71"
+ },
+ {
+ "defKey": "PurchaseMethod",
+ "defName": "采购方式(线上=0, 线下=1)",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62"
}
],
"correlations": [],
@@ -11329,6 +11346,23 @@
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "9E416CD0-06B0-49AD-87D2-D600A6C7C57D"
},
+ {
+ "defKey": "Quantity",
+ "defName": "采购数量",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "C5FED921-4898-4544-8143-A315F5C49E0B"
+ },
{
"defKey": "PurchaseSchemeId",
"defName": "采购方案Id",
@@ -11534,23 +11568,6 @@
"extProps": {},
"domain": "",
"id": "3052ED56-10A7-4CAE-9932-217D2821CBE7"
- },
- {
- "defKey": "Quantity",
- "defName": "采购数量",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
- "id": "C5FED921-4898-4544-8143-A315F5C49E0B"
}
],
"correlations": [],
@@ -12279,6 +12296,106 @@
"count": 0,
"originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E"
},
+ {
+ "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431",
+ "shape": "table",
+ "position": {
+ "x": 560,
+ "y": -167
+ },
+ "count": 0,
+ "originKey": "CD64DEB3-500E-48AF-896E-123922A03290"
+ },
+ {
+ "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
+ "shape": "table",
+ "position": {
+ "x": -2570,
+ "y": -1440.5
+ },
+ "count": 0,
+ "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
+ },
+ {
+ "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
+ "shape": "table",
+ "position": {
+ "x": -450.5,
+ "y": -368
+ },
+ "count": 0,
+ "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
+ },
+ {
+ "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
+ "shape": "table",
+ "position": {
+ "x": 30,
+ "y": 487
+ },
+ "count": 0,
+ "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
+ },
+ {
+ "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5",
+ "shape": "table",
+ "position": {
+ "x": 560,
+ "y": 140
+ },
+ "count": 0,
+ "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E"
+ },
+ {
+ "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c",
+ "shape": "table",
+ "position": {
+ "x": 30,
+ "y": 80
+ },
+ "count": 0,
+ "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A"
+ },
+ {
+ "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
+ "shape": "table",
+ "position": {
+ "x": -810,
+ "y": -874
+ },
+ "count": 0,
+ "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
+ },
+ {
+ "id": "fa539400-f09d-485c-af47-7055dd7beeaa",
+ "shape": "table",
+ "position": {
+ "x": -560,
+ "y": 527
+ },
+ "count": 0,
+ "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9"
+ },
+ {
+ "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2",
+ "shape": "table",
+ "position": {
+ "x": -461,
+ "y": 180
+ },
+ "count": 0,
+ "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
+ },
+ {
+ "id": "6eba7e01-588a-4631-a8a3-9eb43b950339",
+ "shape": "table",
+ "position": {
+ "x": -3270,
+ "y": -1440.5
+ },
+ "count": 0,
+ "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
+ },
{
"id": "524fda6a-d71b-4754-b673-ffc91fd753fc",
"shape": "erdRelation",
@@ -12689,66 +12806,6 @@
],
"fillColor": "#ACDAFC"
},
- {
- "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431",
- "shape": "table",
- "position": {
- "x": 560,
- "y": -167
- },
- "count": 0,
- "originKey": "CD64DEB3-500E-48AF-896E-123922A03290"
- },
- {
- "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
- "shape": "table",
- "position": {
- "x": -2570,
- "y": -1440.5
- },
- "count": 0,
- "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
- },
- {
- "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
- "shape": "table",
- "position": {
- "x": -450.5,
- "y": -368
- },
- "count": 0,
- "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
- },
- {
- "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
- "shape": "table",
- "position": {
- "x": 30,
- "y": 487
- },
- "count": 0,
- "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
- },
- {
- "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5",
- "shape": "table",
- "position": {
- "x": 560,
- "y": 140
- },
- "count": 0,
- "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E"
- },
- {
- "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c",
- "shape": "table",
- "position": {
- "x": 30,
- "y": 80
- },
- "count": 0,
- "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A"
- },
{
"id": "33dd1974-86a6-4344-9c56-ed081a79fa7f",
"shape": "table",
@@ -12759,16 +12816,6 @@
"count": 0,
"originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A"
},
- {
- "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
- "shape": "table",
- "position": {
- "x": -810,
- "y": -874
- },
- "count": 0,
- "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
- },
{
"id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
"shape": "table",
@@ -12780,34 +12827,14 @@
"originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
},
{
- "id": "fa539400-f09d-485c-af47-7055dd7beeaa",
- "shape": "table",
- "position": {
- "x": -560,
- "y": 527
- },
- "count": 0,
- "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9"
- },
- {
- "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2",
- "shape": "table",
- "position": {
- "x": -461,
- "y": 180
- },
- "count": 0,
- "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
- },
- {
- "id": "6eba7e01-588a-4631-a8a3-9eb43b950339",
+ "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac",
"shape": "table",
"position": {
- "x": -3270,
- "y": -1440.5
+ "x": -3215.5,
+ "y": 699
},
"count": 0,
- "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
+ "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7"
},
{
"id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977",
@@ -12818,16 +12845,6 @@
},
"count": 0,
"originKey": "120166EB-7E57-44E5-816C-B8414CB849E9"
- },
- {
- "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac",
- "shape": "table",
- "position": {
- "x": -3215.5,
- "y": 699
- },
- "count": 0,
- "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7"
}
]
},
diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004157.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163151.pdma.json
similarity index 98%
rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004157.pdma.json
rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163151.pdma.json
index 84dde971..bfba2eb7 100644
--- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004157.pdma.json
+++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163151.pdma.json
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.5.1",
"createdTime": "2022-10-3 12:39:39",
- "updatedTime": "2023-4-11 00:41:51",
+ "updatedTime": "2023-4-11 14:53:32",
"dbConns": [],
"profile": {
"default": {
@@ -1339,7 +1339,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "30E9507B-707C-4BCF-99F2-104066BCC3F9",
@@ -1835,7 +1844,24 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7",
+ "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
+ "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "88311B02-719F-45ED-9603-84EEA4F6F802",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
@@ -2837,7 +2863,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "672717A5-A65E-4A6C-9F10-C4689C92FD45",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E",
@@ -3265,7 +3300,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "379D48BE-3522-413B-8FA3-752D65ADB597",
@@ -3747,7 +3791,24 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "65A1A6ED-EF2C-4369-8CCB-B6E762EEF9D0",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "E85EE812-0F49-49B3-8FBD-E6435CF08CDA",
+ "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
+ "refField": "B503CFCF-19DA-4D5B-9416-C3DD65E477CD",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1",
@@ -4003,7 +4064,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A",
@@ -4395,7 +4465,32 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "C2FE946F-02B4-4B24-9AA4-433A6E98F7A9",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9",
+ "refEntity": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
+ "refField": "1012CEB5-702E-428F-ABEF-17BD9856E4E3",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "93852E9B-AD50-40B6-A131-B62EFFE3438C",
+ "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
+ "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74",
@@ -4767,7 +4862,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213",
@@ -5616,7 +5720,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE",
+ "refEntity": "6036D7E4-7ECB-4888-9D74-58DA414447F8",
+ "refField": "0EE3108C-0995-4D82-AA03-FF63F0D62626",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
@@ -7179,7 +7292,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E",
+ "refEntity": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE",
+ "refField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
@@ -7437,7 +7559,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "98F8F005-A630-4C98-8C1F-ECCA64E65996",
+ "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
+ "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2",
@@ -7712,7 +7843,24 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "61C58DEB-2779-451F-82AD-3B03BC9C795D",
+ "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
+ "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "4C09B365-4B2A-4613-9133-DF0421BFC85C",
+ "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
+ "refField": "41BFEC37-8F13-42D0-B8ED-123071447D18",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "65A6F4A2-D006-4FC7-BED7-53209273F05E",
@@ -8258,7 +8406,16 @@
"id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9"
}
],
- "correlations": [],
+ "correlations": [
+ {
+ "myField": "A3C3A9A6-05BF-4514-9789-15C5732F7241",
+ "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
+ "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ],
"indexes": []
},
{
@@ -8989,7 +9146,24 @@
"id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
}
],
- "correlations": [],
+ "correlations": [
+ {
+ "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
+ "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "16E62919-C979-4830-930A-EAE234252B2F",
+ "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
+ "refField": "81703BD3-514F-4E8E-8898-54FDBFF90D7A",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ],
"indexes": []
},
{
@@ -9737,7 +9911,32 @@
"id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
}
],
- "correlations": [],
+ "correlations": [
+ {
+ "myField": "5F519CD5-5B0E-4C18-99AD-CD24BADE9ED3",
+ "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
+ "refField": "ED33CB09-DBB2-4FD6-B3E9-BEE77BD14B63",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
+ "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "58444AC3-3BDE-408A-BE47-3C063EC54731",
+ "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386",
+ "refField": "16E62919-C979-4830-930A-EAE234252B2F",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ],
"indexes": []
},
{
@@ -10841,6 +11040,23 @@
"extProps": {},
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
"id": "2ED49BCC-4CA9-4793-9061-157C85E10A71"
+ },
+ {
+ "defKey": "PurchaseMethod",
+ "defName": "采购方式(线上=0, 线下=1)",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62"
}
],
"correlations": [],
@@ -11130,6 +11346,23 @@
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "9E416CD0-06B0-49AD-87D2-D600A6C7C57D"
},
+ {
+ "defKey": "Quantity",
+ "defName": "采购数量",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "C5FED921-4898-4544-8143-A315F5C49E0B"
+ },
{
"defKey": "PurchaseSchemeId",
"defName": "采购方案Id",
@@ -12063,6 +12296,106 @@
"count": 0,
"originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E"
},
+ {
+ "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431",
+ "shape": "table",
+ "position": {
+ "x": 560,
+ "y": -167
+ },
+ "count": 0,
+ "originKey": "CD64DEB3-500E-48AF-896E-123922A03290"
+ },
+ {
+ "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
+ "shape": "table",
+ "position": {
+ "x": -2570,
+ "y": -1440.5
+ },
+ "count": 0,
+ "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
+ },
+ {
+ "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
+ "shape": "table",
+ "position": {
+ "x": -450.5,
+ "y": -368
+ },
+ "count": 0,
+ "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
+ },
+ {
+ "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
+ "shape": "table",
+ "position": {
+ "x": 30,
+ "y": 487
+ },
+ "count": 0,
+ "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
+ },
+ {
+ "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5",
+ "shape": "table",
+ "position": {
+ "x": 560,
+ "y": 140
+ },
+ "count": 0,
+ "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E"
+ },
+ {
+ "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c",
+ "shape": "table",
+ "position": {
+ "x": 30,
+ "y": 80
+ },
+ "count": 0,
+ "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A"
+ },
+ {
+ "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
+ "shape": "table",
+ "position": {
+ "x": -810,
+ "y": -874
+ },
+ "count": 0,
+ "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
+ },
+ {
+ "id": "fa539400-f09d-485c-af47-7055dd7beeaa",
+ "shape": "table",
+ "position": {
+ "x": -560,
+ "y": 527
+ },
+ "count": 0,
+ "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9"
+ },
+ {
+ "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2",
+ "shape": "table",
+ "position": {
+ "x": -461,
+ "y": 180
+ },
+ "count": 0,
+ "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
+ },
+ {
+ "id": "6eba7e01-588a-4631-a8a3-9eb43b950339",
+ "shape": "table",
+ "position": {
+ "x": -3270,
+ "y": -1440.5
+ },
+ "count": 0,
+ "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
+ },
{
"id": "524fda6a-d71b-4754-b673-ffc91fd753fc",
"shape": "erdRelation",
@@ -12473,66 +12806,6 @@
],
"fillColor": "#ACDAFC"
},
- {
- "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431",
- "shape": "table",
- "position": {
- "x": 560,
- "y": -167
- },
- "count": 0,
- "originKey": "CD64DEB3-500E-48AF-896E-123922A03290"
- },
- {
- "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
- "shape": "table",
- "position": {
- "x": -2570,
- "y": -1440.5
- },
- "count": 0,
- "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
- },
- {
- "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
- "shape": "table",
- "position": {
- "x": -450.5,
- "y": -368
- },
- "count": 0,
- "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
- },
- {
- "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
- "shape": "table",
- "position": {
- "x": 30,
- "y": 487
- },
- "count": 0,
- "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
- },
- {
- "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5",
- "shape": "table",
- "position": {
- "x": 560,
- "y": 140
- },
- "count": 0,
- "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E"
- },
- {
- "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c",
- "shape": "table",
- "position": {
- "x": 30,
- "y": 80
- },
- "count": 0,
- "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A"
- },
{
"id": "33dd1974-86a6-4344-9c56-ed081a79fa7f",
"shape": "table",
@@ -12543,16 +12816,6 @@
"count": 0,
"originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A"
},
- {
- "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
- "shape": "table",
- "position": {
- "x": -810,
- "y": -874
- },
- "count": 0,
- "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
- },
{
"id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
"shape": "table",
@@ -12564,34 +12827,14 @@
"originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
},
{
- "id": "fa539400-f09d-485c-af47-7055dd7beeaa",
- "shape": "table",
- "position": {
- "x": -560,
- "y": 527
- },
- "count": 0,
- "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9"
- },
- {
- "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2",
- "shape": "table",
- "position": {
- "x": -461,
- "y": 180
- },
- "count": 0,
- "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
- },
- {
- "id": "6eba7e01-588a-4631-a8a3-9eb43b950339",
+ "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac",
"shape": "table",
"position": {
- "x": -3270,
- "y": -1440.5
+ "x": -3215.5,
+ "y": 699
},
"count": 0,
- "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
+ "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7"
},
{
"id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977",
@@ -12602,16 +12845,6 @@
},
"count": 0,
"originKey": "120166EB-7E57-44E5-816C-B8414CB849E9"
- },
- {
- "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac",
- "shape": "table",
- "position": {
- "x": -3215.5,
- "y": 662
- },
- "count": 0,
- "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7"
}
]
},
diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004239.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163351.pdma.json
similarity index 98%
rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004239.pdma.json
rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163351.pdma.json
index 20c82a83..bfba2eb7 100644
--- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411004239.pdma.json
+++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163351.pdma.json
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.5.1",
"createdTime": "2022-10-3 12:39:39",
- "updatedTime": "2023-4-11 00:41:57",
+ "updatedTime": "2023-4-11 14:53:32",
"dbConns": [],
"profile": {
"default": {
@@ -1339,7 +1339,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "30E9507B-707C-4BCF-99F2-104066BCC3F9",
@@ -1835,7 +1844,24 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7",
+ "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
+ "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "88311B02-719F-45ED-9603-84EEA4F6F802",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
@@ -2837,7 +2863,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "672717A5-A65E-4A6C-9F10-C4689C92FD45",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E",
@@ -3265,7 +3300,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "379D48BE-3522-413B-8FA3-752D65ADB597",
@@ -3747,7 +3791,24 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "65A1A6ED-EF2C-4369-8CCB-B6E762EEF9D0",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "E85EE812-0F49-49B3-8FBD-E6435CF08CDA",
+ "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
+ "refField": "B503CFCF-19DA-4D5B-9416-C3DD65E477CD",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1",
@@ -4003,7 +4064,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A",
@@ -4395,7 +4465,32 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "C2FE946F-02B4-4B24-9AA4-433A6E98F7A9",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9",
+ "refEntity": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
+ "refField": "1012CEB5-702E-428F-ABEF-17BD9856E4E3",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "93852E9B-AD50-40B6-A131-B62EFFE3438C",
+ "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
+ "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74",
@@ -4767,7 +4862,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213",
@@ -5616,7 +5720,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE",
+ "refEntity": "6036D7E4-7ECB-4888-9D74-58DA414447F8",
+ "refField": "0EE3108C-0995-4D82-AA03-FF63F0D62626",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
@@ -7179,7 +7292,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E",
+ "refEntity": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE",
+ "refField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
@@ -7437,7 +7559,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "98F8F005-A630-4C98-8C1F-ECCA64E65996",
+ "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
+ "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2",
@@ -7712,7 +7843,24 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "61C58DEB-2779-451F-82AD-3B03BC9C795D",
+ "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
+ "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "4C09B365-4B2A-4613-9133-DF0421BFC85C",
+ "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
+ "refField": "41BFEC37-8F13-42D0-B8ED-123071447D18",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "65A6F4A2-D006-4FC7-BED7-53209273F05E",
@@ -8258,7 +8406,16 @@
"id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9"
}
],
- "correlations": [],
+ "correlations": [
+ {
+ "myField": "A3C3A9A6-05BF-4514-9789-15C5732F7241",
+ "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
+ "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ],
"indexes": []
},
{
@@ -8989,7 +9146,24 @@
"id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
}
],
- "correlations": [],
+ "correlations": [
+ {
+ "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
+ "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "16E62919-C979-4830-930A-EAE234252B2F",
+ "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
+ "refField": "81703BD3-514F-4E8E-8898-54FDBFF90D7A",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ],
"indexes": []
},
{
@@ -9737,7 +9911,32 @@
"id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
}
],
- "correlations": [],
+ "correlations": [
+ {
+ "myField": "5F519CD5-5B0E-4C18-99AD-CD24BADE9ED3",
+ "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
+ "refField": "ED33CB09-DBB2-4FD6-B3E9-BEE77BD14B63",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
+ "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "58444AC3-3BDE-408A-BE47-3C063EC54731",
+ "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386",
+ "refField": "16E62919-C979-4830-930A-EAE234252B2F",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ],
"indexes": []
},
{
@@ -10841,6 +11040,23 @@
"extProps": {},
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
"id": "2ED49BCC-4CA9-4793-9061-157C85E10A71"
+ },
+ {
+ "defKey": "PurchaseMethod",
+ "defName": "采购方式(线上=0, 线下=1)",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62"
}
],
"correlations": [],
@@ -11130,6 +11346,23 @@
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "9E416CD0-06B0-49AD-87D2-D600A6C7C57D"
},
+ {
+ "defKey": "Quantity",
+ "defName": "采购数量",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "C5FED921-4898-4544-8143-A315F5C49E0B"
+ },
{
"defKey": "PurchaseSchemeId",
"defName": "采购方案Id",
@@ -12063,6 +12296,106 @@
"count": 0,
"originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E"
},
+ {
+ "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431",
+ "shape": "table",
+ "position": {
+ "x": 560,
+ "y": -167
+ },
+ "count": 0,
+ "originKey": "CD64DEB3-500E-48AF-896E-123922A03290"
+ },
+ {
+ "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
+ "shape": "table",
+ "position": {
+ "x": -2570,
+ "y": -1440.5
+ },
+ "count": 0,
+ "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
+ },
+ {
+ "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
+ "shape": "table",
+ "position": {
+ "x": -450.5,
+ "y": -368
+ },
+ "count": 0,
+ "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
+ },
+ {
+ "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
+ "shape": "table",
+ "position": {
+ "x": 30,
+ "y": 487
+ },
+ "count": 0,
+ "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
+ },
+ {
+ "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5",
+ "shape": "table",
+ "position": {
+ "x": 560,
+ "y": 140
+ },
+ "count": 0,
+ "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E"
+ },
+ {
+ "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c",
+ "shape": "table",
+ "position": {
+ "x": 30,
+ "y": 80
+ },
+ "count": 0,
+ "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A"
+ },
+ {
+ "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
+ "shape": "table",
+ "position": {
+ "x": -810,
+ "y": -874
+ },
+ "count": 0,
+ "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
+ },
+ {
+ "id": "fa539400-f09d-485c-af47-7055dd7beeaa",
+ "shape": "table",
+ "position": {
+ "x": -560,
+ "y": 527
+ },
+ "count": 0,
+ "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9"
+ },
+ {
+ "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2",
+ "shape": "table",
+ "position": {
+ "x": -461,
+ "y": 180
+ },
+ "count": 0,
+ "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
+ },
+ {
+ "id": "6eba7e01-588a-4631-a8a3-9eb43b950339",
+ "shape": "table",
+ "position": {
+ "x": -3270,
+ "y": -1440.5
+ },
+ "count": 0,
+ "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
+ },
{
"id": "524fda6a-d71b-4754-b673-ffc91fd753fc",
"shape": "erdRelation",
@@ -12473,66 +12806,6 @@
],
"fillColor": "#ACDAFC"
},
- {
- "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431",
- "shape": "table",
- "position": {
- "x": 560,
- "y": -167
- },
- "count": 0,
- "originKey": "CD64DEB3-500E-48AF-896E-123922A03290"
- },
- {
- "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
- "shape": "table",
- "position": {
- "x": -2570,
- "y": -1440.5
- },
- "count": 0,
- "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
- },
- {
- "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
- "shape": "table",
- "position": {
- "x": -450.5,
- "y": -368
- },
- "count": 0,
- "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
- },
- {
- "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
- "shape": "table",
- "position": {
- "x": 30,
- "y": 487
- },
- "count": 0,
- "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
- },
- {
- "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5",
- "shape": "table",
- "position": {
- "x": 560,
- "y": 140
- },
- "count": 0,
- "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E"
- },
- {
- "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c",
- "shape": "table",
- "position": {
- "x": 30,
- "y": 80
- },
- "count": 0,
- "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A"
- },
{
"id": "33dd1974-86a6-4344-9c56-ed081a79fa7f",
"shape": "table",
@@ -12543,16 +12816,6 @@
"count": 0,
"originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A"
},
- {
- "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
- "shape": "table",
- "position": {
- "x": -810,
- "y": -874
- },
- "count": 0,
- "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
- },
{
"id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
"shape": "table",
@@ -12564,34 +12827,14 @@
"originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
},
{
- "id": "fa539400-f09d-485c-af47-7055dd7beeaa",
- "shape": "table",
- "position": {
- "x": -560,
- "y": 527
- },
- "count": 0,
- "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9"
- },
- {
- "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2",
- "shape": "table",
- "position": {
- "x": -461,
- "y": 180
- },
- "count": 0,
- "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
- },
- {
- "id": "6eba7e01-588a-4631-a8a3-9eb43b950339",
+ "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac",
"shape": "table",
"position": {
- "x": -3270,
- "y": -1440.5
+ "x": -3215.5,
+ "y": 699
},
"count": 0,
- "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
+ "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7"
},
{
"id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977",
@@ -12602,16 +12845,6 @@
},
"count": 0,
"originKey": "120166EB-7E57-44E5-816C-B8414CB849E9"
- },
- {
- "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac",
- "shape": "table",
- "position": {
- "x": -3215.5,
- "y": 662
- },
- "count": 0,
- "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7"
}
]
},
diff --git a/doc/步步为盈数据库.pdma.json b/doc/步步为盈数据库.pdma.json
index a91b31e7..14b6d79f 100644
--- a/doc/步步为盈数据库.pdma.json
+++ b/doc/步步为盈数据库.pdma.json
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.5.1",
"createdTime": "2022-10-3 12:39:39",
- "updatedTime": "2023-4-11 00:42:45",
+ "updatedTime": "2023-4-11 16:33:51",
"dbConns": [],
"profile": {
"default": {
@@ -1339,7 +1339,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "30E9507B-707C-4BCF-99F2-104066BCC3F9",
@@ -1835,7 +1844,24 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7",
+ "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
+ "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "88311B02-719F-45ED-9603-84EEA4F6F802",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
@@ -2837,7 +2863,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "672717A5-A65E-4A6C-9F10-C4689C92FD45",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E",
@@ -3265,7 +3300,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "379D48BE-3522-413B-8FA3-752D65ADB597",
@@ -3747,7 +3791,24 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "65A1A6ED-EF2C-4369-8CCB-B6E762EEF9D0",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "E85EE812-0F49-49B3-8FBD-E6435CF08CDA",
+ "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
+ "refField": "B503CFCF-19DA-4D5B-9416-C3DD65E477CD",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1",
@@ -4003,7 +4064,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A",
@@ -4395,7 +4465,32 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "C2FE946F-02B4-4B24-9AA4-433A6E98F7A9",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9",
+ "refEntity": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
+ "refField": "1012CEB5-702E-428F-ABEF-17BD9856E4E3",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "93852E9B-AD50-40B6-A131-B62EFFE3438C",
+ "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
+ "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74",
@@ -4767,7 +4862,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3",
+ "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
+ "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213",
@@ -5616,7 +5720,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE",
+ "refEntity": "6036D7E4-7ECB-4888-9D74-58DA414447F8",
+ "refField": "0EE3108C-0995-4D82-AA03-FF63F0D62626",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
@@ -7179,7 +7292,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E",
+ "refEntity": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE",
+ "refField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
@@ -7437,7 +7559,16 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "98F8F005-A630-4C98-8C1F-ECCA64E65996",
+ "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
+ "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2",
@@ -7712,7 +7843,24 @@
"hideInGraph": true
}
],
- "correlations": []
+ "correlations": [
+ {
+ "myField": "61C58DEB-2779-451F-82AD-3B03BC9C795D",
+ "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
+ "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "4C09B365-4B2A-4613-9133-DF0421BFC85C",
+ "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
+ "refField": "41BFEC37-8F13-42D0-B8ED-123071447D18",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ]
},
{
"id": "65A6F4A2-D006-4FC7-BED7-53209273F05E",
@@ -8258,7 +8406,16 @@
"id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9"
}
],
- "correlations": [],
+ "correlations": [
+ {
+ "myField": "A3C3A9A6-05BF-4514-9789-15C5732F7241",
+ "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
+ "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ],
"indexes": []
},
{
@@ -8989,7 +9146,24 @@
"id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
}
],
- "correlations": [],
+ "correlations": [
+ {
+ "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
+ "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "16E62919-C979-4830-930A-EAE234252B2F",
+ "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
+ "refField": "81703BD3-514F-4E8E-8898-54FDBFF90D7A",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ],
"indexes": []
},
{
@@ -9737,7 +9911,32 @@
"id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
}
],
- "correlations": [],
+ "correlations": [
+ {
+ "myField": "5F519CD5-5B0E-4C18-99AD-CD24BADE9ED3",
+ "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
+ "refField": "ED33CB09-DBB2-4FD6-B3E9-BEE77BD14B63",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
+ "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ },
+ {
+ "myField": "58444AC3-3BDE-408A-BE47-3C063EC54731",
+ "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386",
+ "refField": "16E62919-C979-4830-930A-EAE234252B2F",
+ "myRows": "1",
+ "refRows": "n",
+ "innerType": ""
+ }
+ ],
"indexes": []
},
{
@@ -10841,6 +11040,23 @@
"extProps": {},
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
"id": "2ED49BCC-4CA9-4793-9061-157C85E10A71"
+ },
+ {
+ "defKey": "PurchaseMethod",
+ "defName": "采购方式(线上=0, 线下=1)",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+ "id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62"
}
],
"correlations": [],
@@ -12080,6 +12296,106 @@
"count": 0,
"originKey": "65A6F4A2-D006-4FC7-BED7-53209273F05E"
},
+ {
+ "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431",
+ "shape": "table",
+ "position": {
+ "x": 560,
+ "y": -167
+ },
+ "count": 0,
+ "originKey": "CD64DEB3-500E-48AF-896E-123922A03290"
+ },
+ {
+ "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
+ "shape": "table",
+ "position": {
+ "x": -2570,
+ "y": -1440.5
+ },
+ "count": 0,
+ "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
+ },
+ {
+ "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
+ "shape": "table",
+ "position": {
+ "x": -450.5,
+ "y": -368
+ },
+ "count": 0,
+ "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
+ },
+ {
+ "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
+ "shape": "table",
+ "position": {
+ "x": 30,
+ "y": 487
+ },
+ "count": 0,
+ "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
+ },
+ {
+ "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5",
+ "shape": "table",
+ "position": {
+ "x": 560,
+ "y": 140
+ },
+ "count": 0,
+ "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E"
+ },
+ {
+ "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c",
+ "shape": "table",
+ "position": {
+ "x": 30,
+ "y": 80
+ },
+ "count": 0,
+ "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A"
+ },
+ {
+ "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
+ "shape": "table",
+ "position": {
+ "x": -810,
+ "y": -874
+ },
+ "count": 0,
+ "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
+ },
+ {
+ "id": "fa539400-f09d-485c-af47-7055dd7beeaa",
+ "shape": "table",
+ "position": {
+ "x": -560,
+ "y": 527
+ },
+ "count": 0,
+ "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9"
+ },
+ {
+ "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2",
+ "shape": "table",
+ "position": {
+ "x": -461,
+ "y": 180
+ },
+ "count": 0,
+ "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
+ },
+ {
+ "id": "6eba7e01-588a-4631-a8a3-9eb43b950339",
+ "shape": "table",
+ "position": {
+ "x": -3270,
+ "y": -1440.5
+ },
+ "count": 0,
+ "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
+ },
{
"id": "524fda6a-d71b-4754-b673-ffc91fd753fc",
"shape": "erdRelation",
@@ -12490,66 +12806,6 @@
],
"fillColor": "#ACDAFC"
},
- {
- "id": "931877bf-1e56-4c7f-8d04-dbdc5c413431",
- "shape": "table",
- "position": {
- "x": 560,
- "y": -167
- },
- "count": 0,
- "originKey": "CD64DEB3-500E-48AF-896E-123922A03290"
- },
- {
- "id": "6cb048c4-20d9-4b73-adde-54f9b9a69833",
- "shape": "table",
- "position": {
- "x": -2570,
- "y": -1440.5
- },
- "count": 0,
- "originKey": "94B4B4F3-C3BE-4864-B348-569B98883A7B"
- },
- {
- "id": "3f2d7dc1-1053-4fac-ba54-5614f8ca4e7c",
- "shape": "table",
- "position": {
- "x": -450.5,
- "y": -368
- },
- "count": 0,
- "originKey": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213"
- },
- {
- "id": "6501de3b-730a-4df1-9e1e-f62c3d3914f0",
- "shape": "table",
- "position": {
- "x": 30,
- "y": 487
- },
- "count": 0,
- "originKey": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95"
- },
- {
- "id": "af885e60-05ef-40e3-87eb-e8b947deb9a5",
- "shape": "table",
- "position": {
- "x": 560,
- "y": 140
- },
- "count": 0,
- "originKey": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E"
- },
- {
- "id": "b7a02a04-d4af-4fa1-a3b6-1cf4c916818c",
- "shape": "table",
- "position": {
- "x": 30,
- "y": 80
- },
- "count": 0,
- "originKey": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A"
- },
{
"id": "33dd1974-86a6-4344-9c56-ed081a79fa7f",
"shape": "table",
@@ -12560,16 +12816,6 @@
"count": 0,
"originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A"
},
- {
- "id": "b9769f40-c4a3-4bc8-9301-e74876370eed",
- "shape": "table",
- "position": {
- "x": -810,
- "y": -874
- },
- "count": 0,
- "originKey": "DA24C713-1155-424A-AC92-2B2DF62789CD"
- },
{
"id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
"shape": "table",
@@ -12580,36 +12826,6 @@
"count": 0,
"originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
},
- {
- "id": "fa539400-f09d-485c-af47-7055dd7beeaa",
- "shape": "table",
- "position": {
- "x": -560,
- "y": 527
- },
- "count": 0,
- "originKey": "30E9507B-707C-4BCF-99F2-104066BCC3F9"
- },
- {
- "id": "b2ab79d9-a0c2-477f-a9b2-5198485e67f2",
- "shape": "table",
- "position": {
- "x": -461,
- "y": 180
- },
- "count": 0,
- "originKey": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74"
- },
- {
- "id": "6eba7e01-588a-4631-a8a3-9eb43b950339",
- "shape": "table",
- "position": {
- "x": -3270,
- "y": -1440.5
- },
- "count": 0,
- "originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
- },
{
"id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977",
"shape": "table",
From 1a30f0aaefb9f451b1c1454289f93b9050576270 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Tue, 11 Apr 2023 19:40:37 +0800
Subject: [PATCH 10/43] 1
---
.../BatchPurchase/BatchPurchaseBusiness.cs | 48 +++++++++++++++++++
.../PurchaseOrderV2Business.cs | 19 --------
BBWY.Server.Model/BBWY.Server.Model.csproj | 1 +
.../SearchProductSkuAndSchemeRequest.cs | 2 +
.../ProductSkuWithSchemeResponse.cs | 0
5 files changed, 51 insertions(+), 19 deletions(-)
create mode 100644 BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
delete mode 100644 BBWY.Server.Business/PurchaseOrderV2/PurchaseOrderV2Business.cs
rename BBWY.Server.Model/Dto/Request/PurchaseOrderV2/{ => BatchPurchase}/SearchProductSkuAndSchemeRequest.cs (86%)
rename BBWY.Server.Model/Dto/Response/PurchaseOrderV2/{ => BatchPurchase}/ProductSkuWithSchemeResponse.cs (100%)
diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
new file mode 100644
index 00000000..fb02caed
--- /dev/null
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -0,0 +1,48 @@
+using BBWY.Common.Models;
+using BBWY.Server.Model.Db;
+using BBWY.Server.Model.Dto;
+using BBWY.Server.Model.Dto.Response.PurchaseOrderV2;
+using System.Collections.Generic;
+using System.Linq;
+using Yitter.IdGenerator;
+
+namespace BBWY.Server.Business
+{
+ public class BatchPurchaseBusiness : BaseBusiness, IDenpendency
+ {
+ private ProductBusiness productBusiness;
+ public BatchPurchaseBusiness(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator, ProductBusiness productBusiness) : base(fsql, nLogManager, idGenerator)
+ {
+ this.productBusiness = productBusiness;
+ }
+
+ public IList GetProductSkuAndSchemeList(SearchProductSkuAndSchemeRequest request)
+ {
+ if (string.IsNullOrEmpty(request.Spu) || string.IsNullOrEmpty(request.Sku))
+ throw new BusinessException("至少具备一个Sku或Spu条件");
+
+ var productSkuList = productBusiness.GetProductSkuList(new SearchProductSkuRequest()
+ {
+ AppKey = request.AppKey,
+ AppSecret = request.AppSecret,
+ AppToken = request.AppToken,
+ Platform = request.Platform,
+ Sku = request.Sku,
+ Spu = request.Spu
+ });
+ if (productSkuList == null || productSkuList.Count() == 0)
+ return null;
+
+ var skuIdList = productSkuList.Select(s => s.Id).ToList();
+ var schemeList = fsql.Select().InnerJoin((ps, p) => ps.PurchaserId == p.Id)
+ .Where((ps, p) => ps.ShopId == request.ShopId)
+ .Where((ps, p) => ps.PurchasePlatform == request.PurchasePlatform)
+ .Where((ps, p) => skuIdList.Contains(ps.SkuId)).ToList();
+ foreach (var productSku in productSkuList)
+ {
+
+ }
+ return null;
+ }
+ }
+}
diff --git a/BBWY.Server.Business/PurchaseOrderV2/PurchaseOrderV2Business.cs b/BBWY.Server.Business/PurchaseOrderV2/PurchaseOrderV2Business.cs
deleted file mode 100644
index 3e215fcc..00000000
--- a/BBWY.Server.Business/PurchaseOrderV2/PurchaseOrderV2Business.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using BBWY.Common.Models;
-using BBWY.Server.Model.Dto;
-using BBWY.Server.Model.Dto.Response.PurchaseOrderV2;
-using Yitter.IdGenerator;
-
-namespace BBWY.Server.Business
-{
- public class PurchaseOrderV2Business : BaseBusiness, IDenpendency
- {
- public PurchaseOrderV2Business(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator) : base(fsql, nLogManager, idGenerator)
- {
- }
-
- public ProductSkuWithSchemeResponse GetProductSkuAndSchemeList(SearchProductSkuAndSchemeRequest request)
- {
- return null;
- }
- }
-}
diff --git a/BBWY.Server.Model/BBWY.Server.Model.csproj b/BBWY.Server.Model/BBWY.Server.Model.csproj
index 59de9e76..9bee62e6 100644
--- a/BBWY.Server.Model/BBWY.Server.Model.csproj
+++ b/BBWY.Server.Model/BBWY.Server.Model.csproj
@@ -13,6 +13,7 @@
+
diff --git a/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/SearchProductSkuAndSchemeRequest.cs b/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/SearchProductSkuAndSchemeRequest.cs
similarity index 86%
rename from BBWY.Server.Model/Dto/Request/PurchaseOrderV2/SearchProductSkuAndSchemeRequest.cs
rename to BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/SearchProductSkuAndSchemeRequest.cs
index f06e45f6..fd767f04 100644
--- a/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/SearchProductSkuAndSchemeRequest.cs
+++ b/BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/SearchProductSkuAndSchemeRequest.cs
@@ -2,6 +2,8 @@
{
public class SearchProductSkuAndSchemeRequest : PlatformRequest
{
+ public long ShopId { get; set; }
+
public string Spu { get; set; }
public string Sku { get; set; }
diff --git a/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/ProductSkuWithSchemeResponse.cs b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/ProductSkuWithSchemeResponse.cs
similarity index 100%
rename from BBWY.Server.Model/Dto/Response/PurchaseOrderV2/ProductSkuWithSchemeResponse.cs
rename to BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/ProductSkuWithSchemeResponse.cs
From 584eeab3141ab0effeabc698e3e6986cc3308756 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 12 Apr 2023 00:15:10 +0800
Subject: [PATCH 11/43] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8C=85=E5=90=AB?=
=?UTF-8?q?=E5=AF=B9=E5=BA=94=E5=B9=B3=E5=8F=B0=E9=87=87=E8=B4=AD=E6=96=B9?=
=?UTF-8?q?=E6=A1=88=E7=9A=84sku=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BatchPurchase/BatchPurchaseBusiness.cs | 34 ++-
.../Db/PurchaseOrder/PurchaseOrderV2.cs | 5 +
.../ProductSkuWithSchemeResponse.cs | 2 +-
BBWY.Server.Model/Enums.cs | 2 +-
BBWY.Server.Model/MappingProfiles.cs | 2 +-
...数据库-backup-2023411235916.pdma.json} | 43 ++-
...数据库-backup-2023411235945.pdma.json} | 43 ++-
...数据库-backup-2023411235948.pdma.json} | 272 +++--------------
doc/步步为盈数据库.pdma.json | 280 +++---------------
9 files changed, 191 insertions(+), 492 deletions(-)
rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023411162951.pdma.json => 步步为盈数据库-backup-2023411235916.pdma.json} (99%)
rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023411163151.pdma.json => 步步为盈数据库-backup-2023411235945.pdma.json} (99%)
rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023411163351.pdma.json => 步步为盈数据库-backup-2023411235948.pdma.json} (98%)
diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index fb02caed..daa744b5 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -1,4 +1,5 @@
-using BBWY.Common.Models;
+using BBWY.Common.Extensions;
+using BBWY.Common.Models;
using BBWY.Server.Model.Db;
using BBWY.Server.Model.Dto;
using BBWY.Server.Model.Dto.Response.PurchaseOrderV2;
@@ -16,6 +17,12 @@ namespace BBWY.Server.Business
this.productBusiness = productBusiness;
}
+ ///
+ /// 获取包含对应平台采购方案的sku列表
+ ///
+ ///
+ ///
+ ///
public IList GetProductSkuAndSchemeList(SearchProductSkuAndSchemeRequest request)
{
if (string.IsNullOrEmpty(request.Spu) || string.IsNullOrEmpty(request.Sku))
@@ -37,12 +44,29 @@ namespace BBWY.Server.Business
var schemeList = fsql.Select().InnerJoin((ps, p) => ps.PurchaserId == p.Id)
.Where((ps, p) => ps.ShopId == request.ShopId)
.Where((ps, p) => ps.PurchasePlatform == request.PurchasePlatform)
- .Where((ps, p) => skuIdList.Contains(ps.SkuId)).ToList();
- foreach (var productSku in productSkuList)
+ .Where((ps, p) => skuIdList.Contains(ps.SkuId))
+ .ToList((ps, p) => new
+ {
+ PurchaseSchemeId = ps.Id,
+ ps.PurchaserId,
+ PurchaseName = p.Name,
+ ps.PurchasePlatform,
+ ps.SkuId
+ });
+ var pruductSkuSchemeList = productSkuList.Map>();
+ foreach (var ps in pruductSkuSchemeList)
{
-
+ var scheme = schemeList.FirstOrDefault(s => s.SkuId == ps.Id);
+ if (scheme == null)
+ continue;
+ ps.PurchaseSchemeId = scheme.PurchaseSchemeId;
+ ps.PurchaserId = scheme.PurchaserId;
+ ps.PurchaseName = scheme.PurchaseName;
+ ps.PurchasePlatform = scheme.PurchasePlatform;
}
- return null;
+ return pruductSkuSchemeList;
}
+
+
}
}
diff --git a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs
index 1d74e676..c6004f8c 100644
--- a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs
+++ b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs
@@ -198,6 +198,11 @@ namespace BBWY.Server.Model.Db
[Column(MapType = typeof(int))]
public Enums.PurchaseMethod PurchaseMethod { get; set; }
+ ///
+ /// 采购单模式 批发 = 0,代发 = 1
+ ///
+ [Column(MapType = typeof(int))]
+ public Enums.PurchaseOrderMode PurchaseOrderMode { get; set; }
}
}
diff --git a/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/ProductSkuWithSchemeResponse.cs b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/ProductSkuWithSchemeResponse.cs
index 12040fda..bdad83a1 100644
--- a/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/ProductSkuWithSchemeResponse.cs
+++ b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/ProductSkuWithSchemeResponse.cs
@@ -1,4 +1,4 @@
-namespace BBWY.Server.Model.Dto.Response.PurchaseOrderV2
+namespace BBWY.Server.Model.Dto
{
///
/// 包含采购方案的Sku商品信息
diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs
index bba8aecf..33278d19 100644
--- a/BBWY.Server.Model/Enums.cs
+++ b/BBWY.Server.Model/Enums.cs
@@ -25,7 +25,7 @@
}
///
- /// 采购单模式
+ /// 采购单模式 批发 = 0,代发 = 1
///
public enum PurchaseOrderMode
{
diff --git a/BBWY.Server.Model/MappingProfiles.cs b/BBWY.Server.Model/MappingProfiles.cs
index 7427348d..e7db91b6 100644
--- a/BBWY.Server.Model/MappingProfiles.cs
+++ b/BBWY.Server.Model/MappingProfiles.cs
@@ -59,7 +59,7 @@ namespace BBWY.Server.Model
.ForPath(t => t.OrderCost.AfterTotalCost, opt => opt.MapFrom(f => f.AfterTotalCost));
CreateMap();
-
+ CreateMap();
}
}
}
diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411162951.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235916.pdma.json
similarity index 99%
rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411162951.pdma.json
rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235916.pdma.json
index bfba2eb7..0f20e94b 100644
--- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411162951.pdma.json
+++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235916.pdma.json
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.5.1",
"createdTime": "2022-10-3 12:39:39",
- "updatedTime": "2023-4-11 14:53:32",
+ "updatedTime": "2023-4-11 23:59:14",
"dbConns": [],
"profile": {
"default": {
@@ -11057,6 +11057,23 @@
"extProps": {},
"domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
"id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62"
+ },
+ {
+ "defKey": "PurchaseMode",
+ "defName": "采购模式(代发=0,批发=1)",
+ "comment": "",
+ "type": "INT",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "C85C9ED3-63F6-4CA3-9482-FA7765DDE85B"
}
],
"correlations": [],
@@ -12396,6 +12413,16 @@
"count": 0,
"originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
},
+ {
+ "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
+ "shape": "table",
+ "position": {
+ "x": -1054,
+ "y": -190
+ },
+ "count": 0,
+ "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
+ },
{
"id": "524fda6a-d71b-4754-b673-ffc91fd753fc",
"shape": "erdRelation",
@@ -12816,16 +12843,6 @@
"count": 0,
"originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A"
},
- {
- "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
- "shape": "table",
- "position": {
- "x": -1054,
- "y": -190
- },
- "count": 0,
- "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
- },
{
"id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac",
"shape": "table",
@@ -12840,8 +12857,8 @@
"id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977",
"shape": "table",
"position": {
- "x": -3220,
- "y": -69.5
+ "x": -3215.5,
+ "y": -109.5
},
"count": 0,
"originKey": "120166EB-7E57-44E5-816C-B8414CB849E9"
diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163151.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235945.pdma.json
similarity index 99%
rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163151.pdma.json
rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235945.pdma.json
index bfba2eb7..b9f2bc17 100644
--- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163151.pdma.json
+++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235945.pdma.json
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.5.1",
"createdTime": "2022-10-3 12:39:39",
- "updatedTime": "2023-4-11 14:53:32",
+ "updatedTime": "2023-4-11 23:59:16",
"dbConns": [],
"profile": {
"default": {
@@ -11057,6 +11057,23 @@
"extProps": {},
"domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
"id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62"
+ },
+ {
+ "defKey": "PurchaseMode",
+ "defName": "采购模式(代发=0,批发=1)",
+ "comment": "",
+ "type": "INT",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "C85C9ED3-63F6-4CA3-9482-FA7765DDE85B"
}
],
"correlations": [],
@@ -12396,6 +12413,16 @@
"count": 0,
"originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
},
+ {
+ "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
+ "shape": "table",
+ "position": {
+ "x": -1054,
+ "y": -190
+ },
+ "count": 0,
+ "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
+ },
{
"id": "524fda6a-d71b-4754-b673-ffc91fd753fc",
"shape": "erdRelation",
@@ -12816,16 +12843,6 @@
"count": 0,
"originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A"
},
- {
- "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
- "shape": "table",
- "position": {
- "x": -1054,
- "y": -190
- },
- "count": 0,
- "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
- },
{
"id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac",
"shape": "table",
@@ -12840,8 +12857,8 @@
"id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977",
"shape": "table",
"position": {
- "x": -3220,
- "y": -69.5
+ "x": -3215.5,
+ "y": -109.5
},
"count": 0,
"originKey": "120166EB-7E57-44E5-816C-B8414CB849E9"
diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163351.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235948.pdma.json
similarity index 98%
rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163351.pdma.json
rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235948.pdma.json
index bfba2eb7..499fe76b 100644
--- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411163351.pdma.json
+++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235948.pdma.json
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.5.1",
"createdTime": "2022-10-3 12:39:39",
- "updatedTime": "2023-4-11 14:53:32",
+ "updatedTime": "2023-4-11 23:59:45",
"dbConns": [],
"profile": {
"default": {
@@ -1339,16 +1339,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "30E9507B-707C-4BCF-99F2-104066BCC3F9",
@@ -1844,24 +1835,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7",
- "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
- "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "88311B02-719F-45ED-9603-84EEA4F6F802",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
@@ -2863,16 +2837,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "672717A5-A65E-4A6C-9F10-C4689C92FD45",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E",
@@ -3300,16 +3265,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "379D48BE-3522-413B-8FA3-752D65ADB597",
@@ -3791,24 +3747,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "65A1A6ED-EF2C-4369-8CCB-B6E762EEF9D0",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "E85EE812-0F49-49B3-8FBD-E6435CF08CDA",
- "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
- "refField": "B503CFCF-19DA-4D5B-9416-C3DD65E477CD",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1",
@@ -4064,16 +4003,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A",
@@ -4465,32 +4395,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "C2FE946F-02B4-4B24-9AA4-433A6E98F7A9",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9",
- "refEntity": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
- "refField": "1012CEB5-702E-428F-ABEF-17BD9856E4E3",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "93852E9B-AD50-40B6-A131-B62EFFE3438C",
- "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
- "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74",
@@ -4862,16 +4767,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213",
@@ -5720,16 +5616,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE",
- "refEntity": "6036D7E4-7ECB-4888-9D74-58DA414447F8",
- "refField": "0EE3108C-0995-4D82-AA03-FF63F0D62626",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
@@ -7292,16 +7179,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E",
- "refEntity": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE",
- "refField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
@@ -7559,16 +7437,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "98F8F005-A630-4C98-8C1F-ECCA64E65996",
- "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
- "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2",
@@ -7843,24 +7712,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "61C58DEB-2779-451F-82AD-3B03BC9C795D",
- "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
- "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "4C09B365-4B2A-4613-9133-DF0421BFC85C",
- "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
- "refField": "41BFEC37-8F13-42D0-B8ED-123071447D18",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "65A6F4A2-D006-4FC7-BED7-53209273F05E",
@@ -8406,16 +8258,7 @@
"id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9"
}
],
- "correlations": [
- {
- "myField": "A3C3A9A6-05BF-4514-9789-15C5732F7241",
- "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
- "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ],
+ "correlations": [],
"indexes": []
},
{
@@ -9146,24 +8989,7 @@
"id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
}
],
- "correlations": [
- {
- "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
- "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
- "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "16E62919-C979-4830-930A-EAE234252B2F",
- "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
- "refField": "81703BD3-514F-4E8E-8898-54FDBFF90D7A",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ],
+ "correlations": [],
"indexes": []
},
{
@@ -9911,32 +9737,7 @@
"id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
}
],
- "correlations": [
- {
- "myField": "5F519CD5-5B0E-4C18-99AD-CD24BADE9ED3",
- "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
- "refField": "ED33CB09-DBB2-4FD6-B3E9-BEE77BD14B63",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
- "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
- "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "58444AC3-3BDE-408A-BE47-3C063EC54731",
- "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386",
- "refField": "16E62919-C979-4830-930A-EAE234252B2F",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ],
+ "correlations": [],
"indexes": []
},
{
@@ -11057,6 +10858,23 @@
"extProps": {},
"domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
"id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62"
+ },
+ {
+ "defKey": "PurchaseOrderMode",
+ "defName": "采购模式(批发=0,代发=1)",
+ "comment": "",
+ "type": "INT",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "C85C9ED3-63F6-4CA3-9482-FA7765DDE85B"
}
],
"correlations": [],
@@ -12396,6 +12214,16 @@
"count": 0,
"originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
},
+ {
+ "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
+ "shape": "table",
+ "position": {
+ "x": -1054,
+ "y": -190
+ },
+ "count": 0,
+ "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
+ },
{
"id": "524fda6a-d71b-4754-b673-ffc91fd753fc",
"shape": "erdRelation",
@@ -12816,16 +12644,6 @@
"count": 0,
"originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A"
},
- {
- "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
- "shape": "table",
- "position": {
- "x": -1054,
- "y": -190
- },
- "count": 0,
- "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
- },
{
"id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac",
"shape": "table",
@@ -12840,8 +12658,8 @@
"id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977",
"shape": "table",
"position": {
- "x": -3220,
- "y": -69.5
+ "x": -3215.5,
+ "y": -109.5
},
"count": 0,
"originKey": "120166EB-7E57-44E5-816C-B8414CB849E9"
diff --git a/doc/步步为盈数据库.pdma.json b/doc/步步为盈数据库.pdma.json
index 14b6d79f..9357debb 100644
--- a/doc/步步为盈数据库.pdma.json
+++ b/doc/步步为盈数据库.pdma.json
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.5.1",
"createdTime": "2022-10-3 12:39:39",
- "updatedTime": "2023-4-11 16:33:51",
+ "updatedTime": "2023-4-11 23:59:48",
"dbConns": [],
"profile": {
"default": {
@@ -1339,16 +1339,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "30E9507B-707C-4BCF-99F2-104066BCC3F9",
@@ -1844,24 +1835,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7",
- "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
- "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "88311B02-719F-45ED-9603-84EEA4F6F802",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
@@ -2863,16 +2837,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "672717A5-A65E-4A6C-9F10-C4689C92FD45",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E",
@@ -3300,16 +3265,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "379D48BE-3522-413B-8FA3-752D65ADB597",
@@ -3791,24 +3747,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "65A1A6ED-EF2C-4369-8CCB-B6E762EEF9D0",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "E85EE812-0F49-49B3-8FBD-E6435CF08CDA",
- "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
- "refField": "B503CFCF-19DA-4D5B-9416-C3DD65E477CD",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1",
@@ -4064,16 +4003,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A",
@@ -4465,32 +4395,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "C2FE946F-02B4-4B24-9AA4-433A6E98F7A9",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9",
- "refEntity": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
- "refField": "1012CEB5-702E-428F-ABEF-17BD9856E4E3",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "93852E9B-AD50-40B6-A131-B62EFFE3438C",
- "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
- "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74",
@@ -4862,16 +4767,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213",
@@ -5720,16 +5616,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE",
- "refEntity": "6036D7E4-7ECB-4888-9D74-58DA414447F8",
- "refField": "0EE3108C-0995-4D82-AA03-FF63F0D62626",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
@@ -7292,16 +7179,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E",
- "refEntity": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE",
- "refField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
@@ -7559,16 +7437,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "98F8F005-A630-4C98-8C1F-ECCA64E65996",
- "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
- "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2",
@@ -7843,24 +7712,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "61C58DEB-2779-451F-82AD-3B03BC9C795D",
- "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
- "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "4C09B365-4B2A-4613-9133-DF0421BFC85C",
- "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
- "refField": "41BFEC37-8F13-42D0-B8ED-123071447D18",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "65A6F4A2-D006-4FC7-BED7-53209273F05E",
@@ -8406,16 +8258,7 @@
"id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9"
}
],
- "correlations": [
- {
- "myField": "A3C3A9A6-05BF-4514-9789-15C5732F7241",
- "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
- "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ],
+ "correlations": [],
"indexes": []
},
{
@@ -9146,24 +8989,7 @@
"id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
}
],
- "correlations": [
- {
- "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
- "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
- "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "16E62919-C979-4830-930A-EAE234252B2F",
- "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
- "refField": "81703BD3-514F-4E8E-8898-54FDBFF90D7A",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ],
+ "correlations": [],
"indexes": []
},
{
@@ -9911,32 +9737,7 @@
"id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
}
],
- "correlations": [
- {
- "myField": "5F519CD5-5B0E-4C18-99AD-CD24BADE9ED3",
- "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
- "refField": "ED33CB09-DBB2-4FD6-B3E9-BEE77BD14B63",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
- "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
- "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "58444AC3-3BDE-408A-BE47-3C063EC54731",
- "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386",
- "refField": "16E62919-C979-4830-930A-EAE234252B2F",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ],
+ "correlations": [],
"indexes": []
},
{
@@ -11057,6 +10858,23 @@
"extProps": {},
"domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
"id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62"
+ },
+ {
+ "defKey": "PurchaseOrderMode",
+ "defName": "采购模式(批发=0,代发=1)",
+ "comment": "",
+ "type": "INT",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "",
+ "id": "C85C9ED3-63F6-4CA3-9482-FA7765DDE85B"
}
],
"correlations": [],
@@ -12396,6 +12214,16 @@
"count": 0,
"originKey": "70EFBBA5-586A-41A9-9051-03B037561DE3"
},
+ {
+ "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
+ "shape": "table",
+ "position": {
+ "x": -1054,
+ "y": -190
+ },
+ "count": 0,
+ "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
+ },
{
"id": "524fda6a-d71b-4754-b673-ffc91fd753fc",
"shape": "erdRelation",
@@ -12817,34 +12645,24 @@
"originKey": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A"
},
{
- "id": "a359e79a-9a34-4544-9c84-8a5f36d6d13c",
+ "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac",
"shape": "table",
"position": {
- "x": -1054,
- "y": -190
+ "x": -3215.5,
+ "y": 699
},
"count": 0,
- "originKey": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE"
+ "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7"
},
{
"id": "35a02c8f-1018-48f6-bac0-e2ab5e9c2977",
"shape": "table",
- "position": {
- "x": -3220,
- "y": -69.5
- },
- "count": 0,
- "originKey": "120166EB-7E57-44E5-816C-B8414CB849E9"
- },
- {
- "id": "0474402c-8e31-4b5b-8a5f-7c49f08dacac",
- "shape": "table",
"position": {
"x": -3215.5,
- "y": 699
+ "y": -109.5
},
"count": 0,
- "originKey": "53BD286F-7539-410C-ADC1-E37C4D3D6EB7"
+ "originKey": "120166EB-7E57-44E5-816C-B8414CB849E9"
}
]
},
From 6560ba655204cc1c8647d694b27836f9efcd485c Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Wed, 12 Apr 2023 01:58:18 +0800
Subject: [PATCH 12/43] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E5=88=97?=
=?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BBWY.Client/App.xaml.cs | 11 +-
BBWY.Client/Models/Enums.cs | 7 +
.../BatchPurchaseOrderListViewModel.cs | 85 +++++++
BBWY.Client/ViewModels/MainViewModel.cs | 10 +
BBWY.Client/ViewModels/ViewModelLocator.cs | 9 +
.../BatchPurchase/BatchPurchaseOrderList.xaml | 151 +++++++++++
.../BatchPurchaseOrderList.xaml.cs | 26 ++
.../ServiceOrder/ServiceOrderBusiness.cs | 2 +
.../Db/PurchaseOrder/PurchaseOrderV2.cs | 4 +-
BBWY.Server.Model/Enums.cs | 8 +
...数据库-backup-2023412003649.pdma.json} | 235 ++----------------
doc/步步为盈数据库.pdma.json | 2 +-
12 files changed, 325 insertions(+), 225 deletions(-)
create mode 100644 BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs
create mode 100644 BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
create mode 100644 BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml.cs
rename doc/.back_步步为盈数据库/{步步为盈数据库-backup-2023411235916.pdma.json => 步步为盈数据库-backup-2023412003649.pdma.json} (98%)
diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs
index 5cea52bc..2dca752c 100644
--- a/BBWY.Client/App.xaml.cs
+++ b/BBWY.Client/App.xaml.cs
@@ -47,13 +47,13 @@ namespace BBWY.Client
string userToken = string.Empty;
-
+
#if DEBUG
//仓库组测试
- // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek";
+ // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek";
//齐越山鸡
- userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
+ userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
//刷单组测试
//userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs";
@@ -105,13 +105,13 @@ namespace BBWY.Client
IServiceCollection serviceCollection = new ServiceCollection();
serviceCollection.AddHttpClient();
- // serviceCollection.AddTransient();
+ // serviceCollection.AddTransient();
serviceCollection.AddHttpClient("gzip").ConfigurePrimaryHttpMessageHandler(handler => new HttpClientHandler()
{
AutomaticDecompression = System.Net.DecompressionMethods.GZip
});
-
+
serviceCollection.AddMemoryCache();
serviceCollection.AddSingleton();
serviceCollection.AddSingleton(gl);
@@ -121,6 +121,7 @@ namespace BBWY.Client
serviceCollection.AddTransient<_1688PreviewPurchaseViewModel>();
serviceCollection.AddTransient();
+
#region 注册拳探SDK相关类
serviceCollection.AddSingleton();
#endregion
diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs
index 50640ff2..fbe5ae82 100644
--- a/BBWY.Client/Models/Enums.cs
+++ b/BBWY.Client/Models/Enums.cs
@@ -371,4 +371,11 @@
无 = 0, 非新 = 1, 新 = 2
}
+ ///
+ /// 采购单状态 待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消= 7
+ ///
+ public enum PurchaseOrderState
+ {
+ 待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7
+ }
}
diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs
new file mode 100644
index 00000000..d7b22ff7
--- /dev/null
+++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs
@@ -0,0 +1,85 @@
+using BBWY.Client.Models;
+using BBWY.Common.Models;
+using GalaSoft.MvvmLight.Command;
+using System;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace BBWY.Client.ViewModels
+{
+ public class BatchPurchaseOrderListViewModel : BaseVM, IDenpendency
+ {
+ private GlobalContext globalContext;
+ private DateTime startDate;
+ private DateTime endDate;
+ private string searchPurchaseOrderId;
+ private string searchPurchaseName;
+ private string searchProductId;
+ private string searchSkuId;
+ private PurchaseOrderState? purchaseOrderState;
+ private int pageIndex;
+ private int pageSize;
+
+ public ICommand SearchPurchaseOrderCommand { get; set; }
+ public ICommand OpenCreateNewPurchaseOrderDialogCommand { get; set; }
+
+ public ICommand SetSearchDateCommand { get; set; }
+
+ public ICommand SetPurchaseOrderStateCommand { get; set; }
+
+
+ public DateTime StartDate { get => startDate; set { Set(ref startDate, value); } }
+ public DateTime EndDate { get => endDate; set { Set(ref endDate, value); } }
+ public string SearchPurchaseOrderId { get => searchPurchaseOrderId; set { Set(ref searchPurchaseOrderId, value); } }
+ public string SearchPurchaseName { get => searchPurchaseName; set { Set(ref searchPurchaseName, value); } }
+ public string SearchProductId { get => searchProductId; set { Set(ref searchProductId, value); } }
+ public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } }
+ public PurchaseOrderState? PurchaseOrderState { get => purchaseOrderState; set { Set(ref purchaseOrderState, value); } }
+ public int PageIndex { get => pageIndex; set { Set(ref pageIndex, value); } }
+
+ public int PageSize { get => pageSize; set { Set(ref pageSize, value); } }
+
+ public BatchPurchaseOrderListViewModel(GlobalContext globalContext)
+ {
+ SetSearchDateCommand = new RelayCommand(SetSearchDate);
+ SetPurchaseOrderStateCommand = new RelayCommand(SetPurchaseOrderState);
+ SearchPurchaseOrderCommand = new RelayCommand(InitQueryPurchaseOrder);
+ OpenCreateNewPurchaseOrderDialogCommand = new RelayCommand(OpenCreateNewPurchaseOrderDialog);
+ PageSize = 10;
+ this.globalContext = globalContext;
+ EndDate = DateTime.Now.Date;
+ StartDate = DateTime.Now.Date.AddDays(-15);
+ InitQueryPurchaseOrder();
+ }
+
+
+ private void InitQueryPurchaseOrder()
+ {
+ PageIndex = 1;
+ Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));
+ }
+
+ private void SetPurchaseOrderState(PurchaseOrderState? purchaseOrderState)
+ {
+ this.PurchaseOrderState = purchaseOrderState;
+ InitQueryPurchaseOrder();
+ }
+
+ private void SetSearchDate(int d)
+ {
+ EndDate = d == 1 ? DateTime.Now.Date.AddDays(-1) : DateTime.Now;
+ StartDate = DateTime.Now.Date.AddDays(d * -1);
+ InitQueryPurchaseOrder();
+ }
+
+ private void QueryPurchaseOrder(int pageIndex)
+ {
+
+ }
+
+ private void OpenCreateNewPurchaseOrderDialog()
+ {
+
+ }
+ }
+}
diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs
index 1a7d75d8..239e06b3 100644
--- a/BBWY.Client/ViewModels/MainViewModel.cs
+++ b/BBWY.Client/ViewModels/MainViewModel.cs
@@ -164,6 +164,16 @@ namespace BBWY.Client.ViewModels
}
});
+ MenuList.Add(new MenuModel()
+ {
+ Name = "采购管理",
+ ChildList = new List()
+ {
+ new MenuModel(){ Name="采购列表",Url="/Views/BatchPurchase/BatchPurchaseOrderList.xaml" }
+ //new MenuModel(){ Name="采购账单",Url="/Views/ServiceOrder/ServiceOrderList.xaml" }
+ }
+ });
+
MenuList.Add(new MenuModel()
{
Name = "商品管理",
diff --git a/BBWY.Client/ViewModels/ViewModelLocator.cs b/BBWY.Client/ViewModels/ViewModelLocator.cs
index daf28eb1..00d7dcc5 100644
--- a/BBWY.Client/ViewModels/ViewModelLocator.cs
+++ b/BBWY.Client/ViewModels/ViewModelLocator.cs
@@ -238,5 +238,14 @@ namespace BBWY.Client.ViewModels
return s.ServiceProvider.GetRequiredService();
}
}
+
+ public BatchPurchaseOrderListViewModel BatchPurchaseOrderListVM
+ {
+ get
+ {
+ using var s = sp.CreateScope();
+ return s.ServiceProvider.GetRequiredService();
+ }
+ }
}
}
diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
new file mode 100644
index 00000000..51071d2c
--- /dev/null
+++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
@@ -0,0 +1,151 @@
+
+
+ 0
+ 1
+ 2
+ 6
+ 14
+ 29
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml.cs b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml.cs
new file mode 100644
index 00000000..e7be8d60
--- /dev/null
+++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BBWY.Client.Views.BatchPurchase
+{
+ ///
+ /// BatchPurchaseOrderList.xaml 的交互逻辑
+ ///
+ public partial class BatchPurchaseOrderList : Page
+ {
+ public BatchPurchaseOrderList()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/BBWY.Server.Business/ServiceOrder/ServiceOrderBusiness.cs b/BBWY.Server.Business/ServiceOrder/ServiceOrderBusiness.cs
index 8c6e3878..50a40375 100644
--- a/BBWY.Server.Business/ServiceOrder/ServiceOrderBusiness.cs
+++ b/BBWY.Server.Business/ServiceOrder/ServiceOrderBusiness.cs
@@ -17,6 +17,8 @@ namespace BBWY.Server.Business
public ServiceOrderResponse GetList(ClientQueryServiceOrderRequest request)
{
+ if (request.EndDate != null)
+ request.EndDate = request.EndDate.Value.Date.AddDays(1).AddSeconds(-1);
var list = fsql.Select()
.InnerJoin((s, o, osku) => s.OrderId == o.Id)
.InnerJoin((s, o, osku) => s.OrderId == osku.OrderId && s.SkuId == osku.SkuId)
diff --git a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs
index c6004f8c..7b77a78d 100644
--- a/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs
+++ b/BBWY.Server.Model/Db/PurchaseOrder/PurchaseOrderV2.cs
@@ -111,8 +111,8 @@ namespace BBWY.Server.Model.Db
///
/// 采购单状态(待付款=0,待发货=1,待收货=2,待质检=3,待打包=4,待结算=5,已完成=6)
///
-
- public int? OrderState { get; set; }
+ [Column(MapType = typeof(int?))]
+ public Enums.PurchaseOrderState? OrderState { get; set; }
///
/// 支付时间
diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs
index 33278d19..35b8cf42 100644
--- a/BBWY.Server.Model/Enums.cs
+++ b/BBWY.Server.Model/Enums.cs
@@ -311,5 +311,13 @@
{
无 = 0, 非新 = 1, 新 = 2
}
+
+ ///
+ /// 采购单状态 待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消= 7
+ ///
+ public enum PurchaseOrderState
+ {
+ 待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7
+ }
}
}
diff --git a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235916.pdma.json b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023412003649.pdma.json
similarity index 98%
rename from doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235916.pdma.json
rename to doc/.back_步步为盈数据库/步步为盈数据库-backup-2023412003649.pdma.json
index 0f20e94b..9357debb 100644
--- a/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023411235916.pdma.json
+++ b/doc/.back_步步为盈数据库/步步为盈数据库-backup-2023412003649.pdma.json
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.5.1",
"createdTime": "2022-10-3 12:39:39",
- "updatedTime": "2023-4-11 23:59:14",
+ "updatedTime": "2023-4-11 23:59:48",
"dbConns": [],
"profile": {
"default": {
@@ -1339,16 +1339,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "8BF0615B-95E0-4B44-A1C3-85FFCFB498E3",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "30E9507B-707C-4BCF-99F2-104066BCC3F9",
@@ -1844,24 +1835,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "DEFBFE32-2FF7-41E5-A871-2978539AD6A7",
- "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
- "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "88311B02-719F-45ED-9603-84EEA4F6F802",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
@@ -2863,16 +2837,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "672717A5-A65E-4A6C-9F10-C4689C92FD45",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "6C3F90C3-1F4F-48DC-AF2B-6F3A91D4940E",
@@ -3300,16 +3265,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "E3ECBB1B-D2F3-45AE-AD54-FB0A6886635E",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "379D48BE-3522-413B-8FA3-752D65ADB597",
@@ -3791,24 +3747,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "65A1A6ED-EF2C-4369-8CCB-B6E762EEF9D0",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "E85EE812-0F49-49B3-8FBD-E6435CF08CDA",
- "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
- "refField": "B503CFCF-19DA-4D5B-9416-C3DD65E477CD",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "D2D83A3F-F985-44C0-9E6B-057FE01F7FD1",
@@ -4064,16 +4003,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "3D2A0846-F961-4CC6-82DD-AC9D778700AF",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "AFBF3A2E-1169-4602-B6D0-7C109C293E9A",
@@ -4465,32 +4395,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "C2FE946F-02B4-4B24-9AA4-433A6E98F7A9",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "EDBAA4E6-1F5F-4FF4-B467-B02ED749BCD9",
- "refEntity": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
- "refField": "1012CEB5-702E-428F-ABEF-17BD9856E4E3",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "93852E9B-AD50-40B6-A131-B62EFFE3438C",
- "refEntity": "F9DDBC09-6B8A-48B8-A106-8F2A7966AA95",
- "refField": "3F567BD5-256D-4843-ADDF-0805BE706112",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "37E1918D-18E8-4C9F-8FBB-46D84FFCAE74",
@@ -4862,16 +4767,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "BD4C9D08-9D6C-4878-A539-BE15AC2420E3",
- "refEntity": "B1B951BE-3C55-45E9-9261-1DE7A0C6632A",
- "refField": "198D443B-59EF-4F60-AA16-7F7CCBA63E76",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "256CDFD8-1EC5-47EA-ACC2-5294AE9CF213",
@@ -5720,16 +5616,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "9A555E08-6CC2-4A7C-8967-888F2B46CBFE",
- "refEntity": "6036D7E4-7ECB-4888-9D74-58DA414447F8",
- "refField": "0EE3108C-0995-4D82-AA03-FF63F0D62626",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "E51CCB7C-B9EA-45B5-BE76-FE53E8ECA4EE",
@@ -7292,16 +7179,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "5FD032F5-CF4B-4308-BB7C-2B1F6FD7774E",
- "refEntity": "5F14586C-79ED-49B2-AA36-01DCC2D5B3FE",
- "refField": "6F03B0D9-DECD-45A0-B0F5-1921289472EF",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
@@ -7559,16 +7437,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "98F8F005-A630-4C98-8C1F-ECCA64E65996",
- "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
- "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "8B58D0E4-2781-49D2-9B31-682EAE4D94C2",
@@ -7843,24 +7712,7 @@
"hideInGraph": true
}
],
- "correlations": [
- {
- "myField": "61C58DEB-2779-451F-82AD-3B03BC9C795D",
- "refEntity": "31D73A1D-A582-48E3-8D31-1F65E1B7BC32",
- "refField": "69FA1246-23B5-4DB0-9CD7-A82D5E27C1CF",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "4C09B365-4B2A-4613-9133-DF0421BFC85C",
- "refEntity": "34EEFEC3-FF23-4ABF-8C72-CE57979E444A",
- "refField": "41BFEC37-8F13-42D0-B8ED-123071447D18",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ]
+ "correlations": []
},
{
"id": "65A6F4A2-D006-4FC7-BED7-53209273F05E",
@@ -8406,16 +8258,7 @@
"id": "FB5BB057-8F3E-4F68-91CF-7E2923C489F9"
}
],
- "correlations": [
- {
- "myField": "A3C3A9A6-05BF-4514-9789-15C5732F7241",
- "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
- "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ],
+ "correlations": [],
"indexes": []
},
{
@@ -9146,24 +8989,7 @@
"id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
}
],
- "correlations": [
- {
- "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
- "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
- "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "16E62919-C979-4830-930A-EAE234252B2F",
- "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
- "refField": "81703BD3-514F-4E8E-8898-54FDBFF90D7A",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ],
+ "correlations": [],
"indexes": []
},
{
@@ -9911,32 +9737,7 @@
"id": "07FFE4B1-4275-4407-832A-1F2193E3DA37"
}
],
- "correlations": [
- {
- "myField": "5F519CD5-5B0E-4C18-99AD-CD24BADE9ED3",
- "refEntity": "91555D00-CE97-4666-94BA-E83996533E52",
- "refField": "ED33CB09-DBB2-4FD6-B3E9-BEE77BD14B63",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
- "refEntity": "C70CFE85-2B7B-4409-B60C-0B9D1494C022",
- "refField": "6680ECC1-3A51-4EC6-BDD8-7F8B0FEB6788",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- },
- {
- "myField": "58444AC3-3BDE-408A-BE47-3C063EC54731",
- "refEntity": "28A57F78-5B0C-4F38-B3D8-CAE9A0950386",
- "refField": "16E62919-C979-4830-930A-EAE234252B2F",
- "myRows": "1",
- "refRows": "n",
- "innerType": ""
- }
- ],
+ "correlations": [],
"indexes": []
},
{
@@ -11059,8 +10860,8 @@
"id": "4318BD45-E948-4B1C-BBE7-8F1D5CE8BD62"
},
{
- "defKey": "PurchaseMode",
- "defName": "采购模式(代发=0,批发=1)",
+ "defKey": "PurchaseOrderMode",
+ "defName": "采购模式(批发=0,代发=1)",
"comment": "",
"type": "INT",
"len": "",
diff --git a/doc/步步为盈数据库.pdma.json b/doc/步步为盈数据库.pdma.json
index 9357debb..ad570ba4 100644
--- a/doc/步步为盈数据库.pdma.json
+++ b/doc/步步为盈数据库.pdma.json
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.5.1",
"createdTime": "2022-10-3 12:39:39",
- "updatedTime": "2023-4-11 23:59:48",
+ "updatedTime": "2023-4-12 00:36:49",
"dbConns": [],
"profile": {
"default": {
From 64b007db557f090dc0949ef50f6c3ed93ff4e730 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Wed, 12 Apr 2023 19:18:18 +0800
Subject: [PATCH 13/43] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8C=85=E5=90=AB?=
=?UTF-8?q?=E5=AF=B9=E5=BA=94=E5=B9=B3=E5=8F=B0=E9=87=87=E8=B4=AD=E6=96=B9?=
=?UTF-8?q?=E6=A1=88=E7=9A=84sku=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BBWY.Client/App.xaml.cs | 3 +-
.../ProductSkuWithSchemeResponse.cs | 40 ++++
.../BatchPurchase/ProductSkuWithScheme.cs | 49 +++++
.../BatchPurchaseAddProductSkuViewModel.cs | 10 +
.../BatchPurchaseCreateNewOrderViewModel.cs | 198 ++++++++++++++++++
.../BatchPurchaseOrderListViewModel.cs | 9 +-
BBWY.Client/ViewModels/MainViewModel.cs | 3 +-
BBWY.Client/ViewModels/ViewModelLocator.cs | 25 ++-
.../BatchCreateNewPurchaseOrder.xaml | 149 +++++++++++++
.../BatchCreateNewPurchaseOrder.xaml.cs | 26 +++
.../BatchPurchaseAddProductSku.xaml | 57 +++++
.../BatchPurchaseAddProductSku.xaml.cs | 26 +++
.../Controllers/BatchPurchaseController.cs | 29 +++
.../BatchPurchase/BatchPurchaseBusiness.cs | 67 ++++--
.../SearchProductSkuAndSchemeRequest.cs | 2 -
.../ProductSkuWithSchemeResponse.cs | 30 ++-
16 files changed, 697 insertions(+), 26 deletions(-)
create mode 100644 BBWY.Client/Models/APIModel/Response/BatchPurchase/ProductSkuWithSchemeResponse.cs
create mode 100644 BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs
create mode 100644 BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs
create mode 100644 BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
create mode 100644 BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml
create mode 100644 BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml.cs
create mode 100644 BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
create mode 100644 BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml.cs
create mode 100644 BBWY.Server.API/Controllers/BatchPurchaseController.cs
diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs
index 2dca752c..ed5c0cd0 100644
--- a/BBWY.Client/App.xaml.cs
+++ b/BBWY.Client/App.xaml.cs
@@ -120,7 +120,8 @@ namespace BBWY.Client
serviceCollection.AddTransient<_1688PreviewPurchaseViewModel>();
serviceCollection.AddTransient();
-
+ serviceCollection.AddTransient();
+ serviceCollection.AddTransient();
#region 注册拳探SDK相关类
serviceCollection.AddSingleton();
diff --git a/BBWY.Client/Models/APIModel/Response/BatchPurchase/ProductSkuWithSchemeResponse.cs b/BBWY.Client/Models/APIModel/Response/BatchPurchase/ProductSkuWithSchemeResponse.cs
new file mode 100644
index 00000000..675dab4f
--- /dev/null
+++ b/BBWY.Client/Models/APIModel/Response/BatchPurchase/ProductSkuWithSchemeResponse.cs
@@ -0,0 +1,40 @@
+using System;
+
+namespace BBWY.Client.Models
+{
+ ///
+ /// 包含采购方案的Sku商品信息
+ ///
+ public class ProductSkuWithSchemeResponse
+ {
+ public string Id { get; set; }
+
+ public string ProductId { get; set; }
+
+ public string SkuId { get; set; }
+
+ public decimal Price { get; set; }
+
+ ///
+ /// Sku标题
+ ///
+ public string Title { get; set; }
+
+ public string Logo { get; set; }
+
+ ///
+ /// 京东Sku状态【1:上架 2:下架 4:删除】
+ ///
+ public int State { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public long PurchaseSchemeId { get; set; }
+
+ public string PurchaserId { get; set; }
+
+ public string PurchaseName { get; set; }
+
+ public Platform? PurchasePlatform { get; set; }
+ }
+}
diff --git a/BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs b/BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs
new file mode 100644
index 00000000..e4836ff8
--- /dev/null
+++ b/BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace BBWY.Client.Models
+{
+ public class ProductSkuWithScheme : NotifyObject
+ {
+ private int quantity;
+ public string Id { get; set; }
+
+ public string SkuId { get; set; }
+
+ public string ProductId { get; set; }
+
+ public decimal Price { get; set; }
+
+ ///
+ /// Sku标题
+ ///
+ public string Title { get; set; }
+
+ public string Logo { get; set; }
+
+ ///
+ /// 京东Sku状态【1:上架 2:下架 4:删除】
+ ///
+ public int State { get; set; }
+
+ public DateTime? CreateTime { get; set; }
+
+ public long PurchaseSchemeId { get; set; }
+
+ public string PurchaserId { get; set; }
+
+ public string PurchaseName { get; set; }
+
+ public Platform? PurchasePlatform { get; set; }
+
+ public int Quantity { get => quantity; set { Set(ref quantity, value); } }
+
+ public IList PurchaseSchemeProductSkuList { get; set; }
+
+ public ProductSkuWithScheme()
+ {
+ PurchaseSchemeProductSkuList = new ObservableCollection();
+ }
+ }
+}
diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs
new file mode 100644
index 00000000..53757b1b
--- /dev/null
+++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BBWY.Client.ViewModels
+{
+ public class BatchPurchaseAddProductSkuViewModel : BaseVM
+ {
+ }
+}
diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
new file mode 100644
index 00000000..380fd365
--- /dev/null
+++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
@@ -0,0 +1,198 @@
+using BBWY.Client.APIServices;
+using BBWY.Client.Models;
+using BBWY.Client.Views.BatchPurchase;
+using GalaSoft.MvvmLight.Command;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+
+namespace BBWY.Client.ViewModels
+{
+ public class BatchPurchaseCreateNewOrderViewModel : BaseVM
+ {
+ private PurchaseProductAPIService purchaseProductAPIService;
+
+ private bool isLoading;
+ private decimal productAmount;
+ private decimal freightAmount;
+ private decimal totalAmount;
+ private string contactName;
+ private string address;
+ private string mobile;
+ private string province;
+ private string city;
+ private string county;
+ private string town;
+ private string prucahseRemark;
+ private PurchaseOrderMode purchaseOrderMode = PurchaseOrderMode.代发;
+ public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
+
+ public decimal ProductAmount { get => productAmount; set { Set(ref productAmount, value); } }
+ public decimal FreightAmount { get => freightAmount; set { Set(ref freightAmount, value); } }
+ public decimal TotalAmount { get => totalAmount; set { Set(ref totalAmount, value); } }
+ public string ContactName { get => contactName; set { Set(ref contactName, value); } }
+ public string Address { get => address; set { Set(ref address, value); } }
+ public string Mobile { get => mobile; set { Set(ref mobile, value); } }
+ public string Province { get => province; set { Set(ref province, value); } }
+ public string City { get => city; set { Set(ref city, value); } }
+ public string County { get => county; set { Set(ref county, value); } }
+ public string Town { get => town; set { Set(ref town, value); } }
+ public string PrucahseRemark { get => prucahseRemark; set { Set(ref prucahseRemark, value); } }
+
+ public PurchaseOrderMode PurchaseOrderMode
+ {
+ get => purchaseOrderMode; set
+ {
+ if (Set(ref purchaseOrderMode, value))
+ OnDelayTriggerExecute(Guid.NewGuid().ToString());
+ }
+ }
+ public IList ProductSkuWithSchemeList { get; set; }
+
+
+ public ICommand FastCreateOrderCommand { get; set; }
+ public ICommand PreviewOrderCommand { get; set; }
+ public ICommand AddProductSkuCommand { get; set; }
+
+ public BatchPurchaseCreateNewOrderViewModel(PurchaseProductAPIService purchaseProductAPIService)
+ {
+ this.purchaseProductAPIService = purchaseProductAPIService;
+ ProductSkuWithSchemeList = new ObservableCollection();
+
+ FastCreateOrderCommand = new RelayCommand(FastCreateOrder);
+ PreviewOrderCommand = new RelayCommand(PreviewOrder);
+ AddProductSkuCommand = new RelayCommand(AddProductSku);
+ }
+
+ private void OnDelayTriggerExecute(string key)
+ {
+ if (string.IsNullOrEmpty(key))
+ {
+ IsLoading = false;
+ return;
+ }
+
+ if (string.IsNullOrEmpty(ContactName) ||
+ string.IsNullOrEmpty(Address) ||
+ string.IsNullOrEmpty(Mobile) ||
+ string.IsNullOrEmpty(Province) ||
+ string.IsNullOrEmpty(City) ||
+ string.IsNullOrEmpty(County))
+ {
+ IsLoading = false;
+ MessageBox.Show("缺少完整的收货信息", "提示");
+ return;
+ }
+
+ //IsLoading = true;
+ //Task.Factory.StartNew(() => purchaseOrderService.PreviewPurchaseOrder(new Consignee()
+ //{
+ // Address = Address,
+ // City = City,
+ // ContactName = ContactName,
+ // County = County,
+ // Mobile = Mobile,
+ // Province = Province,
+ // TelePhone = Mobile,
+ // Town = Town
+ //}, PurchaseSchemeProductSkuList, purchaseAccount.PurchasePlatformId, purchaseAccount, PurchaseOrderMode))
+ // .ContinueWith(t =>
+ // {
+ // IsLoading = false;
+ // var r = t.Result;
+ // if (!r.Success)
+ // {
+ // ProductAmount = FreightAmount = TotalAmount = 0;
+ // tradeMode = string.Empty;
+ // App.Current.Dispatcher.Invoke(() => MessageBox.Show(r.Msg, "预览订单报价"));
+ // return;
+ // }
+ // ProductAmount = r.Data.ProductAmount;
+ // FreightAmount = r.Data.FreightAmount;
+ // TotalAmount = r.Data.TotalAmount;
+ // tradeMode = r.Data.OrderTradeType?.Code;
+ // extensions = r.Data.Extensions;
+ // });
+ }
+
+ private void PreviewOrder()
+ {
+ OnDelayTriggerExecute(Guid.NewGuid().ToString());
+ }
+
+ private void FastCreateOrder()
+ {
+ if (IsLoading)
+ return;
+ if (TotalAmount == 0)
+ {
+ MessageBox.Show("总金额为0不能提交订单", "提示");
+ return;
+ }
+ if (string.IsNullOrEmpty(Mobile) ||
+ string.IsNullOrEmpty(Address) ||
+ string.IsNullOrEmpty(City) ||
+ string.IsNullOrEmpty(Province) ||
+ string.IsNullOrEmpty(County) ||
+ string.IsNullOrEmpty(Town) ||
+ string.IsNullOrEmpty(ContactName))
+ {
+ MessageBox.Show("收货人信息不全", "下单");
+ return;
+ }
+
+ //IsLoading = true;
+ //Task.Factory.StartNew(() => purchaseOrderService.FastCreateOrder(new Consignee()
+ //{
+ // Address = Address,
+ // City = City,
+ // ContactName = ContactName,
+ // County = County,
+ // Mobile = Mobile,
+ // Province = Province,
+ // TelePhone = Mobile,
+ // Town = Town
+ //}, PurchaseSchemeProductSkuList,
+ // purchaseAccount.PurchasePlatformId,
+ // purchaseAccount,
+ // PurchaseOrderMode,
+ // tradeMode,
+ // PrucahseRemark,
+ // order.Id,
+ // globalContext.User.Shop.ShopId,
+ // purchaseAccount.Id,
+ // purchaseAccount.AccountName,
+ // purchaseSchemeList[0].PurchaserName,
+ // purchaser.Id,
+ // globalContext.User.Shop.PlatformCommissionRatio ?? 0.05M,
+ // extensions)).ContinueWith(t =>
+ // {
+ // IsLoading = false;
+ // var r = t.Result;
+ // if (!r.Success)
+ // {
+ // App.Current.Dispatcher.Invoke(() => MessageBox.Show(r.Msg, "下单"));
+ // return;
+ // }
+
+ // //刷新订单列表
+ // orderListViewModel.RefreshOrder(order.Id);
+
+ // //关闭当前窗口
+ // GalaSoft.MvvmLight.Messaging.Messenger.Default.Send
From 44a7421bb297e3087a8b8d7cf103bad7a186a021 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 13 Apr 2023 00:28:22 +0800
Subject: [PATCH 15/43] 1
---
.../BatchPurchase/ProductSkuWithScheme.cs | 3 +
BBWY.Client/Models/MappingProfile.cs | 1 +
BBWY.Client/Models/Product/Purchaser.cs | 24 ++++-
.../BatchPurchaseAddProductSkuViewModel.cs | 94 ++++++++++++----
.../BatchPurchaseAddProductSku.xaml | 101 +++++++++++++++++-
.../BatchPurchase/BatchPurchaseBusiness.cs | 2 +-
6 files changed, 199 insertions(+), 26 deletions(-)
diff --git a/BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs b/BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs
index e4836ff8..e19f5d0c 100644
--- a/BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs
+++ b/BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs
@@ -7,6 +7,7 @@ namespace BBWY.Client.Models
public class ProductSkuWithScheme : NotifyObject
{
private int quantity;
+ private bool isSelected;
public string Id { get; set; }
public string SkuId { get; set; }
@@ -41,6 +42,8 @@ namespace BBWY.Client.Models
public IList PurchaseSchemeProductSkuList { get; set; }
+ public bool IsSelected { get => isSelected; set { Set(ref isSelected, value); } }
+
public ProductSkuWithScheme()
{
PurchaseSchemeProductSkuList = new ObservableCollection();
diff --git a/BBWY.Client/Models/MappingProfile.cs b/BBWY.Client/Models/MappingProfile.cs
index 8ff89753..6c871dd9 100644
--- a/BBWY.Client/Models/MappingProfile.cs
+++ b/BBWY.Client/Models/MappingProfile.cs
@@ -31,6 +31,7 @@ namespace BBWY.Client.Models
CreateMap();
CreateMap();
CreateMap();
+ CreateMap();
}
}
}
diff --git a/BBWY.Client/Models/Product/Purchaser.cs b/BBWY.Client/Models/Product/Purchaser.cs
index 21ab7466..5f766231 100644
--- a/BBWY.Client/Models/Product/Purchaser.cs
+++ b/BBWY.Client/Models/Product/Purchaser.cs
@@ -1,4 +1,8 @@
-namespace BBWY.Client.Models
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+
+namespace BBWY.Client.Models
{
///
/// 采购商
@@ -22,4 +26,22 @@
public Platform Platform { get; set; }
}
+
+ public class PurchaserComparer : IEqualityComparer
+ {
+ public bool Equals([AllowNull] Purchaser x, [AllowNull] Purchaser y)
+ {
+ if (Object.ReferenceEquals(x, y)) return true;
+
+ if (Object.ReferenceEquals(x, null) || Object.ReferenceEquals(y, null))
+ return false;
+
+ return x?.Id == y?.Id;
+ }
+
+ public int GetHashCode([DisallowNull] Purchaser obj)
+ {
+ return base.GetHashCode();
+ }
+ }
}
diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs
index c9cfc18e..f22baec9 100644
--- a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs
+++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs
@@ -1,18 +1,20 @@
using BBWY.Client.APIServices;
using BBWY.Client.Models;
using GalaSoft.MvvmLight.Command;
-using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
-using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
using System.Windows.Input;
+using BBWY.Common.Extensions;
namespace BBWY.Client.ViewModels
{
public class BatchPurchaseAddProductSkuViewModel : BaseVM
{
private BatchPurchaseService batchPurchaseService;
+ private bool isLoading;
private string sku;
private string spu;
private Purchaser selectedPurchaser;
@@ -21,8 +23,12 @@ namespace BBWY.Client.ViewModels
private KVModel selectedPurchasePlatform;
private KVModel defaultPurchasePlatform;
+ private bool allSelected;
+
public ICommand SearchCommand { get; set; }
public ICommand FilterCommand { get; set; }
+ public ICommand SaveCommand { get; set; }
+
public string Sku { get => sku; set { Set(ref sku, value); } }
public string Spu { get => spu; set { Set(ref spu, value); } }
@@ -31,24 +37,26 @@ namespace BBWY.Client.ViewModels
public IList PurchasePlatformList { get; set; }
public Purchaser SelectedPurchaser
{
- get => selectedPurchaser; set
- {
- if (Set(ref selectedPurchaser, value))
- OnFilterChanged();
- }
+ get => selectedPurchaser; set { Set(ref selectedPurchaser, value); }
}
public KVModel SelectedPurchasePlatform
{
- get => selectedPurchasePlatform; set
- {
- if (Set(ref selectedPurchasePlatform, value))
- OnFilterChanged();
- }
+ get => selectedPurchasePlatform; set { Set(ref selectedPurchasePlatform, value); }
}
public IList SourceList { get; set; }
public IList FilterList { get; set; }
+ public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
+
+ public bool AllSelected
+ {
+ get => allSelected; set
+ {
+ if (Set(ref allSelected, value))
+ OnAllSelectedChanged();
+ }
+ }
public BatchPurchaseAddProductSkuViewModel(BatchPurchaseService batchPurchaseService)
{
@@ -66,17 +74,63 @@ namespace BBWY.Client.ViewModels
SourceList = new List();
FilterList = new List();
- SelectedPurchaser = PurchaserList[0];
- SelectedPurchasePlatform = PurchasePlatformList[0];
SearchCommand = new RelayCommand(Search);
FilterCommand = new RelayCommand(Filter);
+ SaveCommand = new RelayCommand(Save);
+ SelectedPurchaser = PurchaserList[0];
+ SelectedPurchasePlatform = PurchasePlatformList[0];
+ }
+
+ private void Search()
+ {
+ IsLoading = true;
+ Task.Factory.StartNew(() => batchPurchaseService.GetProductSkuAndSchemeList(Sku, Spu)).ContinueWith(t =>
+ {
+ IsLoading = false;
+ var response = t.Result;
+ if (!response.Success)
+ {
+ App.Current.Dispatcher.Invoke(() => MessageBox.Show(response.Msg, "提示"));
+ return;
+ }
+ SourceList.Clear();
+
+ App.Current.Dispatcher.Invoke(() =>
+ {
+ PurchaserList.Clear();
+ FilterList.Clear();
+
+ PurchaserList.Add(defaultPurchaser);
+ SelectedPurchaser = PurchaserList[0];
+ SelectedPurchasePlatform = PurchasePlatformList[0];
+ });
+
+ if (response.Data == null || response.Data.Count() == 0)
+ return;
+ var list = response.Data.Map>();
+
+ #region 提取采购商
+ var purchaserList = list.Where(item => !string.IsNullOrEmpty(item.PurchaserId))
+ .Select(item => new Purchaser() { Id = item.PurchaserId, Name = item.PurchaseName, Platform = item.PurchasePlatform.Value })
+ .Distinct(new PurchaserComparer());
+ #endregion
+
+ App.Current.Dispatcher.Invoke(() =>
+ {
+ foreach (var purchaser in purchaserList)
+ PurchaserList.Add(purchaser);
+ foreach (var item in list)
+ SourceList.Add(item);
+ Filter();
+ });
+ });
}
- private void OnFilterChanged()
+ private void Filter()
{
+ FilterList.Clear();
if (SourceList.Count() == 0)
return;
- FilterList.Clear();
var resultList = new List();
resultList.AddRange(SourceList);
@@ -111,14 +165,14 @@ namespace BBWY.Client.ViewModels
}
}
- private void Search()
+ private void Save()
{
}
- private void Filter()
- {
-
+ private void OnAllSelectedChanged()
+ {
+
}
}
}
diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml b/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
index a1083ff4..abfc732f 100644
--- a/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
+++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
@@ -38,24 +38,117 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index 959b519e..484027d5 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -23,7 +23,7 @@ namespace BBWY.Server.Business
///
public IList GetProductSkuAndSchemeList(SearchProductSkuAndSchemeRequest request)
{
- if (string.IsNullOrEmpty(request.Spu) || string.IsNullOrEmpty(request.Sku))
+ if (string.IsNullOrEmpty(request.Spu) && string.IsNullOrEmpty(request.Sku))
throw new BusinessException("至少具备一个Sku或Spu条件");
var productSkuList = productBusiness.GetProductSkuList(new SearchProductSkuRequest()
From ea76887c3448add15b594443ae2ed876003d95d6 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Thu, 13 Apr 2023 02:49:16 +0800
Subject: [PATCH 16/43] 1
---
.../BatchPurchase/ProductSkuWithScheme.cs | 20 ++++-
.../BatchPurchaseAddProductSkuViewModel.cs | 39 ++++++--
.../BatchPurchaseCreateNewOrderViewModel.cs | 2 +
.../BatchPurchaseAddProductSku.xaml | 88 +++++++++++--------
.../BatchPurchaseAddProductSku.xaml.cs | 31 ++++---
5 files changed, 126 insertions(+), 54 deletions(-)
diff --git a/BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs b/BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs
index e19f5d0c..a2f70666 100644
--- a/BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs
+++ b/BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs
@@ -38,15 +38,31 @@ namespace BBWY.Client.Models
public Platform? PurchasePlatform { get; set; }
- public int Quantity { get => quantity; set { Set(ref quantity, value); } }
+ public int Quantity { get => quantity; set { if (Set(ref quantity, value)) OnQuantityChanged(); } }
public IList PurchaseSchemeProductSkuList { get; set; }
- public bool IsSelected { get => isSelected; set { Set(ref isSelected, value); } }
+ public bool IsSelected
+ {
+ get => isSelected; set { if (Set(ref isSelected, value)) OnSelectChanged(); }
+ }
public ProductSkuWithScheme()
{
PurchaseSchemeProductSkuList = new ObservableCollection();
}
+
+ private void OnSelectChanged()
+ {
+ if (IsSelected && Quantity <= 0)
+ Quantity = 1;
+ else if (!IsSelected)
+ Quantity = 0;
+ }
+
+ private void OnQuantityChanged()
+ {
+ IsSelected = Quantity > 0;
+ }
}
}
diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs
index f22baec9..7ea854e6 100644
--- a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs
+++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs
@@ -29,6 +29,9 @@ namespace BBWY.Client.ViewModels
public ICommand FilterCommand { get; set; }
public ICommand SaveCommand { get; set; }
+ public ICommand AddQuantityCommand { get; set; }
+
+ public ICommand SubtractQuantityCommand { get; set; }
public string Sku { get => sku; set { Set(ref sku, value); } }
public string Spu { get => spu; set { Set(ref spu, value); } }
@@ -73,10 +76,12 @@ namespace BBWY.Client.ViewModels
};
SourceList = new List();
- FilterList = new List();
+ FilterList = new ObservableCollection();
SearchCommand = new RelayCommand(Search);
FilterCommand = new RelayCommand(Filter);
SaveCommand = new RelayCommand(Save);
+ AddQuantityCommand = new RelayCommand(AddQuantity);
+ SubtractQuantityCommand = new RelayCommand(SubtractQuantity);
SelectedPurchaser = PurchaserList[0];
SelectedPurchasePlatform = PurchasePlatformList[0];
}
@@ -110,7 +115,7 @@ namespace BBWY.Client.ViewModels
var list = response.Data.Map>();
#region 提取采购商
- var purchaserList = list.Where(item => !string.IsNullOrEmpty(item.PurchaserId))
+ var purchaserList = list.Where(item => item.PurchaseSchemeId != 0)
.Select(item => new Purchaser() { Id = item.PurchaserId, Name = item.PurchaseName, Platform = item.PurchasePlatform.Value })
.Distinct(new PurchaserComparer());
#endregion
@@ -120,7 +125,9 @@ namespace BBWY.Client.ViewModels
foreach (var purchaser in purchaserList)
PurchaserList.Add(purchaser);
foreach (var item in list)
+ {
SourceList.Add(item);
+ }
Filter();
});
});
@@ -167,12 +174,34 @@ namespace BBWY.Client.ViewModels
private void Save()
{
-
+ var selectedList = FilterList.Where(item => item.IsSelected).ToList();
+ if (selectedList == null || selectedList.Count() == 0)
+ {
+ MessageBox.Show("至少选择一个商品");
+ return;
+ }
+ GalaSoft.MvvmLight.Messaging.Messenger.Default.Send(selectedList, "BatchPurchaseAddProductSkuSave");
}
private void OnAllSelectedChanged()
- {
-
+ {
+ foreach (var item in FilterList)
+ {
+ if (item.PurchaseSchemeId == 0)
+ continue;
+ item.IsSelected = AllSelected;
+ }
+ }
+
+ private void AddQuantity(ProductSkuWithScheme item)
+ {
+ item.Quantity++;
+ }
+
+ private void SubtractQuantity(ProductSkuWithScheme item)
+ {
+ if (item.Quantity > 0)
+ item.Quantity--;
}
}
}
diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
index 380fd365..ed190fa5 100644
--- a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
+++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
@@ -5,6 +5,7 @@ using GalaSoft.MvvmLight.Command;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
+using System.Linq;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Input;
@@ -191,6 +192,7 @@ namespace BBWY.Client.ViewModels
var addProductSkuWindow = new BatchPurchaseAddProductSku();
if (addProductSkuWindow.ShowDialog() == true)
{
+ var newProductSkuWithSchemeList = addProductSkuWindow.SelectedProductSkuWithSchemeList;
}
}
diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml b/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
index abfc732f..515368b7 100644
--- a/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
+++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
@@ -9,7 +9,7 @@
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
Style="{StaticResource bwstyle}"
- Title="BatchPurchaseAddProductSku" Height="600" Width="500"
+ Title="BatchPurchaseAddProductSku" Height="600" Width="550"
DataContext="{Binding BatchPurchaseAddProductSku,Source={StaticResource Locator}}">
@@ -31,7 +31,8 @@
-
+
+
@@ -43,21 +44,23 @@
-
+
-
+
@@ -68,24 +71,29 @@
BorderBrush="{StaticResource Border.Brush}"
BorderThickness="1"
RowHeight="90">
+
+
+
+ IsChecked="{Binding DataContext.AllSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type DataGrid}}}"/>
-
+
-
+
@@ -99,49 +107,55 @@
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml.cs b/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml.cs
index 50c90f00..fcc3ba4f 100644
--- a/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml.cs
+++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml.cs
@@ -1,15 +1,7 @@
-using BBWY.Controls;
-using System;
+using BBWY.Client.Models;
+using BBWY.Controls;
using System.Collections.Generic;
-using System.Text;
using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
namespace BBWY.Client.Views.BatchPurchase
{
@@ -18,9 +10,28 @@ namespace BBWY.Client.Views.BatchPurchase
///
public partial class BatchPurchaseAddProductSku : BWindow
{
+ public IList SelectedProductSkuWithSchemeList { get; private set; }
+
public BatchPurchaseAddProductSku()
{
InitializeComponent();
+ this.Loaded += BatchPurchaseAddProductSku_Loaded;
+ this.Unloaded += BatchPurchaseAddProductSku_Unloaded;
+ }
+
+ private void BatchPurchaseAddProductSku_Unloaded(object sender, RoutedEventArgs e)
+ {
+ GalaSoft.MvvmLight.Messaging.Messenger.Default.Unregister(this);
+ }
+
+ private void BatchPurchaseAddProductSku_Loaded(object sender, RoutedEventArgs e)
+ {
+ GalaSoft.MvvmLight.Messaging.Messenger.Default.Register>(this, "BatchPurchaseAddProductSkuSave", (list) =>
+ {
+ SelectedProductSkuWithSchemeList = list;
+ this.DialogResult = true;
+ this.Close();
+ });
}
}
}
From d454b6e65da765b37bd418e3adcda0864a843321 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Thu, 13 Apr 2023 17:45:24 +0800
Subject: [PATCH 17/43] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=B0=E5=BB=BA?=
=?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ProductSkuWithSchemeResponse.cs | 2 +-
.../BatchPurchase/ProductSkuWithScheme.cs | 2 +-
BBWY.Client/ViewModels/BaseVM.cs | 18 ++
.../BatchPurchaseAddProductSkuViewModel.cs | 2 +-
.../BatchPurchaseCreateNewOrderViewModel.cs | 94 +++++++-
.../ViewModels/Order/OrderListViewModel.cs | 16 --
.../BatchCreateNewPurchaseOrder.xaml | 214 ++++++++++++++----
.../BatchPurchaseAddProductSku.xaml | 19 +-
.../BatchPurchase/BatchPurchaseBusiness.cs | 17 +-
.../ProductSkuWithSchemeResponse.cs | 2 +-
10 files changed, 291 insertions(+), 95 deletions(-)
diff --git a/BBWY.Client/Models/APIModel/Response/BatchPurchase/ProductSkuWithSchemeResponse.cs b/BBWY.Client/Models/APIModel/Response/BatchPurchase/ProductSkuWithSchemeResponse.cs
index 675dab4f..f4e0efbc 100644
--- a/BBWY.Client/Models/APIModel/Response/BatchPurchase/ProductSkuWithSchemeResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/BatchPurchase/ProductSkuWithSchemeResponse.cs
@@ -33,7 +33,7 @@ namespace BBWY.Client.Models
public string PurchaserId { get; set; }
- public string PurchaseName { get; set; }
+ public string PurchaserName { get; set; }
public Platform? PurchasePlatform { get; set; }
}
diff --git a/BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs b/BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs
index a2f70666..bef28ddd 100644
--- a/BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs
+++ b/BBWY.Client/Models/BatchPurchase/ProductSkuWithScheme.cs
@@ -34,7 +34,7 @@ namespace BBWY.Client.Models
public string PurchaserId { get; set; }
- public string PurchaseName { get; set; }
+ public string PurchaserName { get; set; }
public Platform? PurchasePlatform { get; set; }
diff --git a/BBWY.Client/ViewModels/BaseVM.cs b/BBWY.Client/ViewModels/BaseVM.cs
index a657101c..28a6ae70 100644
--- a/BBWY.Client/ViewModels/BaseVM.cs
+++ b/BBWY.Client/ViewModels/BaseVM.cs
@@ -2,6 +2,8 @@
using GalaSoft.MvvmLight.Command;
using System.Windows.Input;
using System;
+using System.Windows;
+
namespace BBWY.Client.ViewModels
{
public class BaseVM : ViewModelBase
@@ -12,11 +14,27 @@ namespace BBWY.Client.ViewModels
public ICommand UnloadCommand { get; set; }
+ public ICommand CopyTextCommand { get; set; }
+
public BaseVM()
{
VMId = Guid.NewGuid();
LoadCommand = new RelayCommand(Load);
UnloadCommand = new RelayCommand(Unload);
+
+ CopyTextCommand = new RelayCommand(s =>
+ {
+ try
+ {
+ Clipboard.SetText(s);
+ }
+ catch (Exception ex)
+ {
+ Console.ForegroundColor = ConsoleColor.Red;
+ Console.WriteLine(ex);
+ Console.ResetColor();
+ }
+ });
}
public virtual void Refresh()
diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs
index 7ea854e6..77ed9a55 100644
--- a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs
+++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseAddProductSkuViewModel.cs
@@ -116,7 +116,7 @@ namespace BBWY.Client.ViewModels
#region 提取采购商
var purchaserList = list.Where(item => item.PurchaseSchemeId != 0)
- .Select(item => new Purchaser() { Id = item.PurchaserId, Name = item.PurchaseName, Platform = item.PurchasePlatform.Value })
+ .Select(item => new Purchaser() { Id = item.PurchaserId, Name = item.PurchaserName, Platform = item.PurchasePlatform.Value })
.Distinct(new PurchaserComparer());
#endregion
diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
index ed190fa5..58e02c81 100644
--- a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
+++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
@@ -1,11 +1,13 @@
using BBWY.Client.APIServices;
using BBWY.Client.Models;
using BBWY.Client.Views.BatchPurchase;
+using BBWY.Common.Trigger;
using GalaSoft.MvvmLight.Command;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
+using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Input;
@@ -14,7 +16,10 @@ namespace BBWY.Client.ViewModels
{
public class BatchPurchaseCreateNewOrderViewModel : BaseVM
{
+ private GlobalContext globalContext;
private PurchaseProductAPIService purchaseProductAPIService;
+ private PurchaseService purchaseService;
+ private DelayTrigger delayTrigger;
private bool isLoading;
private decimal productAmount;
@@ -58,14 +63,19 @@ namespace BBWY.Client.ViewModels
public ICommand PreviewOrderCommand { get; set; }
public ICommand AddProductSkuCommand { get; set; }
- public BatchPurchaseCreateNewOrderViewModel(PurchaseProductAPIService purchaseProductAPIService)
+ public BatchPurchaseCreateNewOrderViewModel(PurchaseProductAPIService purchaseProductAPIService, PurchaseService purchaseService, GlobalContext globalContext)
{
+ this.globalContext = globalContext;
this.purchaseProductAPIService = purchaseProductAPIService;
+ this.purchaseService = purchaseService;
ProductSkuWithSchemeList = new ObservableCollection();
FastCreateOrderCommand = new RelayCommand(FastCreateOrder);
PreviewOrderCommand = new RelayCommand(PreviewOrder);
AddProductSkuCommand = new RelayCommand(AddProductSku);
+
+ this.delayTrigger = new DelayTrigger();
+ this.delayTrigger.OnExecute = OnDelayTriggerExecute;
}
private void OnDelayTriggerExecute(string key)
@@ -88,6 +98,7 @@ namespace BBWY.Client.ViewModels
return;
}
+ IsLoading = false;
//IsLoading = true;
//Task.Factory.StartNew(() => purchaseOrderService.PreviewPurchaseOrder(new Consignee()
//{
@@ -190,11 +201,88 @@ namespace BBWY.Client.ViewModels
private void AddProductSku()
{
var addProductSkuWindow = new BatchPurchaseAddProductSku();
- if (addProductSkuWindow.ShowDialog() == true)
+ if (addProductSkuWindow.ShowDialog() != true)
+ return;
+
+ var newProductSkuWithSchemeList = addProductSkuWindow.SelectedProductSkuWithSchemeList;
+ var waitList = new List();
+ foreach (var newProductSkuWithScheme in newProductSkuWithSchemeList)
+ {
+ if (ProductSkuWithSchemeList.Any(item => item.SkuId == newProductSkuWithScheme.SkuId))
+ continue;
+ ProductSkuWithSchemeList.Add(newProductSkuWithScheme);
+ var ewh = new ManualResetEvent(false);
+ waitList.Add(ewh);
+ Task.Factory.StartNew(() => LoadPurchaseScheme(newProductSkuWithScheme, ewh));
+ }
+ if (waitList.Count() == 0)
+ return;
+ IsLoading = true;
+ Task.Factory.StartNew(() =>
+ {
+ WaitHandle.WaitAll(waitList.ToArray());
+ PreviewOrder(); //预览订单
+ });
+ }
+
+ private void LoadPurchaseScheme(ProductSkuWithScheme productSkuWithScheme, EventWaitHandle ewh)
+ {
+ try
+ {
+ #region 加载采购方案
+ var purchaseSchemeResponse = purchaseService.GetPurchaseSchemeList(shopId: globalContext.User.Shop.ShopId, schemeId: productSkuWithScheme.PurchaseSchemeId);
+ if (!purchaseSchemeResponse.Success)
+ {
+ App.Current.Dispatcher.Invoke(() => MessageBox.Show($"方案Id{productSkuWithScheme.PurchaseSchemeId}\r\n{purchaseSchemeResponse.Msg}", "加载采购方案失败"));
+ return;
+ }
+
+ var purchaseScheme = purchaseSchemeResponse.Data[0];
+ #endregion
+
+ #region 完善采购方案基本信息
+ foreach (var purchaseSchemeProduct in purchaseScheme.PurchaseSchemeProductList)
+ {
+ var data = purchaseProductAPIService.GetProductInfo(productSkuWithScheme.PurchasePlatform.Value,
+ productSkuWithScheme.ProductId,
+ productSkuWithScheme.SkuId,
+ purchaseSchemeProduct.PurchaseProductId,
+ PurchaseOrderMode.批发,
+ PurchaseProductAPIMode.Spider);
+
+ if (data != null && data.Value.purchaseSchemeProductSkus != null && data.Value.purchaseSchemeProductSkus.Count > 0)
+ {
+ App.Current.Dispatcher.Invoke(() =>
+ {
+ foreach (var purchaseSchemeProductSku in data.Value.purchaseSchemeProductSkus)
+ {
+ if (purchaseSchemeProduct.PurchaseSchemeProductSkuList.Any(s => s.PurchaseSkuId == purchaseSchemeProductSku.PurchaseSkuId))
+ {
+ productSkuWithScheme.PurchaseSchemeProductSkuList.Add(purchaseSchemeProductSku);
+
+ purchaseSchemeProductSku.ItemTotal = productSkuWithScheme.Quantity;
+ purchaseSchemeProductSku.OnItemTotalChanged = OnItemTotalChanged;
+ }
+ }
+ });
+ }
+ }
+ #endregion
+ }
+ catch
{
- var newProductSkuWithSchemeList = addProductSkuWindow.SelectedProductSkuWithSchemeList;
}
+ finally
+ {
+ ewh.Set();
+ }
+ }
+
+ private void OnItemTotalChanged(int itemTotal)
+ {
+ Console.WriteLine($"OnItemTotalChanged {DateTime.Now} {itemTotal}");
+ this.delayTrigger.SetKey(Guid.NewGuid().ToString());
}
}
}
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index 0710aac1..b1701d92 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -105,8 +105,6 @@ namespace BBWY.Client.ViewModels
public ICommand ExportCommand { get; set; }
- public ICommand CopyTextCommand { get; set; }
-
public ICommand CopyOrderWaybillCommand { get; set; }
public ICommand SetSearchDateCommand { get; set; }
@@ -191,20 +189,6 @@ namespace BBWY.Client.ViewModels
Task.Factory.StartNew(() => LoadOrder(1)); //手动点击查询订单
});
SyncOrderCommand = new RelayCommand(SyncOrder);
- CopyTextCommand = new RelayCommand(s =>
- {
- try
- {
- Clipboard.SetText(s);
- }
- catch (Exception ex)
- {
- Console.ForegroundColor = ConsoleColor.Red;
- Console.WriteLine(ex);
- Console.ResetColor();
- }
- }
- );
CopyOrderWaybillCommand = new RelayCommand(o => Clipboard.SetText(o.WaybillNo));
SetSearchDateCommand = new RelayCommand(d =>
{
diff --git a/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml b/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml
index 68f92934..724f69b2 100644
--- a/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml
+++ b/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml
@@ -25,60 +25,174 @@
Background="{StaticResource Border.Background}">
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -111,7 +225,7 @@
-
+
diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml b/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
index 515368b7..75bbc381 100644
--- a/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
+++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
@@ -106,20 +106,25 @@
Cursor="Hand"/>
-
-
-
-
+
+
+
+
+ Margin="0,17,0,0">
+
+
-
+
diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index 484027d5..9da4a474 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -46,7 +46,7 @@ namespace BBWY.Server.Business
{
PurchaseSchemeId = ps.Id,
ps.PurchaserId,
- PurchaseName = p.Name,
+ PurchaserName = p.Name,
ps.PurchasePlatform,
ps.SkuId
});
@@ -82,7 +82,7 @@ namespace BBWY.Server.Business
Price = productSku.Price,
Title = productSku.Title,
State = productSku.State,
- PurchaseName = currentScheme.PurchaseName,
+ PurchaserName = currentScheme.PurchaserName,
PurchasePlatform = currentScheme.PurchasePlatform,
PurchaserId = currentScheme.PurchaserId,
PurchaseSchemeId = currentScheme.PurchaseSchemeId
@@ -90,19 +90,6 @@ namespace BBWY.Server.Business
}
}
}
-
-
- //var pruductSkuSchemeList = productSkuList.Map>();
- //foreach (var ps in pruductSkuSchemeList)
- //{
- // var scheme = schemeList.FirstOrDefault(s => s.SkuId == ps.Id);
- // if (scheme == null)
- // continue;
- // ps.PurchaseSchemeId = scheme.PurchaseSchemeId;
- // ps.PurchaserId = scheme.PurchaserId;
- // ps.PurchaseName = scheme.PurchaseName;
- // ps.PurchasePlatform = scheme.PurchasePlatform;
- //}
return list;
}
diff --git a/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/ProductSkuWithSchemeResponse.cs b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/ProductSkuWithSchemeResponse.cs
index ca140c1c..c172f513 100644
--- a/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/ProductSkuWithSchemeResponse.cs
+++ b/BBWY.Server.Model/Dto/Response/PurchaseOrderV2/BatchPurchase/ProductSkuWithSchemeResponse.cs
@@ -33,7 +33,7 @@ namespace BBWY.Server.Model.Dto
public string PurchaserId { get; set; }
- public string PurchaseName { get; set; }
+ public string PurchaserName { get; set; }
public Enums.Platform? PurchasePlatform { get; set; }
}
From 4520e2f65a96abe56fe1adbe29d0ae2a450098e9 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Thu, 13 Apr 2023 19:08:40 +0800
Subject: [PATCH 18/43] 1
---
.../BatchPurchaseCreateNewOrderViewModel.cs | 8 ++
.../BatchCreateNewPurchaseOrder.xaml | 77 +++++++++++++++++--
.../BatchPurchaseAddProductSku.xaml | 2 +-
3 files changed, 81 insertions(+), 6 deletions(-)
diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
index 58e02c81..6221c2b4 100644
--- a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
+++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
@@ -62,6 +62,7 @@ namespace BBWY.Client.ViewModels
public ICommand FastCreateOrderCommand { get; set; }
public ICommand PreviewOrderCommand { get; set; }
public ICommand AddProductSkuCommand { get; set; }
+ public ICommand DeleteProductSkuWithSchemeCommand { get; set; }
public BatchPurchaseCreateNewOrderViewModel(PurchaseProductAPIService purchaseProductAPIService, PurchaseService purchaseService, GlobalContext globalContext)
{
@@ -73,6 +74,7 @@ namespace BBWY.Client.ViewModels
FastCreateOrderCommand = new RelayCommand(FastCreateOrder);
PreviewOrderCommand = new RelayCommand(PreviewOrder);
AddProductSkuCommand = new RelayCommand(AddProductSku);
+ DeleteProductSkuWithSchemeCommand = new RelayCommand(DeleteProductSkuWithScheme);
this.delayTrigger = new DelayTrigger();
this.delayTrigger.OnExecute = OnDelayTriggerExecute;
@@ -284,5 +286,11 @@ namespace BBWY.Client.ViewModels
Console.WriteLine($"OnItemTotalChanged {DateTime.Now} {itemTotal}");
this.delayTrigger.SetKey(Guid.NewGuid().ToString());
}
+
+ private void DeleteProductSkuWithScheme(ProductSkuWithScheme productSkuWithScheme)
+ {
+ ProductSkuWithSchemeList.Remove(productSkuWithScheme);
+ this.delayTrigger.SetKey(Guid.NewGuid().ToString());
+ }
}
}
diff --git a/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml b/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml
index 724f69b2..40925521 100644
--- a/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml
+++ b/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml
@@ -43,23 +43,37 @@
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -74,6 +88,7 @@
+
@@ -118,6 +133,8 @@
+
+
-
-
+
+
@@ -141,7 +158,7 @@
@@ -168,6 +185,11 @@
+
+
+
+
+
@@ -175,10 +197,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml b/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
index 75bbc381..76a5268c 100644
--- a/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
+++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseAddProductSku.xaml
@@ -131,7 +131,7 @@
-
+
From 4c807e910b71f6aa8a5d2f59de0f36a3c17c3186 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Thu, 13 Apr 2023 21:22:48 +0800
Subject: [PATCH 19/43] 1
---
.../Product/PurchaseSchemeProductSku.cs | 13 ++++++
.../BatchPurchaseCreateNewOrderViewModel.cs | 21 ++++++++-
.../BatchCreateNewPurchaseOrder.xaml | 21 +++++++--
.../BatchPurchaseAddProductSku.xaml | 4 +-
.../EditQuantityRatioWindow.xaml | 39 +++++++++++++++++
.../EditQuantityRatioWindow.xaml.cs | 43 +++++++++++++++++++
6 files changed, 135 insertions(+), 6 deletions(-)
create mode 100644 BBWY.Client/Views/BatchPurchase/EditQuantityRatioWindow.xaml
create mode 100644 BBWY.Client/Views/BatchPurchase/EditQuantityRatioWindow.xaml.cs
diff --git a/BBWY.Client/Models/Product/PurchaseSchemeProductSku.cs b/BBWY.Client/Models/Product/PurchaseSchemeProductSku.cs
index 20f5c206..6857fc82 100644
--- a/BBWY.Client/Models/Product/PurchaseSchemeProductSku.cs
+++ b/BBWY.Client/Models/Product/PurchaseSchemeProductSku.cs
@@ -7,6 +7,10 @@ namespace BBWY.Client.Models
///
public class PurchaseSchemeProductSku : NotifyObject
{
+ public PurchaseSchemeProductSku()
+ {
+ QuantityRatio = 1;
+ }
///
/// 采购商品的SKU和采购方案的关系Id
///
@@ -51,7 +55,16 @@ namespace BBWY.Client.Models
private int itemTotal;
private decimal skuAmount;
+ private int quantityRatio;
public Action OnItemTotalChanged { get; set; }
+
+ ///
+ /// 组成一件sku所需的数量
+ ///
+ public int QuantityRatio
+ {
+ get => quantityRatio; set { Set(ref quantityRatio, value); }
+ }
}
}
diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
index 6221c2b4..1b665612 100644
--- a/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
+++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseCreateNewOrderViewModel.cs
@@ -64,6 +64,8 @@ namespace BBWY.Client.ViewModels
public ICommand AddProductSkuCommand { get; set; }
public ICommand DeleteProductSkuWithSchemeCommand { get; set; }
+ public ICommand EditQuantityRatioCommand { get; set; }
+
public BatchPurchaseCreateNewOrderViewModel(PurchaseProductAPIService purchaseProductAPIService, PurchaseService purchaseService, GlobalContext globalContext)
{
this.globalContext = globalContext;
@@ -75,7 +77,7 @@ namespace BBWY.Client.ViewModels
PreviewOrderCommand = new RelayCommand(PreviewOrder);
AddProductSkuCommand = new RelayCommand(AddProductSku);
DeleteProductSkuWithSchemeCommand = new RelayCommand(DeleteProductSkuWithScheme);
-
+ EditQuantityRatioCommand = new RelayCommand