Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	doc/dpm/物流租户系统.pdma.json

doc/dpm/物流租户系统.pdma.json

@@ -19645,8 +19645,8 @@
           "uiHint": null
         },
         {
-          "defKey": "warehouse_head",
-          "defName": "仓库头编号",
+          "defKey": "warehouse_code",
+          "defName": "仓库码",
           "comment": "",
           "type": "",
           "len": "",
@@ -19663,8 +19663,8 @@
           "uiHint": null
         },
         {
-          "defKey": "tray_head",
-          "defName": "托盘头编码",
+          "defKey": "tray_code",
+          "defName": "托盘码",
           "comment": "",
           "type": "",
           "len": "",
@@ -19681,8 +19681,25 @@
           "uiHint": null
         },
         {
-          "defKey": "contract_head",
-          "defName": "合同号前缀",
+          "defKey": "locator_code",
+          "defName": "库位码",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "37B77FC9-2AB1-4619-97EC-E5FB60035AAD"
+        },
+        {
+          "defKey": "contract_code",
+          "defName": "合同号码",
           "comment": "",
           "type": "",
           "len": "",
@@ -19698,6 +19715,91 @@
           "id": "ECAC83D5-7003-4E50-932D-35A1A5784783",
           "uiHint": null
         },
+        {
+          "defKey": "order_code",
+          "defName": "订单码",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "51F0321C-38A4-4BB4-896E-705DCA4D51FC"
+        },
+        {
+          "defKey": "waybill_code",
+          "defName": "运单码",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "EC0F7871-2991-4CC7-A378-FFFADD29E70B"
+        },
+        {
+          "defKey": "delivery_code",
+          "defName": "配送清单码",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "9FA20F57-4E5F-4F7E-96C1-585CCE4E8CB3"
+        },
+        {
+          "defKey": "stowage_code",
+          "defName": "配载计划码",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "476E26C5-240E-46BA-9414-2415CFEBAB17"
+        },
+        {
+          "defKey": "package_code",
+          "defName": "包件码",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "1239B528-6AA0-4549-AEAA-9428BE682D28"
+        },
         {
           "defKey": "reserve1",
           "defName": "预留1",
@@ -28923,4 +29025,4 @@
     }
   ],
   "dbConn": []
-}
+}