From 5a8a8e3a7cbcc4872642ec36c3a4af30f3cf9d77 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 15 八月 2025 16:16:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
db/双林新火炬MES数据库设计.pdma.json | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git "a/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" "b/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
index b9447c3..18fd831 100644
--- "a/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
+++ "b/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
@@ -2,7 +2,7 @@
"name": "鍙屾灄鏂扮伀鐐琈ES鏁版嵁搴撹璁�",
"describe": "鎻忚堪鍙岃柂鏂扮伀鐐琈ES鏁版嵁搴撹璁¤鎯�",
"avatar": "",
- "version": "4.9.4",
+ "version": "4.9.2",
"createdTime": "2025-3-10 16:38:19",
"updatedTime": "2025-8-15 14:58:22",
"dbConns": [],
@@ -632,7 +632,7 @@
"#DDE5FF"
],
"DDLToggleCase": "L",
- "menuWidth": "309px"
+ "menuWidth": "364px"
},
"entities": [
{
@@ -61180,7 +61180,7 @@
"codeRoot": ""
}
},
- "defKey": "lsw_鈥媘aterial",
+ "defKey": "lsw_material",
"defName": "绾胯竟搴撶墿鏂欎俊鎭�",
"comment": "",
"properties": {
@@ -61487,24 +61487,6 @@
"baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
},
{
- "defKey": "material_model",
- "defName": "鐗╂枡鍨嬪彿",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
- "extProps": {},
- "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
- "id": "C2AF21CA-2BB0-4F88-9E66-F216401711A0"
- },
- {
"defKey": "material_category",
"defName": "鐗╂枡绫诲瀷",
"comment": "鎴愬搧/澶栨硶鍏�/鍐呮硶鍏�/姣涘澂/閰嶄欢",
@@ -61539,6 +61521,24 @@
"extProps": {},
"domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
"id": "11AE1590-5695-4C1E-A85F-72AAD8288740"
+ },
+ {
+ "defKey": "material_status",
+ "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": "D9381762-109B-4003-9520-FF30D6D1D2AF"
}
],
"correlations": [],
--
Gitblit v1.9.3