From 7ed9bc6d11e9134d563ebafff071b5ebb65910e3 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 19 五月 2025 09:30:13 +0800
Subject: [PATCH] art: 设备管理-设备处置 借用归还 代码优化

---
 db/数据库产品化设计.pdma.json |  180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 168 insertions(+), 12 deletions(-)

diff --git "a/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json" "b/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
index d2c148d..7d17e3d 100644
--- "a/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
+++ "b/db/\346\225\260\346\215\256\345\272\223\344\272\247\345\223\201\345\214\226\350\256\276\350\256\241.pdma.json"
@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.9.2",
   "createdTime": "2025-3-10 16:38:19",
-  "updatedTime": "2025-5-15 10:21:28",
+  "updatedTime": "2025-5-16 15:43:56",
   "dbConns": [],
   "profile": {
     "default": {
@@ -632,7 +632,7 @@
       "#DDE5FF"
     ],
     "DDLToggleCase": "L",
-    "menuWidth": "414px"
+    "menuWidth": "336px"
   },
   "entities": [
     {
@@ -11860,7 +11860,7 @@
         },
         {
           "defKey": "lean_person",
-          "defName": "鍊熷叆璐d换浜�",
+          "defName": "鍊熷叆浜�",
           "comment": "",
           "type": "",
           "len": "",
@@ -11877,8 +11877,26 @@
           "id": "365D8286-905F-4721-BAFC-13F85942EEAF"
         },
         {
+          "defKey": "lean_reason",
+          "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": "42D47613-EEEE-4DFC-84D3-6F1B9A84B876"
+        },
+        {
           "defKey": "lean_status",
-          "defName": "鍊熷嚭鐘舵��",
+          "defName": "鍊熺敤鐘舵��",
           "comment": "",
           "type": "",
           "len": "",
@@ -11896,7 +11914,7 @@
         },
         {
           "defKey": "lean_start_time",
-          "defName": "鍊熷嚭寮�濮嬫椂闂�",
+          "defName": "鍊熷嚭鏃堕棿",
           "comment": "",
           "type": "",
           "len": "",
@@ -11914,7 +11932,7 @@
         },
         {
           "defKey": "lean_end_time",
-          "defName": "鍊熷嚭褰掕繕鏃堕棿",
+          "defName": "褰掕繕鏃堕棿",
           "comment": "",
           "type": "",
           "len": "",
@@ -11949,6 +11967,42 @@
           "id": "9A0453DC-3D60-4C57-8178-79E1FA755581"
         },
         {
+          "defKey": "approval_deal_type",
+          "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": "73A65ADD-087D-4F4E-8922-8F7C9BF15033"
+        },
+        {
+          "defKey": "approval_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": "64DB270A-2689-4258-ADCB-F05DAF9EF63B"
+        },
+        {
           "defKey": "approval_time",
           "defName": "瀹℃牳鏃堕棿",
           "comment": "",
@@ -11965,6 +12019,90 @@
           "extProps": {},
           "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
           "id": "C164F2CD-FE76-40F9-B5B0-3C7646F0CB78"
+        },
+        {
+          "defKey": "confirm_user",
+          "defName": "纭浜�",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
+          "refDict": "",
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "694B0616-B817-4DFA-AF77-9CB8D5A637D1",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+        },
+        {
+          "defKey": "confirm_comment",
+          "defName": "纭鎰忚",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "refDict": "",
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "0460D7D1-D7B0-42F2-BF5B-D791D2E96958",
+          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+        },
+        {
+          "defKey": "confirm_time",
+          "defName": "纭鏃堕棿",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "refDict": "",
+          "extProps": {},
+          "notes": {},
+          "attr1": "",
+          "attr2": "",
+          "attr3": "",
+          "attr4": "",
+          "attr5": "",
+          "attr6": "",
+          "attr7": "",
+          "attr8": "",
+          "attr9": "",
+          "id": "C96E50F5-3BC2-4D7E-B5BD-CA26B2CC6A19",
+          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
         },
         {
           "defKey": "remark",
@@ -12941,8 +13079,8 @@
           "codeRoot": ""
         }
       },
-      "defKey": "eam_equipment_dispose",
-      "defName": "璁惧澶勭疆(杞鎶ュ簾)",
+      "defKey": "eam_equipment_scrap",
+      "defName": "璁惧鎶ュ簾(杞)",
       "comment": "",
       "properties": {
         "partitioned by": "(date string)",
@@ -13228,7 +13366,7 @@
           "id": "D1585B86-216F-4415-8AA6-6C65E50985B8"
         },
         {
-          "defKey": "dispose_type",
+          "defKey": "scrap_type",
           "defName": "杞/鎶ュ簾",
           "comment": "",
           "type": "",
@@ -13264,7 +13402,7 @@
           "id": "2E772EA5-9906-4BA4-A0F7-4BEEDC20AD85"
         },
         {
-          "defKey": "dispose_time",
+          "defKey": "scrap_time",
           "defName": "澶勭疆鏃堕棿",
           "comment": "",
           "type": "",
@@ -13282,7 +13420,7 @@
           "id": "A29342D9-A6BC-4988-84A5-4171D5EABE8F"
         },
         {
-          "defKey": "dispose_reason",
+          "defKey": "scrap_reason",
           "defName": "澶勭疆鐞嗙敱",
           "comment": "",
           "type": "",
@@ -13300,7 +13438,7 @@
           "id": "7EBAEA73-F93B-41B2-A132-EDED9C61EF62"
         },
         {
-          "defKey": "dispose_amount",
+          "defKey": "scrap_amount",
           "defName": "澶勭疆閲戦",
           "comment": "",
           "type": "",
@@ -13346,6 +13484,24 @@
           "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
         },
         {
+          "defKey": "approval_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": "58D7F52E-17A7-4D93-AEA7-6E30C83CE631"
+        },
+        {
           "defKey": "approval_time",
           "defName": "瀹℃牳鏃堕棿",
           "comment": "",

--
Gitblit v1.9.3