Explorar o código

更新商品表

asmalltownboy %!s(int64=3) %!d(string=hai) anos
pai
achega
739350efa3

+ 185 - 181
数据库/PDMAN/.back_GuangZuan/GuangZuan-backup-2022628153126.pdma.json → 数据库/PDMAN/.back_GuangZuan/GuangZuan-backup-2022628173600.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.1",
   "createdTime": "2022-6-17 13:12:04",
-  "updatedTime": "2022-6-28 15:31:25",
+  "updatedTime": "2022-6-28 17:23:49",
   "dbConns": [],
   "profile": {
     "default": {
@@ -4083,7 +4083,7 @@
       "correlations": [],
       "indexes": [
         {
-          "defKey": "IDX_RESOURCE_CODE",
+          "defKey": "IDX_ZS_MFM_RESOURCE_CODE",
           "defName": null,
           "unique": false,
           "comment": "",
@@ -4813,7 +4813,7 @@
       "correlations": [],
       "indexes": [
         {
-          "defKey": "IDX_IP",
+          "defKey": "IDX_ZS_IPB_IP",
           "defName": null,
           "unique": true,
           "comment": "",
@@ -5106,7 +5106,7 @@
       "correlations": [],
       "indexes": [
         {
-          "defKey": "IDX_TEMPLATEID",
+          "defKey": "IDX_SMS_TEMPLATEID_PROVIDER",
           "defName": null,
           "unique": true,
           "comment": "",
@@ -8717,7 +8717,7 @@
       "correlations": [],
       "indexes": [
         {
-          "defKey": "IDX_UserID",
+          "defKey": "IDX_ZS_CNR_USERID",
           "defName": null,
           "unique": false,
           "comment": "",
@@ -9650,7 +9650,7 @@
         {
           "defKey": "stock_qty",
           "defName": "库存数量",
-          "comment": "库存数量",
+          "comment": "",
           "type": "",
           "len": "",
           "scale": "",
@@ -9662,12 +9662,12 @@
           "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
           "refDict": "",
           "extProps": {},
-          "id": "4C192496-C181-4AF0-A950-38520C210939"
+          "id": "52B7EC68-6B47-4746-A29E-7E51D14F4B97"
         },
         {
           "defKey": "freeze_qty",
           "defName": "冻结数量",
-          "comment": "冻结数量",
+          "comment": "",
           "type": "",
           "len": "",
           "scale": "",
@@ -9679,12 +9679,12 @@
           "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
           "refDict": "",
           "extProps": {},
-          "id": "992F0141-A7B3-494E-AF95-A5B9BB5E7EEE"
+          "id": "DCCB90F1-B77C-4225-8D33-FCCBC74CA61C"
         },
         {
           "defKey": "sold_qty",
           "defName": "已售数量",
-          "comment": "已售数量",
+          "comment": "",
           "type": "",
           "len": "",
           "scale": "",
@@ -9696,7 +9696,7 @@
           "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
           "refDict": "",
           "extProps": {},
-          "id": "4370608E-11A7-4CCD-95C6-65BD56097A7C"
+          "id": "06C0E78D-564C-4013-BF9B-4553C1340379"
         },
         {
           "defKey": "user_id",
@@ -10641,9 +10641,9 @@
           "id": "A76C1CD6-4659-4E2C-942F-2EA269447171"
         },
         {
-          "defKey": "parent_id",
-          "defName": "上级仓库id",
-          "comment": "为空则为顶级",
+          "defKey": "type",
+          "defName": "仓库类型",
+          "comment": "",
           "type": "",
           "len": "",
           "scale": "",
@@ -10652,10 +10652,10 @@
           "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": false,
-          "refDict": "",
+          "refDict": "9351CD01-E8E0-4F75-A502-2DD63EBACC9B",
           "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "id": "9ACD2255-2E7D-4F82-BD9F-58D399C5E926"
+          "domain": "BE3E3799-C337-4566-9258-2E2F2770C52D",
+          "id": "4E97DA65-59A2-4CCD-A13E-166A201B64EF"
         },
         {
           "defKey": "Remark",
@@ -10936,8 +10936,8 @@
           "id": "F57C3FBF-D5E0-4EE5-8BA2-B9A5FC860C73"
         },
         {
-          "defKey": "location_lv1",
-          "defName": "仓存地点一级",
+          "defKey": "location_id",
+          "defName": "仓库Id",
           "comment": "一级",
           "type": "",
           "len": "",
@@ -10953,23 +10953,6 @@
           "id": "DC8C1FC5-4AFF-4E24-B471-D5A5BDD5E606"
         },
         {
-          "defKey": "location_lv2",
-          "defName": "仓存地点二级",
-          "comment": "二级",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "refDict": "",
-          "extProps": {},
-          "id": "4FE5841D-7A10-4AC7-93AE-CD5B1C312E93"
-        },
-        {
           "defKey": "market_price",
           "defName": "市场价",
           "comment": "",
@@ -11602,7 +11585,7 @@
       "correlations": [],
       "indexes": [
         {
-          "defKey": "",
+          "defKey": "IDX_ZS_GSE_SKUID",
           "defName": null,
           "unique": true,
           "comment": "",
@@ -12677,7 +12660,7 @@
         },
         {
           "defKey": "2",
-          "defName": "正常",
+          "defName": "出售中",
           "sort": "",
           "parentKey": "",
           "intro": "",
@@ -14614,6 +14597,51 @@
           "id": "E4257FA8-FE22-43B7-B44C-25B90A647C33"
         }
       ]
+    },
+    {
+      "defKey": "LocationType",
+      "defName": "仓库类型",
+      "sort": "",
+      "intro": "",
+      "id": "9351CD01-E8E0-4F75-A502-2DD63EBACC9B",
+      "items": [
+        {
+          "defKey": "1",
+          "defName": "展会仓(Exhibition)",
+          "sort": "1",
+          "parentKey": "",
+          "intro": "",
+          "enabled": true,
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "id": "E549B347-6D6E-47A0-856E-219A5D1379DC"
+        },
+        {
+          "defKey": "2",
+          "defName": "中心仓(Warehouse in the Exchange)",
+          "sort": "2",
+          "parentKey": "",
+          "intro": "",
+          "enabled": true,
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "id": "4967D698-60AB-4A8D-AD54-5C0ACCE934BE"
+        },
+        {
+          "defKey": "3",
+          "defName": "自有仓(Warehouse for Oneself)",
+          "sort": "3",
+          "parentKey": "",
+          "intro": "",
+          "enabled": true,
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "id": "94A388BB-AD57-4DFC-8BCB-6BCE72D30C32"
+        }
+      ]
     }
   ],
   "viewGroups": [
@@ -14684,7 +14712,8 @@
         "0E659254-9056-4B0C-8026-7981C7F3C686",
         "0F0C945F-DBBE-4291-AF89-F54A8EC8EA7D",
         "56A3D732-06C1-404F-AFC2-C2516ABA670E",
-        "8A215A02-52A1-49E1-9B6A-6BBE641122CD"
+        "8A215A02-52A1-49E1-9B6A-6BBE641122CD",
+        "9351CD01-E8E0-4F75-A502-2DD63EBACC9B"
       ],
       "id": "FACBAA60-289F-442B-9987-D2CCDB32F4AF"
     },
@@ -15598,23 +15627,6 @@
       "canvasData": {
         "cells": [
           {
-            "id": "a4b9441d-fd5d-47bf-9ed7-313458395f86",
-            "shape": "erdRelation",
-            "source": {
-              "cell": "9168400d-eb04-41f2-b54c-7f67cf5fce1a",
-              "port": "CAFE0EBD-7524-4A3E-9107-C298C43EA4FD%out"
-            },
-            "target": {
-              "cell": "58f4c838-0253-468c-a303-7c6eed35c6d5",
-              "port": "8D52D38A-BC02-400D-BB09-4EF658FE1276%in"
-            },
-            "relation": "1:n",
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
-          },
-          {
             "id": "5f2a8322-7811-406e-b553-a3661fb41240",
             "shape": "table",
             "position": {
@@ -15635,6 +15647,100 @@
             "originKey": "BC065A2A-F2D4-44F3-B6D1-C325F17327FF"
           },
           {
+            "id": "2934b279-3c9c-43eb-bc15-1c04ccdc6633",
+            "shape": "table",
+            "position": {
+              "x": -650,
+              "y": 290
+            },
+            "count": 0,
+            "originKey": "045E726F-83FB-4825-96CF-31928C95A327"
+          },
+          {
+            "id": "58f4c838-0253-468c-a303-7c6eed35c6d5",
+            "shape": "table",
+            "position": {
+              "x": 391,
+              "y": -144.5
+            },
+            "count": 0,
+            "originKey": "5C22FB53-4E14-4986-BBF9-B4CE686CD358"
+          },
+          {
+            "id": "9168400d-eb04-41f2-b54c-7f67cf5fce1a",
+            "shape": "table",
+            "position": {
+              "x": 149,
+              "y": 175
+            },
+            "count": 0,
+            "originKey": "D2C1AAAB-1448-4645-BF61-FCE35C17A298"
+          },
+          {
+            "id": "4d7b355e-2b91-4f28-bf9d-4592a7cf620f",
+            "shape": "table",
+            "position": {
+              "x": -653.5,
+              "y": 60
+            },
+            "count": 0,
+            "originKey": "388213E1-91C6-4633-A744-C8DE428F1E01"
+          },
+          {
+            "id": "25e13c35-5f2d-48aa-96c6-0221ac892f0f",
+            "shape": "table",
+            "position": {
+              "x": -250,
+              "y": 40
+            },
+            "count": 0,
+            "originKey": "D68F38C8-0C2F-40BC-8B2B-B343A6F747F3"
+          },
+          {
+            "id": "b55a2f2b-021a-40aa-a8a4-9b0087521711",
+            "shape": "table",
+            "position": {
+              "x": -200,
+              "y": 490
+            },
+            "count": 0,
+            "originKey": "9B30C627-B983-4DBA-8C73-BF85184B8D13"
+          },
+          {
+            "id": "dc9c3e07-d656-4f2f-8cc0-a555f5bb2618",
+            "shape": "table",
+            "position": {
+              "x": 270,
+              "y": 510
+            },
+            "count": 0,
+            "originKey": "D42F0C82-EAED-420C-B210-47BD4CEF5260"
+          },
+          {
+            "id": "a1e93e2f-6767-4e17-a5bf-ac0dc092145a",
+            "shape": "table",
+            "position": {
+              "x": 288.5,
+              "y": 960
+            },
+            "count": 0,
+            "originKey": "3C2512D5-BFB8-44FB-9BA8-79AAD3E6E16B"
+          },
+          {
+            "id": "a4b9441d-fd5d-47bf-9ed7-313458395f86",
+            "shape": "erdRelation",
+            "source": {
+              "cell": "9168400d-eb04-41f2-b54c-7f67cf5fce1a",
+              "port": "CAFE0EBD-7524-4A3E-9107-C298C43EA4FD%out"
+            },
+            "target": {
+              "cell": "58f4c838-0253-468c-a303-7c6eed35c6d5",
+              "port": "8D52D38A-BC02-400D-BB09-4EF658FE1276%in"
+            },
+            "relation": "1:n",
+            "fillColor": "#ACDAFC"
+          },
+          {
             "id": "1bd8628f-c849-48d6-8888-0030a8d73bcc",
             "shape": "erdRelation",
             "source": {
@@ -15646,10 +15752,7 @@
               "port": "198004C4-90CA-4FBE-A18D-83EA7548EDA5%in"
             },
             "relation": "n:1",
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
+            "fillColor": "#ACDAFC"
           },
           {
             "id": "b31d9b7f-4a76-4632-bd10-0925ddd6743d",
@@ -15663,10 +15766,7 @@
               "port": "8057466E-E15C-4A81-A7EB-0A2D5734F2C3%in"
             },
             "relation": "n:n",
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
+            "fillColor": "#ACDAFC"
           },
           {
             "id": "6d380052-5537-4a0f-9908-e7a8c79768b7",
@@ -15686,20 +15786,7 @@
                 "y": 370
               }
             ],
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
-          },
-          {
-            "id": "2934b279-3c9c-43eb-bc15-1c04ccdc6633",
-            "shape": "table",
-            "position": {
-              "x": -650,
-              "y": 290
-            },
-            "count": 0,
-            "originKey": "045E726F-83FB-4825-96CF-31928C95A327"
+            "fillColor": "#ACDAFC"
           },
           {
             "id": "00edbf2b-cfd0-42b7-b267-9d243d65b83e",
@@ -15719,10 +15806,7 @@
                 "y": 126
               }
             ],
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
+            "fillColor": "#ACDAFC"
           },
           {
             "id": "de3ab5b3-7268-471d-82ab-8b7ea9aa7ccf",
@@ -15736,60 +15820,7 @@
               "port": "DA359726-417F-4D15-972C-F67FDA8ED042%in"
             },
             "relation": "n:n",
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
-          },
-          {
-            "id": "58f4c838-0253-468c-a303-7c6eed35c6d5",
-            "shape": "table",
-            "position": {
-              "x": 391,
-              "y": -144.5
-            },
-            "count": 0,
-            "originKey": "5C22FB53-4E14-4986-BBF9-B4CE686CD358"
-          },
-          {
-            "id": "9168400d-eb04-41f2-b54c-7f67cf5fce1a",
-            "shape": "table",
-            "position": {
-              "x": 149,
-              "y": 175
-            },
-            "count": 0,
-            "originKey": "D2C1AAAB-1448-4645-BF61-FCE35C17A298"
-          },
-          {
-            "id": "4d7b355e-2b91-4f28-bf9d-4592a7cf620f",
-            "shape": "table",
-            "position": {
-              "x": -653.5,
-              "y": 60
-            },
-            "count": 0,
-            "originKey": "388213E1-91C6-4633-A744-C8DE428F1E01"
-          },
-          {
-            "id": "25e13c35-5f2d-48aa-96c6-0221ac892f0f",
-            "shape": "table",
-            "position": {
-              "x": -250,
-              "y": 40
-            },
-            "count": 0,
-            "originKey": "D68F38C8-0C2F-40BC-8B2B-B343A6F747F3"
-          },
-          {
-            "id": "b55a2f2b-021a-40aa-a8a4-9b0087521711",
-            "shape": "table",
-            "position": {
-              "x": -200,
-              "y": 490
-            },
-            "count": 0,
-            "originKey": "9B30C627-B983-4DBA-8C73-BF85184B8D13"
+            "fillColor": "#ACDAFC"
           },
           {
             "id": "9813c6ac-90c9-4206-b1ac-e30ceef9730a",
@@ -15809,30 +15840,17 @@
                 "y": 790
               }
             ],
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
-          },
-          {
-            "id": "dc9c3e07-d656-4f2f-8cc0-a555f5bb2618",
-            "shape": "table",
-            "position": {
-              "x": 270,
-              "y": 510
-            },
-            "count": 0,
-            "originKey": "D42F0C82-EAED-420C-B210-47BD4CEF5260"
+            "fillColor": "#ACDAFC"
           },
           {
-            "id": "a1e93e2f-6767-4e17-a5bf-ac0dc092145a",
+            "id": "2cec1a80-1bd2-40d1-a114-1d48bcae2bab",
             "shape": "table",
             "position": {
-              "x": 288.5,
-              "y": 960
+              "x": -280,
+              "y": 900
             },
             "count": 0,
-            "originKey": "3C2512D5-BFB8-44FB-9BA8-79AAD3E6E16B"
+            "originKey": "9B0E6171-1A99-4F6A-9670-F15A8243DA32"
           }
         ]
       },
@@ -15858,8 +15876,8 @@
             "relation": "1:1",
             "vertices": [
               {
-                "x": 590,
-                "y": 120
+                "x": 460,
+                "y": 190
               }
             ],
             "fillColor": "#ACDAFC"
@@ -15879,20 +15897,6 @@
             "fillColor": "#ACDAFC"
           },
           {
-            "id": "72829337-7665-4829-956d-eafb6855e9f5",
-            "shape": "erdRelation",
-            "source": {
-              "cell": "d29c7ce6-c41a-48e8-b76f-bb506dd54fdc",
-              "port": "4FE5841D-7A10-4AC7-93AE-CD5B1C312E93%out"
-            },
-            "target": {
-              "cell": "c1151c61-2cdb-483f-9874-9031bd49d721",
-              "port": "3E181CA4-A797-4914-BB0A-AA7ACB27A33B%out"
-            },
-            "relation": "1:1",
-            "fillColor": "#ACDAFC"
-          },
-          {
             "id": "d34e016c-b49e-47de-ac85-7d11edde025f",
             "shape": "erdRelation",
             "source": {
@@ -15918,16 +15922,6 @@
             "originKey": "DEFB16E2-1761-489E-A477-E5719163D764"
           },
           {
-            "id": "ccf886bf-beeb-46ce-ada6-491073f79509",
-            "shape": "table",
-            "position": {
-              "x": 200,
-              "y": -150
-            },
-            "count": 0,
-            "originKey": "D42F0C82-EAED-420C-B210-47BD4CEF5260"
-          },
-          {
             "id": "c1151c61-2cdb-483f-9874-9031bd49d721",
             "shape": "table",
             "position": {
@@ -15941,11 +15935,21 @@
             "id": "d29c7ce6-c41a-48e8-b76f-bb506dd54fdc",
             "shape": "table",
             "position": {
-              "x": 250,
+              "x": 300,
               "y": 480
             },
             "count": 0,
             "originKey": "3C2512D5-BFB8-44FB-9BA8-79AAD3E6E16B"
+          },
+          {
+            "id": "ccf886bf-beeb-46ce-ada6-491073f79509",
+            "shape": "table",
+            "position": {
+              "x": 200,
+              "y": -220
+            },
+            "count": 0,
+            "originKey": "D42F0C82-EAED-420C-B210-47BD4CEF5260"
           }
         ]
       },

+ 200 - 184
数据库/PDMAN/.back_GuangZuan/GuangZuan-backup-2022628153127.pdma.json → 数据库/PDMAN/.back_GuangZuan/GuangZuan-backup-2022628175117.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.1",
   "createdTime": "2022-6-17 13:12:04",
-  "updatedTime": "2022-6-28 15:31:27",
+  "updatedTime": "2022-6-28 17:36:00",
   "dbConns": [],
   "profile": {
     "default": {
@@ -4083,7 +4083,7 @@
       "correlations": [],
       "indexes": [
         {
-          "defKey": "IDX_RESOURCE_CODE",
+          "defKey": "IDX_ZS_MFM_RESOURCE_CODE",
           "defName": null,
           "unique": false,
           "comment": "",
@@ -4813,7 +4813,7 @@
       "correlations": [],
       "indexes": [
         {
-          "defKey": "IDX_IP",
+          "defKey": "IDX_ZS_IPB_IP",
           "defName": null,
           "unique": true,
           "comment": "",
@@ -5106,7 +5106,7 @@
       "correlations": [],
       "indexes": [
         {
-          "defKey": "IDX_TEMPLATEID",
+          "defKey": "IDX_SMS_TEMPLATEID_PROVIDER",
           "defName": null,
           "unique": true,
           "comment": "",
@@ -8717,7 +8717,7 @@
       "correlations": [],
       "indexes": [
         {
-          "defKey": "IDX_UserID",
+          "defKey": "IDX_ZS_CNR_USERID",
           "defName": null,
           "unique": false,
           "comment": "",
@@ -9650,7 +9650,7 @@
         {
           "defKey": "stock_qty",
           "defName": "库存数量",
-          "comment": "库存数量",
+          "comment": "",
           "type": "",
           "len": "",
           "scale": "",
@@ -9662,12 +9662,12 @@
           "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
           "refDict": "",
           "extProps": {},
-          "id": "4C192496-C181-4AF0-A950-38520C210939"
+          "id": "52B7EC68-6B47-4746-A29E-7E51D14F4B97"
         },
         {
           "defKey": "freeze_qty",
           "defName": "冻结数量",
-          "comment": "冻结数量",
+          "comment": "",
           "type": "",
           "len": "",
           "scale": "",
@@ -9679,12 +9679,12 @@
           "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
           "refDict": "",
           "extProps": {},
-          "id": "992F0141-A7B3-494E-AF95-A5B9BB5E7EEE"
+          "id": "DCCB90F1-B77C-4225-8D33-FCCBC74CA61C"
         },
         {
           "defKey": "sold_qty",
           "defName": "已售数量",
-          "comment": "已售数量",
+          "comment": "",
           "type": "",
           "len": "",
           "scale": "",
@@ -9696,7 +9696,7 @@
           "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
           "refDict": "",
           "extProps": {},
-          "id": "4370608E-11A7-4CCD-95C6-65BD56097A7C"
+          "id": "06C0E78D-564C-4013-BF9B-4553C1340379"
         },
         {
           "defKey": "user_id",
@@ -10641,9 +10641,9 @@
           "id": "A76C1CD6-4659-4E2C-942F-2EA269447171"
         },
         {
-          "defKey": "parent_id",
-          "defName": "上级仓库id",
-          "comment": "为空则为顶级",
+          "defKey": "type",
+          "defName": "仓库类型",
+          "comment": "",
           "type": "",
           "len": "",
           "scale": "",
@@ -10652,10 +10652,10 @@
           "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": false,
-          "refDict": "",
+          "refDict": "9351CD01-E8E0-4F75-A502-2DD63EBACC9B",
           "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "id": "9ACD2255-2E7D-4F82-BD9F-58D399C5E926"
+          "domain": "BE3E3799-C337-4566-9258-2E2F2770C52D",
+          "id": "4E97DA65-59A2-4CCD-A13E-166A201B64EF"
         },
         {
           "defKey": "Remark",
@@ -10936,8 +10936,8 @@
           "id": "F57C3FBF-D5E0-4EE5-8BA2-B9A5FC860C73"
         },
         {
-          "defKey": "location_lv1",
-          "defName": "仓存地点一级",
+          "defKey": "location_id",
+          "defName": "仓库Id",
           "comment": "一级",
           "type": "",
           "len": "",
@@ -10953,23 +10953,6 @@
           "id": "DC8C1FC5-4AFF-4E24-B471-D5A5BDD5E606"
         },
         {
-          "defKey": "location_lv2",
-          "defName": "仓存地点二级",
-          "comment": "二级",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "refDict": "",
-          "extProps": {},
-          "id": "4FE5841D-7A10-4AC7-93AE-CD5B1C312E93"
-        },
-        {
           "defKey": "market_price",
           "defName": "市场价",
           "comment": "",
@@ -11602,7 +11585,7 @@
       "correlations": [],
       "indexes": [
         {
-          "defKey": "",
+          "defKey": "IDX_ZS_GSE_SKUID",
           "defName": null,
           "unique": true,
           "comment": "",
@@ -12666,7 +12649,7 @@
         {
           "defKey": "1",
           "defName": "未上架",
-          "sort": "",
+          "sort": "1",
           "parentKey": "",
           "intro": "",
           "enabled": true,
@@ -12677,8 +12660,8 @@
         },
         {
           "defKey": "2",
-          "defName": "正常",
-          "sort": "",
+          "defName": "出售中",
+          "sort": "2",
           "parentKey": "",
           "intro": "",
           "enabled": true,
@@ -12690,7 +12673,7 @@
         {
           "defKey": "3",
           "defName": "已下架",
-          "sort": "",
+          "sort": "3",
           "parentKey": "",
           "intro": "",
           "enabled": true,
@@ -12698,6 +12681,18 @@
           "attr2": "",
           "attr3": "",
           "id": "131CD748-2889-420E-9716-92DB5651C7D7"
+        },
+        {
+          "defKey": "4",
+          "defName": "已失效",
+          "sort": "4",
+          "parentKey": "",
+          "intro": "",
+          "enabled": true,
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "id": "A617968E-181A-48EA-804D-4B51421BDF1B"
         }
       ]
     },
@@ -14614,6 +14609,51 @@
           "id": "E4257FA8-FE22-43B7-B44C-25B90A647C33"
         }
       ]
+    },
+    {
+      "defKey": "LocationType",
+      "defName": "仓库类型",
+      "sort": "",
+      "intro": "",
+      "id": "9351CD01-E8E0-4F75-A502-2DD63EBACC9B",
+      "items": [
+        {
+          "defKey": "1",
+          "defName": "展会仓(Exhibition)",
+          "sort": "1",
+          "parentKey": "",
+          "intro": "",
+          "enabled": true,
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "id": "E549B347-6D6E-47A0-856E-219A5D1379DC"
+        },
+        {
+          "defKey": "2",
+          "defName": "中心仓(Warehouse in the Exchange)",
+          "sort": "2",
+          "parentKey": "",
+          "intro": "",
+          "enabled": true,
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "id": "4967D698-60AB-4A8D-AD54-5C0ACCE934BE"
+        },
+        {
+          "defKey": "3",
+          "defName": "自有仓(Warehouse for Oneself)",
+          "sort": "3",
+          "parentKey": "",
+          "intro": "",
+          "enabled": true,
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "id": "94A388BB-AD57-4DFC-8BCB-6BCE72D30C32"
+        }
+      ]
     }
   ],
   "viewGroups": [
@@ -14684,7 +14724,8 @@
         "0E659254-9056-4B0C-8026-7981C7F3C686",
         "0F0C945F-DBBE-4291-AF89-F54A8EC8EA7D",
         "56A3D732-06C1-404F-AFC2-C2516ABA670E",
-        "8A215A02-52A1-49E1-9B6A-6BBE641122CD"
+        "8A215A02-52A1-49E1-9B6A-6BBE641122CD",
+        "9351CD01-E8E0-4F75-A502-2DD63EBACC9B"
       ],
       "id": "FACBAA60-289F-442B-9987-D2CCDB32F4AF"
     },
@@ -15598,23 +15639,6 @@
       "canvasData": {
         "cells": [
           {
-            "id": "a4b9441d-fd5d-47bf-9ed7-313458395f86",
-            "shape": "erdRelation",
-            "source": {
-              "cell": "9168400d-eb04-41f2-b54c-7f67cf5fce1a",
-              "port": "CAFE0EBD-7524-4A3E-9107-C298C43EA4FD%out"
-            },
-            "target": {
-              "cell": "58f4c838-0253-468c-a303-7c6eed35c6d5",
-              "port": "8D52D38A-BC02-400D-BB09-4EF658FE1276%in"
-            },
-            "relation": "1:n",
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
-          },
-          {
             "id": "5f2a8322-7811-406e-b553-a3661fb41240",
             "shape": "table",
             "position": {
@@ -15635,6 +15659,100 @@
             "originKey": "BC065A2A-F2D4-44F3-B6D1-C325F17327FF"
           },
           {
+            "id": "2934b279-3c9c-43eb-bc15-1c04ccdc6633",
+            "shape": "table",
+            "position": {
+              "x": -650,
+              "y": 290
+            },
+            "count": 0,
+            "originKey": "045E726F-83FB-4825-96CF-31928C95A327"
+          },
+          {
+            "id": "58f4c838-0253-468c-a303-7c6eed35c6d5",
+            "shape": "table",
+            "position": {
+              "x": 391,
+              "y": -144.5
+            },
+            "count": 0,
+            "originKey": "5C22FB53-4E14-4986-BBF9-B4CE686CD358"
+          },
+          {
+            "id": "9168400d-eb04-41f2-b54c-7f67cf5fce1a",
+            "shape": "table",
+            "position": {
+              "x": 149,
+              "y": 175
+            },
+            "count": 0,
+            "originKey": "D2C1AAAB-1448-4645-BF61-FCE35C17A298"
+          },
+          {
+            "id": "4d7b355e-2b91-4f28-bf9d-4592a7cf620f",
+            "shape": "table",
+            "position": {
+              "x": -653.5,
+              "y": 60
+            },
+            "count": 0,
+            "originKey": "388213E1-91C6-4633-A744-C8DE428F1E01"
+          },
+          {
+            "id": "25e13c35-5f2d-48aa-96c6-0221ac892f0f",
+            "shape": "table",
+            "position": {
+              "x": -250,
+              "y": 40
+            },
+            "count": 0,
+            "originKey": "D68F38C8-0C2F-40BC-8B2B-B343A6F747F3"
+          },
+          {
+            "id": "b55a2f2b-021a-40aa-a8a4-9b0087521711",
+            "shape": "table",
+            "position": {
+              "x": -200,
+              "y": 490
+            },
+            "count": 0,
+            "originKey": "9B30C627-B983-4DBA-8C73-BF85184B8D13"
+          },
+          {
+            "id": "dc9c3e07-d656-4f2f-8cc0-a555f5bb2618",
+            "shape": "table",
+            "position": {
+              "x": 270,
+              "y": 510
+            },
+            "count": 0,
+            "originKey": "D42F0C82-EAED-420C-B210-47BD4CEF5260"
+          },
+          {
+            "id": "a1e93e2f-6767-4e17-a5bf-ac0dc092145a",
+            "shape": "table",
+            "position": {
+              "x": 288.5,
+              "y": 960
+            },
+            "count": 0,
+            "originKey": "3C2512D5-BFB8-44FB-9BA8-79AAD3E6E16B"
+          },
+          {
+            "id": "a4b9441d-fd5d-47bf-9ed7-313458395f86",
+            "shape": "erdRelation",
+            "source": {
+              "cell": "9168400d-eb04-41f2-b54c-7f67cf5fce1a",
+              "port": "CAFE0EBD-7524-4A3E-9107-C298C43EA4FD%out"
+            },
+            "target": {
+              "cell": "58f4c838-0253-468c-a303-7c6eed35c6d5",
+              "port": "8D52D38A-BC02-400D-BB09-4EF658FE1276%in"
+            },
+            "relation": "1:n",
+            "fillColor": "#ACDAFC"
+          },
+          {
             "id": "1bd8628f-c849-48d6-8888-0030a8d73bcc",
             "shape": "erdRelation",
             "source": {
@@ -15646,10 +15764,7 @@
               "port": "198004C4-90CA-4FBE-A18D-83EA7548EDA5%in"
             },
             "relation": "n:1",
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
+            "fillColor": "#ACDAFC"
           },
           {
             "id": "b31d9b7f-4a76-4632-bd10-0925ddd6743d",
@@ -15663,10 +15778,7 @@
               "port": "8057466E-E15C-4A81-A7EB-0A2D5734F2C3%in"
             },
             "relation": "n:n",
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
+            "fillColor": "#ACDAFC"
           },
           {
             "id": "6d380052-5537-4a0f-9908-e7a8c79768b7",
@@ -15686,20 +15798,7 @@
                 "y": 370
               }
             ],
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
-          },
-          {
-            "id": "2934b279-3c9c-43eb-bc15-1c04ccdc6633",
-            "shape": "table",
-            "position": {
-              "x": -650,
-              "y": 290
-            },
-            "count": 0,
-            "originKey": "045E726F-83FB-4825-96CF-31928C95A327"
+            "fillColor": "#ACDAFC"
           },
           {
             "id": "00edbf2b-cfd0-42b7-b267-9d243d65b83e",
@@ -15719,10 +15818,7 @@
                 "y": 126
               }
             ],
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
+            "fillColor": "#ACDAFC"
           },
           {
             "id": "de3ab5b3-7268-471d-82ab-8b7ea9aa7ccf",
@@ -15736,60 +15832,7 @@
               "port": "DA359726-417F-4D15-972C-F67FDA8ED042%in"
             },
             "relation": "n:n",
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
-          },
-          {
-            "id": "58f4c838-0253-468c-a303-7c6eed35c6d5",
-            "shape": "table",
-            "position": {
-              "x": 391,
-              "y": -144.5
-            },
-            "count": 0,
-            "originKey": "5C22FB53-4E14-4986-BBF9-B4CE686CD358"
-          },
-          {
-            "id": "9168400d-eb04-41f2-b54c-7f67cf5fce1a",
-            "shape": "table",
-            "position": {
-              "x": 149,
-              "y": 175
-            },
-            "count": 0,
-            "originKey": "D2C1AAAB-1448-4645-BF61-FCE35C17A298"
-          },
-          {
-            "id": "4d7b355e-2b91-4f28-bf9d-4592a7cf620f",
-            "shape": "table",
-            "position": {
-              "x": -653.5,
-              "y": 60
-            },
-            "count": 0,
-            "originKey": "388213E1-91C6-4633-A744-C8DE428F1E01"
-          },
-          {
-            "id": "25e13c35-5f2d-48aa-96c6-0221ac892f0f",
-            "shape": "table",
-            "position": {
-              "x": -250,
-              "y": 40
-            },
-            "count": 0,
-            "originKey": "D68F38C8-0C2F-40BC-8B2B-B343A6F747F3"
-          },
-          {
-            "id": "b55a2f2b-021a-40aa-a8a4-9b0087521711",
-            "shape": "table",
-            "position": {
-              "x": -200,
-              "y": 490
-            },
-            "count": 0,
-            "originKey": "9B30C627-B983-4DBA-8C73-BF85184B8D13"
+            "fillColor": "#ACDAFC"
           },
           {
             "id": "9813c6ac-90c9-4206-b1ac-e30ceef9730a",
@@ -15809,30 +15852,17 @@
                 "y": 790
               }
             ],
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
-          },
-          {
-            "id": "dc9c3e07-d656-4f2f-8cc0-a555f5bb2618",
-            "shape": "table",
-            "position": {
-              "x": 270,
-              "y": 510
-            },
-            "count": 0,
-            "originKey": "D42F0C82-EAED-420C-B210-47BD4CEF5260"
+            "fillColor": "#ACDAFC"
           },
           {
-            "id": "a1e93e2f-6767-4e17-a5bf-ac0dc092145a",
+            "id": "2cec1a80-1bd2-40d1-a114-1d48bcae2bab",
             "shape": "table",
             "position": {
-              "x": 288.5,
-              "y": 960
+              "x": -280,
+              "y": 900
             },
             "count": 0,
-            "originKey": "3C2512D5-BFB8-44FB-9BA8-79AAD3E6E16B"
+            "originKey": "9B0E6171-1A99-4F6A-9670-F15A8243DA32"
           }
         ]
       },
@@ -15858,8 +15888,8 @@
             "relation": "1:1",
             "vertices": [
               {
-                "x": 590,
-                "y": 120
+                "x": 460,
+                "y": 190
               }
             ],
             "fillColor": "#ACDAFC"
@@ -15879,20 +15909,6 @@
             "fillColor": "#ACDAFC"
           },
           {
-            "id": "72829337-7665-4829-956d-eafb6855e9f5",
-            "shape": "erdRelation",
-            "source": {
-              "cell": "d29c7ce6-c41a-48e8-b76f-bb506dd54fdc",
-              "port": "4FE5841D-7A10-4AC7-93AE-CD5B1C312E93%out"
-            },
-            "target": {
-              "cell": "c1151c61-2cdb-483f-9874-9031bd49d721",
-              "port": "3E181CA4-A797-4914-BB0A-AA7ACB27A33B%out"
-            },
-            "relation": "1:1",
-            "fillColor": "#ACDAFC"
-          },
-          {
             "id": "d34e016c-b49e-47de-ac85-7d11edde025f",
             "shape": "erdRelation",
             "source": {
@@ -15918,16 +15934,6 @@
             "originKey": "DEFB16E2-1761-489E-A477-E5719163D764"
           },
           {
-            "id": "ccf886bf-beeb-46ce-ada6-491073f79509",
-            "shape": "table",
-            "position": {
-              "x": 200,
-              "y": -150
-            },
-            "count": 0,
-            "originKey": "D42F0C82-EAED-420C-B210-47BD4CEF5260"
-          },
-          {
             "id": "c1151c61-2cdb-483f-9874-9031bd49d721",
             "shape": "table",
             "position": {
@@ -15941,11 +15947,21 @@
             "id": "d29c7ce6-c41a-48e8-b76f-bb506dd54fdc",
             "shape": "table",
             "position": {
-              "x": 250,
+              "x": 300,
               "y": 480
             },
             "count": 0,
             "originKey": "3C2512D5-BFB8-44FB-9BA8-79AAD3E6E16B"
+          },
+          {
+            "id": "ccf886bf-beeb-46ce-ada6-491073f79509",
+            "shape": "table",
+            "position": {
+              "x": 200,
+              "y": -220
+            },
+            "count": 0,
+            "originKey": "D42F0C82-EAED-420C-B210-47BD4CEF5260"
           }
         ]
       },

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 199 - 0
数据库/PDMAN/.back_GuangZuan/GuangZuan-backup-2022628175118.pdma.json


+ 200 - 184
数据库/PDMAN/GuangZuan.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.1",
   "createdTime": "2022-6-17 13:12:04",
-  "updatedTime": "2022-6-28 15:31:27",
+  "updatedTime": "2022-6-28 17:51:18",
   "dbConns": [],
   "profile": {
     "default": {
@@ -4083,7 +4083,7 @@
       "correlations": [],
       "indexes": [
         {
-          "defKey": "IDX_RESOURCE_CODE",
+          "defKey": "IDX_ZS_MFM_RESOURCE_CODE",
           "defName": null,
           "unique": false,
           "comment": "",
@@ -4813,7 +4813,7 @@
       "correlations": [],
       "indexes": [
         {
-          "defKey": "IDX_IP",
+          "defKey": "IDX_ZS_IPB_IP",
           "defName": null,
           "unique": true,
           "comment": "",
@@ -5106,7 +5106,7 @@
       "correlations": [],
       "indexes": [
         {
-          "defKey": "IDX_TEMPLATEID",
+          "defKey": "IDX_SMS_TEMPLATEID_PROVIDER",
           "defName": null,
           "unique": true,
           "comment": "",
@@ -8717,7 +8717,7 @@
       "correlations": [],
       "indexes": [
         {
-          "defKey": "IDX_UserID",
+          "defKey": "IDX_ZS_CNR_USERID",
           "defName": null,
           "unique": false,
           "comment": "",
@@ -9650,7 +9650,7 @@
         {
           "defKey": "stock_qty",
           "defName": "库存数量",
-          "comment": "库存数量",
+          "comment": "",
           "type": "",
           "len": "",
           "scale": "",
@@ -9662,12 +9662,12 @@
           "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
           "refDict": "",
           "extProps": {},
-          "id": "4C192496-C181-4AF0-A950-38520C210939"
+          "id": "52B7EC68-6B47-4746-A29E-7E51D14F4B97"
         },
         {
           "defKey": "freeze_qty",
           "defName": "冻结数量",
-          "comment": "冻结数量",
+          "comment": "",
           "type": "",
           "len": "",
           "scale": "",
@@ -9679,12 +9679,12 @@
           "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
           "refDict": "",
           "extProps": {},
-          "id": "992F0141-A7B3-494E-AF95-A5B9BB5E7EEE"
+          "id": "DCCB90F1-B77C-4225-8D33-FCCBC74CA61C"
         },
         {
           "defKey": "sold_qty",
           "defName": "已售数量",
-          "comment": "已售数量",
+          "comment": "",
           "type": "",
           "len": "",
           "scale": "",
@@ -9696,7 +9696,7 @@
           "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
           "refDict": "",
           "extProps": {},
-          "id": "4370608E-11A7-4CCD-95C6-65BD56097A7C"
+          "id": "06C0E78D-564C-4013-BF9B-4553C1340379"
         },
         {
           "defKey": "user_id",
@@ -10641,9 +10641,9 @@
           "id": "A76C1CD6-4659-4E2C-942F-2EA269447171"
         },
         {
-          "defKey": "parent_id",
-          "defName": "上级仓库id",
-          "comment": "为空则为顶级",
+          "defKey": "type",
+          "defName": "仓库类型",
+          "comment": "",
           "type": "",
           "len": "",
           "scale": "",
@@ -10652,10 +10652,10 @@
           "autoIncrement": false,
           "defaultValue": "",
           "hideInGraph": false,
-          "refDict": "",
+          "refDict": "9351CD01-E8E0-4F75-A502-2DD63EBACC9B",
           "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "id": "9ACD2255-2E7D-4F82-BD9F-58D399C5E926"
+          "domain": "BE3E3799-C337-4566-9258-2E2F2770C52D",
+          "id": "4E97DA65-59A2-4CCD-A13E-166A201B64EF"
         },
         {
           "defKey": "Remark",
@@ -10936,8 +10936,8 @@
           "id": "F57C3FBF-D5E0-4EE5-8BA2-B9A5FC860C73"
         },
         {
-          "defKey": "location_lv1",
-          "defName": "仓存地点一级",
+          "defKey": "location_id",
+          "defName": "仓库Id",
           "comment": "一级",
           "type": "",
           "len": "",
@@ -10953,23 +10953,6 @@
           "id": "DC8C1FC5-4AFF-4E24-B471-D5A5BDD5E606"
         },
         {
-          "defKey": "location_lv2",
-          "defName": "仓存地点二级",
-          "comment": "二级",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
-          "refDict": "",
-          "extProps": {},
-          "id": "4FE5841D-7A10-4AC7-93AE-CD5B1C312E93"
-        },
-        {
           "defKey": "market_price",
           "defName": "市场价",
           "comment": "",
@@ -11602,7 +11585,7 @@
       "correlations": [],
       "indexes": [
         {
-          "defKey": "",
+          "defKey": "IDX_ZS_GSE_SKUID",
           "defName": null,
           "unique": true,
           "comment": "",
@@ -12666,7 +12649,7 @@
         {
           "defKey": "1",
           "defName": "未上架",
-          "sort": "",
+          "sort": "1",
           "parentKey": "",
           "intro": "",
           "enabled": true,
@@ -12677,8 +12660,8 @@
         },
         {
           "defKey": "2",
-          "defName": "正常",
-          "sort": "",
+          "defName": "出售中",
+          "sort": "2",
           "parentKey": "",
           "intro": "",
           "enabled": true,
@@ -12690,7 +12673,7 @@
         {
           "defKey": "3",
           "defName": "已下架",
-          "sort": "",
+          "sort": "3",
           "parentKey": "",
           "intro": "",
           "enabled": true,
@@ -12698,6 +12681,18 @@
           "attr2": "",
           "attr3": "",
           "id": "131CD748-2889-420E-9716-92DB5651C7D7"
+        },
+        {
+          "defKey": "4",
+          "defName": "已失效",
+          "sort": "4",
+          "parentKey": "",
+          "intro": "",
+          "enabled": true,
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "id": "A617968E-181A-48EA-804D-4B51421BDF1B"
         }
       ]
     },
@@ -14614,6 +14609,51 @@
           "id": "E4257FA8-FE22-43B7-B44C-25B90A647C33"
         }
       ]
+    },
+    {
+      "defKey": "LocationType",
+      "defName": "仓库类型",
+      "sort": "",
+      "intro": "",
+      "id": "9351CD01-E8E0-4F75-A502-2DD63EBACC9B",
+      "items": [
+        {
+          "defKey": "1",
+          "defName": "展会仓(Exhibition)",
+          "sort": "1",
+          "parentKey": "",
+          "intro": "",
+          "enabled": true,
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "id": "E549B347-6D6E-47A0-856E-219A5D1379DC"
+        },
+        {
+          "defKey": "2",
+          "defName": "中心仓(Warehouse in the Exchange)",
+          "sort": "2",
+          "parentKey": "",
+          "intro": "",
+          "enabled": true,
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "id": "4967D698-60AB-4A8D-AD54-5C0ACCE934BE"
+        },
+        {
+          "defKey": "3",
+          "defName": "自有仓(Warehouse for Oneself)",
+          "sort": "3",
+          "parentKey": "",
+          "intro": "",
+          "enabled": true,
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "id": "94A388BB-AD57-4DFC-8BCB-6BCE72D30C32"
+        }
+      ]
     }
   ],
   "viewGroups": [
@@ -14684,7 +14724,8 @@
         "0E659254-9056-4B0C-8026-7981C7F3C686",
         "0F0C945F-DBBE-4291-AF89-F54A8EC8EA7D",
         "56A3D732-06C1-404F-AFC2-C2516ABA670E",
-        "8A215A02-52A1-49E1-9B6A-6BBE641122CD"
+        "8A215A02-52A1-49E1-9B6A-6BBE641122CD",
+        "9351CD01-E8E0-4F75-A502-2DD63EBACC9B"
       ],
       "id": "FACBAA60-289F-442B-9987-D2CCDB32F4AF"
     },
@@ -15598,23 +15639,6 @@
       "canvasData": {
         "cells": [
           {
-            "id": "a4b9441d-fd5d-47bf-9ed7-313458395f86",
-            "shape": "erdRelation",
-            "source": {
-              "cell": "9168400d-eb04-41f2-b54c-7f67cf5fce1a",
-              "port": "CAFE0EBD-7524-4A3E-9107-C298C43EA4FD%out"
-            },
-            "target": {
-              "cell": "58f4c838-0253-468c-a303-7c6eed35c6d5",
-              "port": "8D52D38A-BC02-400D-BB09-4EF658FE1276%in"
-            },
-            "relation": "1:n",
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
-          },
-          {
             "id": "5f2a8322-7811-406e-b553-a3661fb41240",
             "shape": "table",
             "position": {
@@ -15635,6 +15659,100 @@
             "originKey": "BC065A2A-F2D4-44F3-B6D1-C325F17327FF"
           },
           {
+            "id": "2934b279-3c9c-43eb-bc15-1c04ccdc6633",
+            "shape": "table",
+            "position": {
+              "x": -650,
+              "y": 290
+            },
+            "count": 0,
+            "originKey": "045E726F-83FB-4825-96CF-31928C95A327"
+          },
+          {
+            "id": "58f4c838-0253-468c-a303-7c6eed35c6d5",
+            "shape": "table",
+            "position": {
+              "x": 391,
+              "y": -144.5
+            },
+            "count": 0,
+            "originKey": "5C22FB53-4E14-4986-BBF9-B4CE686CD358"
+          },
+          {
+            "id": "9168400d-eb04-41f2-b54c-7f67cf5fce1a",
+            "shape": "table",
+            "position": {
+              "x": 149,
+              "y": 175
+            },
+            "count": 0,
+            "originKey": "D2C1AAAB-1448-4645-BF61-FCE35C17A298"
+          },
+          {
+            "id": "4d7b355e-2b91-4f28-bf9d-4592a7cf620f",
+            "shape": "table",
+            "position": {
+              "x": -653.5,
+              "y": 60
+            },
+            "count": 0,
+            "originKey": "388213E1-91C6-4633-A744-C8DE428F1E01"
+          },
+          {
+            "id": "25e13c35-5f2d-48aa-96c6-0221ac892f0f",
+            "shape": "table",
+            "position": {
+              "x": -250,
+              "y": 40
+            },
+            "count": 0,
+            "originKey": "D68F38C8-0C2F-40BC-8B2B-B343A6F747F3"
+          },
+          {
+            "id": "b55a2f2b-021a-40aa-a8a4-9b0087521711",
+            "shape": "table",
+            "position": {
+              "x": -200,
+              "y": 490
+            },
+            "count": 0,
+            "originKey": "9B30C627-B983-4DBA-8C73-BF85184B8D13"
+          },
+          {
+            "id": "dc9c3e07-d656-4f2f-8cc0-a555f5bb2618",
+            "shape": "table",
+            "position": {
+              "x": 270,
+              "y": 510
+            },
+            "count": 0,
+            "originKey": "D42F0C82-EAED-420C-B210-47BD4CEF5260"
+          },
+          {
+            "id": "a1e93e2f-6767-4e17-a5bf-ac0dc092145a",
+            "shape": "table",
+            "position": {
+              "x": 288.5,
+              "y": 960
+            },
+            "count": 0,
+            "originKey": "3C2512D5-BFB8-44FB-9BA8-79AAD3E6E16B"
+          },
+          {
+            "id": "a4b9441d-fd5d-47bf-9ed7-313458395f86",
+            "shape": "erdRelation",
+            "source": {
+              "cell": "9168400d-eb04-41f2-b54c-7f67cf5fce1a",
+              "port": "CAFE0EBD-7524-4A3E-9107-C298C43EA4FD%out"
+            },
+            "target": {
+              "cell": "58f4c838-0253-468c-a303-7c6eed35c6d5",
+              "port": "8D52D38A-BC02-400D-BB09-4EF658FE1276%in"
+            },
+            "relation": "1:n",
+            "fillColor": "#ACDAFC"
+          },
+          {
             "id": "1bd8628f-c849-48d6-8888-0030a8d73bcc",
             "shape": "erdRelation",
             "source": {
@@ -15646,10 +15764,7 @@
               "port": "198004C4-90CA-4FBE-A18D-83EA7548EDA5%in"
             },
             "relation": "n:1",
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
+            "fillColor": "#ACDAFC"
           },
           {
             "id": "b31d9b7f-4a76-4632-bd10-0925ddd6743d",
@@ -15663,10 +15778,7 @@
               "port": "8057466E-E15C-4A81-A7EB-0A2D5734F2C3%in"
             },
             "relation": "n:n",
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
+            "fillColor": "#ACDAFC"
           },
           {
             "id": "6d380052-5537-4a0f-9908-e7a8c79768b7",
@@ -15686,20 +15798,7 @@
                 "y": 370
               }
             ],
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
-          },
-          {
-            "id": "2934b279-3c9c-43eb-bc15-1c04ccdc6633",
-            "shape": "table",
-            "position": {
-              "x": -650,
-              "y": 290
-            },
-            "count": 0,
-            "originKey": "045E726F-83FB-4825-96CF-31928C95A327"
+            "fillColor": "#ACDAFC"
           },
           {
             "id": "00edbf2b-cfd0-42b7-b267-9d243d65b83e",
@@ -15719,10 +15818,7 @@
                 "y": 126
               }
             ],
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
+            "fillColor": "#ACDAFC"
           },
           {
             "id": "de3ab5b3-7268-471d-82ab-8b7ea9aa7ccf",
@@ -15736,60 +15832,7 @@
               "port": "DA359726-417F-4D15-972C-F67FDA8ED042%in"
             },
             "relation": "n:n",
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
-          },
-          {
-            "id": "58f4c838-0253-468c-a303-7c6eed35c6d5",
-            "shape": "table",
-            "position": {
-              "x": 391,
-              "y": -144.5
-            },
-            "count": 0,
-            "originKey": "5C22FB53-4E14-4986-BBF9-B4CE686CD358"
-          },
-          {
-            "id": "9168400d-eb04-41f2-b54c-7f67cf5fce1a",
-            "shape": "table",
-            "position": {
-              "x": 149,
-              "y": 175
-            },
-            "count": 0,
-            "originKey": "D2C1AAAB-1448-4645-BF61-FCE35C17A298"
-          },
-          {
-            "id": "4d7b355e-2b91-4f28-bf9d-4592a7cf620f",
-            "shape": "table",
-            "position": {
-              "x": -653.5,
-              "y": 60
-            },
-            "count": 0,
-            "originKey": "388213E1-91C6-4633-A744-C8DE428F1E01"
-          },
-          {
-            "id": "25e13c35-5f2d-48aa-96c6-0221ac892f0f",
-            "shape": "table",
-            "position": {
-              "x": -250,
-              "y": 40
-            },
-            "count": 0,
-            "originKey": "D68F38C8-0C2F-40BC-8B2B-B343A6F747F3"
-          },
-          {
-            "id": "b55a2f2b-021a-40aa-a8a4-9b0087521711",
-            "shape": "table",
-            "position": {
-              "x": -200,
-              "y": 490
-            },
-            "count": 0,
-            "originKey": "9B30C627-B983-4DBA-8C73-BF85184B8D13"
+            "fillColor": "#ACDAFC"
           },
           {
             "id": "9813c6ac-90c9-4206-b1ac-e30ceef9730a",
@@ -15809,30 +15852,17 @@
                 "y": 790
               }
             ],
-            "fillColor": "#ACDAFC",
-            "router": {
-              "name": "manhattan"
-            }
-          },
-          {
-            "id": "dc9c3e07-d656-4f2f-8cc0-a555f5bb2618",
-            "shape": "table",
-            "position": {
-              "x": 270,
-              "y": 510
-            },
-            "count": 0,
-            "originKey": "D42F0C82-EAED-420C-B210-47BD4CEF5260"
+            "fillColor": "#ACDAFC"
           },
           {
-            "id": "a1e93e2f-6767-4e17-a5bf-ac0dc092145a",
+            "id": "2cec1a80-1bd2-40d1-a114-1d48bcae2bab",
             "shape": "table",
             "position": {
-              "x": 288.5,
-              "y": 960
+              "x": -280,
+              "y": 900
             },
             "count": 0,
-            "originKey": "3C2512D5-BFB8-44FB-9BA8-79AAD3E6E16B"
+            "originKey": "9B0E6171-1A99-4F6A-9670-F15A8243DA32"
           }
         ]
       },
@@ -15858,8 +15888,8 @@
             "relation": "1:1",
             "vertices": [
               {
-                "x": 590,
-                "y": 120
+                "x": 460,
+                "y": 190
               }
             ],
             "fillColor": "#ACDAFC"
@@ -15879,20 +15909,6 @@
             "fillColor": "#ACDAFC"
           },
           {
-            "id": "72829337-7665-4829-956d-eafb6855e9f5",
-            "shape": "erdRelation",
-            "source": {
-              "cell": "d29c7ce6-c41a-48e8-b76f-bb506dd54fdc",
-              "port": "4FE5841D-7A10-4AC7-93AE-CD5B1C312E93%out"
-            },
-            "target": {
-              "cell": "c1151c61-2cdb-483f-9874-9031bd49d721",
-              "port": "3E181CA4-A797-4914-BB0A-AA7ACB27A33B%out"
-            },
-            "relation": "1:1",
-            "fillColor": "#ACDAFC"
-          },
-          {
             "id": "d34e016c-b49e-47de-ac85-7d11edde025f",
             "shape": "erdRelation",
             "source": {
@@ -15918,16 +15934,6 @@
             "originKey": "DEFB16E2-1761-489E-A477-E5719163D764"
           },
           {
-            "id": "ccf886bf-beeb-46ce-ada6-491073f79509",
-            "shape": "table",
-            "position": {
-              "x": 200,
-              "y": -150
-            },
-            "count": 0,
-            "originKey": "D42F0C82-EAED-420C-B210-47BD4CEF5260"
-          },
-          {
             "id": "c1151c61-2cdb-483f-9874-9031bd49d721",
             "shape": "table",
             "position": {
@@ -15941,11 +15947,21 @@
             "id": "d29c7ce6-c41a-48e8-b76f-bb506dd54fdc",
             "shape": "table",
             "position": {
-              "x": 250,
+              "x": 300,
               "y": 480
             },
             "count": 0,
             "originKey": "3C2512D5-BFB8-44FB-9BA8-79AAD3E6E16B"
+          },
+          {
+            "id": "ccf886bf-beeb-46ce-ada6-491073f79509",
+            "shape": "table",
+            "position": {
+              "x": 200,
+              "y": -220
+            },
+            "count": 0,
+            "originKey": "D42F0C82-EAED-420C-B210-47BD4CEF5260"
           }
         ]
       },

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio