Merge remote-tracking branch 'origin/master'

lyh

2025-07-25 ce1cfcb9b9176ddb1f47c9eb4cb2232b080bdbf9

 db/430É豸¹ÜÀíÊý¾Ý¿âÉè¼Æ.pdma.json

@@ -4,7 +4,7 @@
  "avatar": "",
  "version": "4.9.4",
  "createdTime": "2025-3-10 16:38:19",
  "updatedTime": "2025-7-23 19:33:38",
  "updatedTime": "2025-7-23 11:43:01",
  "dbConns": [],
  "profile": {
    "default": {
@@ -9084,6 +9084,42 @@
          "id": "6BEE092E-65D4-4D44-916B-EDB48C4BFBCB"
        },
        {
          "defKey": "order_num",
          "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": "2DF6DEC7-CE4E-4F1A-8F92-D175CB25C833"
        },
        {
          "defKey": "maintenance_date",
          "defName": "保养日期",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
          "extProps": {},
          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
          "id": "AE0B0F0C-CC47-422E-B517-CC3C2992D44B"
        },
        {
          "defKey": "equipment_id",
          "defName": "设备ID",
          "comment": "",
@@ -9229,7 +9265,7 @@
        },
        {
          "defKey": "operate_time",
          "defName": "保养日期",
          "defName": "保养时间",
          "comment": "",
          "type": "",
          "len": "",
@@ -9300,6 +9336,24 @@
          "id": "4C11A4C0-29C2-423B-972B-C080B6023536"
        },
        {
          "defKey": "approved_rejected",
          "defName": "确认类型",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
          "id": "869FCDB4-D5FF-4D44-B0D1-2E0DDF707052"
        },
        {
          "defKey": "confirm_time",
          "defName": "确认日期",
          "comment": "",
@@ -9334,6 +9388,24 @@
          "extProps": {},
          "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
          "id": "624246E9-5FFE-49D3-B975-4439FF9DA03B"
        },
        {
          "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": "FBF88752-FD0D-4697-A427-85AB377753B3"
        }
      ],
      "correlations": [],
@@ -9581,6 +9653,42 @@
          "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
        },
        {
          "defKey": "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": "7EBCA911-19F6-4317-A7F3-3B2901ADBF63"
        },
        {
          "defKey": "spare_code",
          "defName": "备件序号",
          "comment": "",
          "type": "",
          "len": "",
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811",
          "extProps": {},
          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
          "id": "590E5C5B-22E6-42AC-9905-BC67F51B3137"
        },
        {
          "defKey": "spare_name",
          "defName": "备件名称",
          "comment": "",
@@ -9826,6 +9934,24 @@
          "id": "7E7714A5-B442-4842-8E65-6179F3F43740"
        },
        {
          "defKey": "remark",
          "defName": "备注",
          "comment": "",
          "type": "NVARCHAR",
          "len": 255,
          "scale": "",
          "primaryKey": false,
          "notNull": false,
          "autoIncrement": false,
          "defaultValue": "",
          "hideInGraph": false,
          "refDict": "",
          "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
          "extProps": {},
          "domain": "",
          "id": "5175E822-55EE-4354-AED8-3A08F23BDAAF"
        },
        {
          "defKey": "create_by",
          "defName": "创建人",
          "comment": "",
@@ -9914,6 +10040,24 @@
          "extProps": {},
          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
          "id": "F888AE02-055A-458A-98FD-CB22C3EA539B"
        },
        {
          "defKey": "equipment_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": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
          "id": "CCCA9FE5-4BB7-4C86-B3E4-45AE86A15C3F"
        },
        {
          "defKey": "order_id",
@@ -33104,12 +33248,12 @@
  "dbConn": [
    {
      "defKey": "949F6F53-7669-4EC7-923F-649A7D4D8273",
      "defName": "430",
      "defName": "hangyu",
      "type": "BFC87171-C74F-494A-B7C2-76B9C55FACC9",
      "properties": {
        "driver_class_name": "com.microsoft.sqlserver.jdbc.SQLServerDriver",
        "url": "jdbc:sqlserver://127.0.0.1:1433;DatabaseName=LXZN_TEST_430_NEW",
        "password": "",
        "url": "jdbc:sqlserver://192.168.1.118:1433;DatabaseName=LXZN_TEST_HANGYU",
        "password": "123",
        "username": "sa",
        "customer_driver": ""
      }