Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWare...

payne

2024-04-25 7467b779d4b6800e886973a40eb7318880089792

Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse

 ʹÓÃÎĵµ/PDManerÎļþ/Ô­²ÄÁÏ¿â±ê×¼»¯.pdma.json

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.1.3",
  "createdTime": "2024-4-12 12:56:29",
  "updatedTime": "2024-4-25 10:00:13",
  "updatedTime": "2024-4-25 10:34:56",
  "dbConns": [],
  "profile": {
    "default": {
@@ -22930,8 +22930,8 @@
          "defKey": "Id",
          "defName": "Id主键",
          "comment": "",
          "domain": "",
          "type": "bigint",
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": true,
@@ -23014,8 +23014,8 @@
          "defKey": "ContainerId",
          "defName": "托盘Id",
          "comment": "",
          "domain": "",
          "type": "bigint",
          "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
@@ -23070,8 +23070,8 @@
          "defKey": "ContainerPlaceStatus",
          "defName": "状态",
          "comment": "",
          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
          "type": "",
          "domain": "",
          "type": "int",
          "len": "",
          "scale": "",
          "primaryKey": false,
@@ -23391,7 +23391,8 @@
        }
      ],
      "correlations": [],
      "type": "P"
      "type": "P",
      "nameTemplate": "{defKey}[{defName}]"
    },
    {
      "id": "5F5C8BC8-90AE-483B-B32B-E87C2FF49159",
@@ -27700,7 +27701,7 @@
    },
    {
      "id": "1FBB7A8B-7AE9-4CD5-A82B-9AADE7CDA005",
      "defKey": "wms_material_container",
      "defKey": "wms_container_material",
      "defName": "库存托盘关系表",
      "comment": "",
      "properties": {},
@@ -27709,8 +27710,8 @@
          "defKey": "Id",
          "defName": "Id主键",
          "comment": "",
          "domain": "",
          "type": "bigint",
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": true,
@@ -34398,7 +34399,7 @@
    },
    {
      "id": "4CEB0052-B01C-4573-9B1A-997C752AF08F",
      "defKey": "wms_order_asn_detail",
      "defKey": "wms_order_asn_details",
      "defName": "ASN明细表",
      "comment": "",
      "properties": {},
@@ -34800,6 +34801,57 @@
          "baseType": "F8A4AFB0-F3B7-4E32-A5F2-D4D8D3F4BACD",
          "extProps": {},
          "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE"
        },
        {
          "defKey": "SN_1d",
          "defName": "一维条码",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "BF34906B-2D40-4EED-9FBA-BCE18A766A2D"
        },
        {
          "defKey": "SN_2d",
          "defName": "二维条码",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "DA13E00C-D6F2-40AD-8C3B-D8A769F854D0"
        },
        {
          "defKey": "Package",
          "defName": "包装名称",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "B73A1B81-6379-4ADC-A6A6-D78FB5AB5F37"
        },
        {
          "defKey": "CreatedTime",
@@ -47615,6 +47667,596 @@
      ],
      "correlations": [],
      "indexes": []
    },
    {
      "id": "1B6B6043-D351-402C-83DF-BB4CD5FF3B58",
      "env": {
        "base": {
          "nameSpace": "",
          "codeRoot": ""
        }
      },
      "defKey": "wms_qc",
      "defName": "质检单",
      "comment": "",
      "properties": {
        "partitioned by": "(date string)",
        "row format delimited": "",
        "fields terminated by ','": "",
        "collection items terminated by '-'": "",
        "map keys terminated by ':'": "",
        "store as textfile;": ""
      },
      "nameTemplate": "{defKey}[{defName}]",
      "headers": [
        {
          "refKey": "hideInGraph",
          "hideInGraph": true
        },
        {
          "refKey": "defKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "defName",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "primaryKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "notNull",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "autoIncrement",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "domain",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "type",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "len",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "scale",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "comment",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "refDict",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "defaultValue",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "isStandard",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "uiHint",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "extProps",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr1",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr2",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr3",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr4",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr5",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr6",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr7",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr8",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr9",
          "freeze": false,
          "hideInGraph": true
        }
      ],
      "fields": [
        {
          "defKey": "Id",
          "defName": "Id主键",
          "comment": "",
          "type": "",
          "len": 32,
          "scale": "",
          "primaryKey": true,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "refDict": "",
          "uiHint": "",
          "id": "62487842-4945-4F6E-B926-3ABC090EAA44",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "CreatedUserName",
          "defName": "创建人",
          "comment": "",
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "9E7D2C53-B18F-4D26-AEBA-6216A91110C2",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "CreatedTime",
          "defName": "创建时间",
          "comment": "",
          "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "DDC6B8AD-800C-408B-A030-151C5118F091",
          "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811"
        },
        {
          "defKey": "UpdatedUserName",
          "defName": "修改人",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "2ECA82C8-C3E5-470C-99A7-2FEAC5B8107C",
          "baseType": "F8A4AFB0-F3B7-4E32-A5F2-D4D8D3F4BACD"
        },
        {
          "defKey": "UpdatedTime",
          "defName": "修改时间",
          "comment": "",
          "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "7128E5DE-9142-4B20-B904-7A429B123457",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "CreatedUserId",
          "defName": "创建者Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "B581B1A6-8553-47AF-A443-A336F84FEAC9",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "UpdatedUserId",
          "defName": "修改者Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "390E5D4A-00E3-4136-A16E-9A5E0D26014B",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "IsDeleted",
          "defName": "软删除标记",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "F2C7CA39-9C96-4946-9ECB-395A42384D23",
          "baseType": "7ECAE23D-9FDB-4015-93BC-459D56A1ACA1"
        }
      ],
      "correlations": [],
      "indexes": []
    },
    {
      "id": "E8480AA8-F540-4ABB-9856-1F624C258929",
      "env": {
        "base": {
          "nameSpace": "",
          "codeRoot": ""
        }
      },
      "defKey": "wms_qc_details",
      "defName": "质检单明细",
      "comment": "",
      "properties": {
        "partitioned by": "(date string)",
        "row format delimited": "",
        "fields terminated by ','": "",
        "collection items terminated by '-'": "",
        "map keys terminated by ':'": "",
        "store as textfile;": ""
      },
      "nameTemplate": "{defKey}[{defName}]",
      "headers": [
        {
          "refKey": "hideInGraph",
          "hideInGraph": true
        },
        {
          "refKey": "defKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "defName",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "primaryKey",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "notNull",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "autoIncrement",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "domain",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "type",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "len",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "scale",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "comment",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "refDict",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "defaultValue",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "isStandard",
          "freeze": false,
          "hideInGraph": false
        },
        {
          "refKey": "uiHint",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "extProps",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr1",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr2",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr3",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr4",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr5",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr6",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr7",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr8",
          "freeze": false,
          "hideInGraph": true
        },
        {
          "refKey": "attr9",
          "freeze": false,
          "hideInGraph": true
        }
      ],
      "fields": [
        {
          "defKey": "Id",
          "defName": "Id主键",
          "comment": "",
          "type": "",
          "len": 32,
          "scale": "",
          "primaryKey": true,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
          "refDict": "",
          "uiHint": "",
          "id": "EEA68B4C-944C-4BBA-8417-B26F610F492C",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "CreatedUserName",
          "defName": "创建人",
          "comment": "",
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "6FADCD07-6BDA-400F-8050-7137E191CF8E",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "CreatedTime",
          "defName": "创建时间",
          "comment": "",
          "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "596C0849-EAAC-4072-BA15-1BF08D37F09B",
          "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811"
        },
        {
          "defKey": "UpdatedUserName",
          "defName": "修改人",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
          "id": "CAC1649A-49B1-4F9B-AE1E-5BDE49B03812",
          "baseType": "F8A4AFB0-F3B7-4E32-A5F2-D4D8D3F4BACD"
        },
        {
          "defKey": "UpdatedTime",
          "defName": "修改时间",
          "comment": "",
          "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "D7D9F7CE-A4DD-4B03-B319-6430B14B3925",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
        },
        {
          "defKey": "CreatedUserId",
          "defName": "创建者Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "5C68F5BB-3F72-49A2-B0C8-861B623BB09A",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "UpdatedUserId",
          "defName": "修改者Id",
          "comment": "",
          "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": true,
          "refDict": "",
          "uiHint": "",
          "id": "EAF00123-E0D5-4249-9C95-E159736DC2F9",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "IsDeleted",
          "defName": "软删除标记",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": true,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "062DE834-0BB5-4BB7-ADAA-5BEC234E3092",
          "baseType": "7ECAE23D-9FDB-4015-93BC-459D56A1ACA1"
        }
      ],
      "correlations": [],
      "indexes": []
    }
  ],
  "views": [
@@ -48186,7 +48828,34 @@
    {
      "defKey": "系统表",
      "defName": "系统表",
      "refEntities": [],
      "refEntities": [
        "57851BD7-8A19-4918-96C0-3006BEE58F40",
        "E5CF1244-04AC-4467-BCAE-CE577004DCA4",
        "EF8A5058-169B-4A5D-82B4-005BFB71AA2A",
        "CABE7D0C-EB79-461E-982B-3A4AD9A76574",
        "6635E1D9-D584-44AF-9472-1591DF73497C",
        "9166794B-7AE2-4F16-8116-DF1E276FBD1E",
        "95A09EE4-6B3D-45BE-84C6-F1AD315B844F",
        "91F1F1BC-91D7-4B32-B2EC-B207B729262D",
        "C01FD328-61DE-4746-86C3-54C5B660EC22",
        "1CC3149C-6AF5-4A1D-8439-73425B48A71F",
        "4CE878CB-1805-4E6F-8B7C-DBBE3CCD9F2F",
        "CC03E464-D4B1-4036-8019-2333D9DC0421",
        "7440553C-AF5B-415D-94F6-4E4F621F8C29",
        "75F4434F-5874-46B9-A0E5-86D865A1A142",
        "EE69AED8-BFED-4594-B647-09679DBB059F",
        "4FCB6790-1FC8-4658-95B6-E9087B4B09B7",
        "2F67396A-C0EF-4415-9AAF-9DC4F8940725",
        "321C023C-2AEA-444A-9A50-74F5026D3DD3",
        "60E24BE8-7504-4E7C-B5C0-8F5ABFE694B7",
        "2AEB46AD-22B8-4400-B5E8-379AB7F72012",
        "545CF6D7-D7BD-4190-A823-603DF6599C13",
        "10723580-2B1D-4EBF-A753-C0B5B928B375",
        "1D71FEC5-D42E-41B3-9849-B6EEA3C5B115",
        "2CCAD1AC-1B58-4883-8210-25200B592FA1",
        "8405044B-AB65-49B1-8283-6B27784499EA",
        "704E3807-CB2D-4ADF-B101-83D2E8A62E0D"
      ],
      "refViews": [],
      "refDiagrams": [],
      "refDicts": [],
@@ -48206,6 +48875,18 @@
      "refDiagrams": [],
      "refDicts": [],
      "id": "BFD149A5-EC73-47B0-A220-2DD19751A0F6"
    },
    {
      "defKey": "质检模块",
      "defName": "质检模块",
      "refEntities": [
        "1B6B6043-D351-402C-83DF-BB4CD5FF3B58",
        "E8480AA8-F540-4ABB-9856-1F624C258929"
      ],
      "refViews": [],
      "refDiagrams": [],
      "refDicts": [],
      "id": "DF314753-FD7D-4965-8BD2-BF2754E6E535"
    }
  ],
  "dataTypeMapping": {