From d6372da6f37778e90a4bae02865e8ec77e980b6e Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 17 七月 2025 17:14:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 db/430设备管理数据库设计.pdma.json |  356 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 256 insertions(+), 100 deletions(-)

diff --git "a/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" "b/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
index 60db58d..621ea76 100644
--- "a/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
+++ "b/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.9.4",
   "createdTime": "2025-3-10 16:38:19",
-  "updatedTime": "2025-7-16 09:50:41",
+  "updatedTime": "2025-7-17 16:59:40",
   "dbConns": [],
   "profile": {
     "default": {
@@ -11554,6 +11554,34 @@
           "id": "D5F4AD3E-A9C5-41BB-A699-720C3EAEC040"
         },
         {
+          "defKey": "equipment_id",
+          "defName": "璁惧ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "5E70FFE3-D311-4F92-945D-9065CCB784A6",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+        },
+        {
           "defKey": "is_processed",
           "defName": "鏄惁鍔犲伐",
           "comment": "鍔犲伐銆佹湭鍔犲伐",
@@ -12003,24 +12031,6 @@
           "id": "0F23B314-8745-474C-8A0A-81B54056C044"
         },
         {
-          "defKey": "processing_part",
-          "defName": "鍔犲伐闆朵欢鍙�",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": true,
-          "refDict": "",
-          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "7A45AA5D-1A2D-484F-B564-FAE0428A59E6"
-        },
-        {
           "defKey": "report_id",
           "defName": "鎶ヤ慨ID",
           "comment": "",
@@ -12075,24 +12085,6 @@
           "attr9": "",
           "id": "E6F3DCBF-206B-43F5-B96D-C044CE796DC4",
           "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
-        },
-        {
-          "defKey": "quantity",
-          "defName": "浠舵暟",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "B172710B-177A-4760-818A-265145802A2A"
         },
         {
           "defKey": "confirmer",
@@ -12744,60 +12736,6 @@
           "attr9": "",
           "id": "0B7D9130-C3AE-4277-AEFA-964E1805CD0D",
           "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
-        },
-        {
-          "defKey": "scrap_part_number",
-          "defName": "搴熷搧浠跺彿",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "F66CFA1B-E017-4A63-A8EB-CD9EE225619E"
-        },
-        {
-          "defKey": "scrap_part_quantity",
-          "defName": "搴熷搧浠舵暟",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "6D8029F4-851D-4588-9B47-FD1FF9607D71"
-        },
-        {
-          "defKey": "scrap_part_value",
-          "defName": "搴熷搧浠峰��",
-          "comment": "",
-          "type": "",
-          "len": "",
-          "scale": "",
-          "primaryKey": false,
-          "notNull": false,
-          "autoIncrement": false,
-          "defaultValue": "",
-          "hideInGraph": false,
-          "refDict": "",
-          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
-          "extProps": {},
-          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
-          "id": "5B769D79-D7E9-4600-B63B-C049C80D465A"
         },
         {
           "defKey": "operation_certificate",
@@ -14081,6 +14019,62 @@
           "attr9": "",
           "id": "6AE68254-FA3D-4CBE-94B4-1A13BDC7DE19",
           "baseType": ""
+        },
+        {
+          "defKey": "report_id",
+          "defName": "鎶ヤ慨ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "FE265CE7-8F30-40CE-A734-220CBB217C2C",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+        },
+        {
+          "defKey": "equipment_id",
+          "defName": "璁惧ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "05318404-070F-4C0B-B49E-9B38FDC05661",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
         }
       ],
       "correlations": [],
@@ -29134,6 +29128,42 @@
           "uiHint": null
         },
         {
+          "defKey": "equipment_manager_signature_result",
+          "defName": "涓荤棰嗗绛惧瓧缁撴灉",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "6F893E15-38C2-4B49-B9B1-8D693D0FCADE"
+        },
+        {
+          "defKey": "equipment_manager_comment",
+          "defName": "涓荤棰嗗鎰忚",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "3D0D5A7E-D831-4DCF-8EE6-4929FC02BB81"
+        },
+        {
           "defKey": "depart_manager_signature",
           "defName": "閮ㄩ棬棰嗗绛惧瓧",
           "comment": "鏍规嵁鍙樻洿鍘熷洜绫诲瀷鍖哄垎涓嶅悓鐨勪汉瀹℃壒",
@@ -29170,6 +29200,24 @@
           "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
           "id": "6916268E-683D-4550-B7AB-8C89AD1A5E16",
           "uiHint": null
+        },
+        {
+          "defKey": "depart_manager_signature_result",
+          "defName": "閮ㄩ棬棰嗗绛惧瓧缁撴灉",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "2FDCCD31-8269-4971-97A9-057021E4148D"
         },
         {
           "defKey": "depart_manager_comment",
@@ -29227,6 +29275,24 @@
           "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
           "id": "34D18DFD-4171-4BC3-8940-3BBA50A05501",
           "uiHint": null
+        },
+        {
+          "defKey": "production_support_signature_result",
+          "defName": "鐢熶骇淇濋殰閮ㄩ瀵肩瀛楃粨鏋�",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "7D3E8B25-E8CF-4FF9-9028-705E27461D72"
         },
         {
           "defKey": "production_support_comment",
@@ -29575,6 +29641,24 @@
           "id": "93F32EBA-AAA0-447E-8245-C00E57E6A2D6"
         },
         {
+          "defKey": "factory_org_code",
+          "defName": "鐢宠鍗曚綅",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+          "extProps": {},
+          "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
+          "id": "7C43799B-BAC6-4747-ACCB-0E5B5FE0BAB8"
+        },
+        {
           "defKey": "designer",
           "defName": "缂栧埗浜�",
           "comment": "",
@@ -29612,7 +29696,7 @@
         },
         {
           "defKey": "depart_header_signature",
-          "defName": "浣跨敤鍗曚綅瀹や富绠$瀛�",
+          "defName": "浣跨敤鍗曚綅瀹ょ骇涓荤绛惧瓧",
           "comment": "",
           "type": "",
           "len": "",
@@ -29630,7 +29714,7 @@
         },
         {
           "defKey": "depart_header_signature_time",
-          "defName": "浣跨敤鍗曚綅瀹や富绠$瀛楁椂闂�",
+          "defName": "浣跨敤鍗曚綅瀹ょ骇涓荤绛惧瓧鏃堕棿",
           "comment": "",
           "type": "",
           "len": "",
@@ -29647,8 +29731,26 @@
           "id": "E0CF80C5-1DEC-497D-A921-11F8D28FDDDD"
         },
         {
-          "defKey": "depart_header_signature_comment",
-          "defName": "浣跨敤鍗曚綅瀹や富绠℃剰瑙�",
+          "defKey": "depart_header_signature_result",
+          "defName": "浣跨敤鍗曚綅瀹ょ骇涓荤绛惧瓧缁撴灉",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "B2EAC775-642D-4E3C-8399-83D0D8CE851E"
+        },
+        {
+          "defKey": "depart_header_comment",
+          "defName": "浣跨敤鍗曚綅瀹ょ骇涓荤鎰忚",
           "comment": "",
           "type": "",
           "len": "",
@@ -29666,7 +29768,7 @@
         },
         {
           "defKey": "depart_leader_signature",
-          "defName": "浣跨敤鍗曚綅閮ㄤ富绠$瀛�",
+          "defName": "浣跨敤鍗曚綅閮ㄧ骇涓荤绛惧瓧",
           "comment": "",
           "type": "",
           "len": "",
@@ -29684,7 +29786,7 @@
         },
         {
           "defKey": "depart_leader_signature_time",
-          "defName": "浣跨敤鍗曚綅閮ㄤ富绠$瀛楁椂闂�",
+          "defName": "浣跨敤鍗曚綅閮ㄧ骇涓荤绛惧瓧鏃堕棿",
           "comment": "",
           "type": "",
           "len": "",
@@ -29701,8 +29803,26 @@
           "id": "C77D4C1E-8FB6-4AA4-984F-98B64E7FFE5E"
         },
         {
-          "defKey": "depart_leader_signature_comment",
-          "defName": "浣跨敤鍗曚綅閮ㄤ富绠$瀛�",
+          "defKey": "depart_leader_signature_result",
+          "defName": "浣跨敤鍗曚綅閮ㄧ骇涓荤绛惧瓧缁撴灉",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "F39CEC10-976B-41C8-8E4E-D32AA6731BC7"
+        },
+        {
+          "defKey": "depart_leader_comment",
+          "defName": "浣跨敤鍗曚綅閮ㄧ骇涓荤绛惧瓧",
           "comment": "",
           "type": "",
           "len": "",
@@ -29745,6 +29865,24 @@
           "attr9": "",
           "id": "C4A479A5-B9DD-4911-B26A-ABEA85EF875A",
           "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+        },
+        {
+          "defKey": "remark",
+          "defName": "澶囨敞",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "EEFBECA7-F8B1-4667-8963-4B8E7A9C9C5D"
         }
       ],
       "correlations": [],
@@ -29990,6 +30128,24 @@
           "uiHint": "",
           "id": "AA935277-83FE-4AC6-A827-E10EFD3C8024",
           "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
+        },
+        {
+          "defKey": "change_order_id",
+          "defName": "鍙樻洿ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+          "extProps": {},
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "id": "F4CA33AF-7AFC-481E-BC01-0263405029BE"
         },
         {
           "defKey": "equipment_id",
@@ -30955,7 +31111,7 @@
           "scale": "",
           "primaryKey": false,
           "notNull": false,
-          "autoIncrement": false,
+          "autoIncrement": true,
           "defaultValue": "",
           "hideInGraph": true,
           "refDict": "",

--
Gitblit v1.9.3