lxm1993 发布系统代码 [TrainSys，网页端]

app_Web/package.json

@@ -13,13 +13,13 @@
   "dependencies": {
     "@floating-ui/dom": "^1.0.11",
     "@ibiz-template/command": "^0.0.1-beta.50",
-    "@ibiz-template/controller": "^0.0.1-beta.93",
-    "@ibiz-template/core": "^0.0.1-beta.93",
-    "@ibiz-template/model": "^0.0.1-beta.93",
-    "@ibiz-template/runtime": "^0.0.1-beta.93",
-    "@ibiz-template/service": "^0.0.1-beta.93",
-    "@ibiz-template/theme": "^0.0.1-beta.93",
-    "@ibiz-template/vue-util": "^0.0.1-beta.93",
+    "@ibiz-template/controller": "^0.0.1-beta.94",
+    "@ibiz-template/core": "^0.0.1-beta.94",
+    "@ibiz-template/model": "^0.0.1-beta.94",
+    "@ibiz-template/runtime": "^0.0.1-beta.94",
+    "@ibiz-template/service": "^0.0.1-beta.94",
+    "@ibiz-template/theme": "^0.0.1-beta.94",
+    "@ibiz-template/vue-util": "^0.0.1-beta.94",
     "@ibiz/dynamic-model-api": "^2.1.24",
     "@riophae/vue-treeselect": "^0.4.0",
     "dayjs": "^1.11.7",

app_Web/src/components/common/code-list/code-list.tsx

@@ -27,8 +27,22 @@ export const CodeList = defineComponent({
           if (isNil(newVal) || newVal === '') {
             // 空值置空
             items.value = [];
-          } else {
             // 非空值解析代码表
+          } else if (
+            props.codeList.orMode === 'NUM' &&
+            props.codeListItems?.length
+          ) {
+            const numVal =
+              typeof newVal === 'string' ? parseInt(newVal, 10) : newVal;
+            // 数值或模式
+            items.value = props
+              .codeListItems!.filter(
+                // eslint-disable-next-line no-bitwise
+                item => numVal & item.value,
+              )
+              .map(item => ({ text: item.text, color: item.color }));
+          } else {
+            // 字符串或模式
             let values: string[] | number[];
             if (typeof newVal === 'string') {
               values = newVal.split(',');
@@ -37,7 +51,8 @@ export const CodeList = defineComponent({
             }
             items.value = values.map(val => {
               const findItem = props.codeListItems?.find(
-                item => item.value === val,
+                // eslint-disable-next-line eqeqeq
+                item => item.value == val,
               );
               return {
                 text: findItem?.text || val,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDEDATAQUERIES/ByIPhone/PSDEDQCODES/MYSQL5.json

@@ -39,6 +39,12 @@
   }, {
     "expression" : "t1.`PHONETYPE`",
     "name" : "PHONETYPE"
+  }, {
+    "expression" : "t1.`PPHONEID`",
+    "name" : "PPHONEID"
+  }, {
+    "expression" : "t1.`PPHONEID2`",
+    "name" : "PPHONEID2"
   }, {
     "expression" : "t1.`PPHONEID3`",
     "name" : "PPHONEID3"
@@ -52,6 +58,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD2`,\nt1.`MONEY`,\nt1.`ORGID`,\nt1.`PHONEID`,\nt1.`PHONENAME`,\nt1.`PHONETYPE`,\nt1.`PPHONEID3`,\nt1.`PPHONEID4`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_PHONE` t1 \n",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD2`,\nt1.`MONEY`,\nt1.`ORGID`,\nt1.`PHONEID`,\nt1.`PHONENAME`,\nt1.`PHONETYPE`,\nt1.`PPHONEID`,\nt1.`PPHONEID2`,\nt1.`PPHONEID3`,\nt1.`PPHONEID4`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_PHONE` t1 \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEDATAQUERIES/ByIPhone/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json

@@ -34,6 +34,12 @@
   }, {
     "expression" : "t1.`PHONETYPE`",
     "name" : "PHONETYPE"
+  }, {
+    "expression" : "t1.`PPHONEID`",
+    "name" : "PPHONEID"
+  }, {
+    "expression" : "t1.`PPHONEID2`",
+    "name" : "PPHONEID2"
   }, {
     "expression" : "t1.`PPHONEID3`",
     "name" : "PPHONEID3"
@@ -47,6 +53,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD2`,\nt1.`MONEY`,\nt1.`ORGID`,\nt1.`PHONEID`,\nt1.`PHONENAME`,\nt1.`PHONETYPE`,\nt1.`PPHONEID3`,\nt1.`PPHONEID4`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_PHONE` t1 \n",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD2`,\nt1.`MONEY`,\nt1.`ORGID`,\nt1.`PHONEID`,\nt1.`PHONENAME`,\nt1.`PHONETYPE`,\nt1.`PPHONEID`,\nt1.`PPHONEID2`,\nt1.`PPHONEID3`,\nt1.`PPHONEID4`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_PHONE` t1 \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json

@@ -34,6 +34,12 @@
   }, {
     "expression" : "t1.`PHONETYPE`",
     "name" : "PHONETYPE"
+  }, {
+    "expression" : "t1.`PPHONEID`",
+    "name" : "PPHONEID"
+  }, {
+    "expression" : "t1.`PPHONEID2`",
+    "name" : "PPHONEID2"
   }, {
     "expression" : "t1.`PPHONEID3`",
     "name" : "PPHONEID3"
@@ -47,6 +53,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD`,\nt1.`FIELD2`,\nt1.`MONEY`,\nt1.`ORGID`,\nt1.`PHONEID`,\nt1.`PHONENAME`,\nt1.`PHONETYPE`,\nt1.`PPHONEID3`,\nt1.`PPHONEID4`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_PHONE` t1 \n",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`END`,\nt1.`FIELD`,\nt1.`FIELD2`,\nt1.`MONEY`,\nt1.`ORGID`,\nt1.`PHONEID`,\nt1.`PHONENAME`,\nt1.`PHONETYPE`,\nt1.`PPHONEID`,\nt1.`PPHONEID2`,\nt1.`PPHONEID3`,\nt1.`PPHONEID4`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_PHONE` t1 \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDERS/DER1N_PHONE_PHONE_PPHONEID.json

+{
+  "codeName" : "Phone",
+  "dERType" : "DER1N",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDERS/DER1N_PHONE_PHONE_PPHONEID.json",
+  "fKeyName" : "FDBADD83A5CD9BA02B",
+  "logicName" : "名称",
+  "getMajorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+  },
+  "masterOrder" : -1,
+  "masterRS" : 0,
+  "minorCodeName" : "phones",
+  "getMinorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+  },
+  "name" : "DER1N_PHONE_PHONE_PPHONEID",
+  "orderValue" : 100,
+  "getPSPickupDEField" : {
+    "name" : "PPHONEID",
+    "codeName" : "Pphoneid"
+  },
+  "pickupDEFName" : "PPHONEID",
+  "removeActionType" : -1,
+  "removeOrder" : 0,
+  "enableFKey" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDERS/DER1N_PHONE_PHONE_PPHONEID2.json

+{
+  "codeName" : "Phone2",
+  "dERType" : "DER1N",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDERS/DER1N_PHONE_PHONE_PPHONEID2.json",
+  "fKeyName" : "FBDDB46B0AC2A47132",
+  "logicName" : "名称",
+  "getMajorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+  },
+  "masterOrder" : -1,
+  "masterRS" : 0,
+  "minorCodeName" : "phones2",
+  "getMinorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+  },
+  "name" : "DER1N_PHONE_PHONE_PPHONEID2",
+  "orderValue" : 100,
+  "getPSPickupDEField" : {
+    "name" : "PPHONEID2",
+    "codeName" : "Pphoneid2"
+  },
+  "pickupDEFName" : "PPHONEID2",
+  "removeActionType" : -1,
+  "removeOrder" : 0,
+  "enableFKey" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/Phone.json

@@ -526,6 +526,30 @@
         "name" : "PPHONEID4",
         "codeName" : "Pphoneid4"
       }
+    }, {
+      "caption" : "父手机标识",
+      "name" : "PPHONEID",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      },
+      "getPSDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      }
+    }, {
+      "caption" : "父手机标识2",
+      "name" : "PPHONEID2",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      },
+      "getPSDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      }
     } ],
     "updateDataAccessAction" : "UPDATE",
     "getUpdatePSAppDEAction" : {
@@ -1109,6 +1133,84 @@
     "name" : "PPHONEID4",
     "stdDataType" : 25,
     "stringLength" : 100
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[PPHONEID][父手机标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "HIDDEN",
+        "name" : "[PPHONEID][父手机标识]移动端默认",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[PPHONEID][父手机标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "HIDDEN",
+        "name" : "[PPHONEID][父手机标识]",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "Pphoneid",
+    "logicName" : "父手机标识",
+    "name" : "PPHONEID",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[PPHONEID2][父手机标识2]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "HIDDEN",
+        "name" : "[PPHONEID2][父手机标识2]移动端默认",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[PPHONEID2][父手机标识2]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "HIDDEN",
+        "name" : "[PPHONEID2][父手机标识2]",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "Pphoneid2",
+    "logicName" : "父手机标识2",
+    "name" : "PPHONEID2",
+    "stdDataType" : 25,
+    "stringLength" : 100
   } ],
   "getAllPSAppDELogics" : [ {
     "codeName" : "PhoneNumber",
@@ -1506,6 +1608,28 @@
       "sourceType" : "DEFIELD",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "Pphoneid",
+      "logicName" : "父手机标识",
+      "name" : "Pphoneid",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
+      "codeName" : "Pphoneid2",
+      "logicName" : "父手机标识2",
+      "name" : "Pphoneid2",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "Pphoneid3",
       "logicName" : "父手机标识3",
@@ -1581,6 +1705,17 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "N_PPHONEID2_EQ",
+      "logicName" : "父手机标识2",
+      "name" : "N_PPHONEID2_EQ",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "N_PPHONEID3_EQ",
       "logicName" : "父手机标识3",
@@ -1603,6 +1738,17 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "N_PPHONEID_EQ",
+      "logicName" : "父手机标识",
+      "name" : "N_PPHONEID_EQ",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/Phone/PSMOBMDCTRLS/Mob.json

@@ -214,6 +214,20 @@
       "name" : "PPHONEID4",
       "codeName" : "Pphoneid4"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID",
+      "codeName" : "Pphoneid"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid2",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID2",
+      "codeName" : "Pphoneid2"
+    }
   } ],
   "pagingSize" : 1000,
   "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/Phone/PSMOBMDCTRLS/Usr0504984692MobMDView_MobList.json

@@ -122,6 +122,20 @@
       "name" : "PPHONEID4",
       "codeName" : "Pphoneid4"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID",
+      "codeName" : "Pphoneid"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid2",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID2",
+      "codeName" : "Pphoneid2"
+    }
   } ],
   "pagingSize" : 1000,
   "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/phoneMobListView.json

@@ -326,6 +326,20 @@
         "name" : "PPHONEID4",
         "codeName" : "Pphoneid4"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid2",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      }
     } ],
     "pagingSize" : 1000,
     "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/phoneUsr0504984692MobMDView.json

@@ -304,6 +304,20 @@
         "name" : "PPHONEID4",
         "codeName" : "Pphoneid4"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid2",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      }
     } ],
     "pagingSize" : 1000,
     "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSSYSAPP.json

@@ -3397,6 +3397,20 @@
             "name" : "PPHONEID4",
             "codeName" : "Pphoneid4"
           }
+        }, {
+          "dataType" : 25,
+          "name" : "pphoneid",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID",
+            "codeName" : "Pphoneid"
+          }
+        }, {
+          "dataType" : 25,
+          "name" : "pphoneid2",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID2",
+            "codeName" : "Pphoneid2"
+          }
         } ],
         "pagingSize" : 1000,
         "getRemovePSControlAction" : {
@@ -16939,6 +16953,30 @@
             "name" : "PPHONEID4",
             "codeName" : "Pphoneid4"
           }
+        }, {
+          "caption" : "父手机标识",
+          "name" : "PPHONEID",
+          "orderValue" : 1000,
+          "getPSAppDEField" : {
+            "name" : "PPHONEID",
+            "codeName" : "Pphoneid"
+          },
+          "getPSDEField" : {
+            "name" : "PPHONEID",
+            "codeName" : "Pphoneid"
+          }
+        }, {
+          "caption" : "父手机标识2",
+          "name" : "PPHONEID2",
+          "orderValue" : 1000,
+          "getPSAppDEField" : {
+            "name" : "PPHONEID2",
+            "codeName" : "Pphoneid2"
+          },
+          "getPSDEField" : {
+            "name" : "PPHONEID2",
+            "codeName" : "Pphoneid2"
+          }
         } ],
         "updateDataAccessAction" : "UPDATE",
         "getUpdatePSAppDEAction" : {
@@ -17522,6 +17560,84 @@
         "name" : "PPHONEID4",
         "stdDataType" : 25,
         "stringLength" : 100
+      }, {
+        "getAllPSAppDEFUIModes" : [ {
+          "codeName" : "MobileDefault",
+          "name" : "[PPHONEID][父手机标识]移动端默认",
+          "getPSDEFFormItem" : {
+            "codeName" : "MobileDefault",
+            "editorType" : "HIDDEN",
+            "name" : "[PPHONEID][父手机标识]移动端默认",
+            "getRefPSDataEntity" : {
+              "modelref" : true,
+              "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+            },
+            "stringLength" : 100,
+            "uIMode" : "MOBILEDEFAULT",
+            "mobileMode" : true
+          },
+          "type" : "MOBILEDEFAULT",
+          "mobileMode" : true
+        }, {
+          "codeName" : "Default",
+          "name" : "[PPHONEID][父手机标识]",
+          "getPSDEFFormItem" : {
+            "codeName" : "Default",
+            "editorType" : "HIDDEN",
+            "name" : "[PPHONEID][父手机标识]",
+            "getRefPSDataEntity" : {
+              "modelref" : true,
+              "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+            },
+            "stringLength" : 100,
+            "uIMode" : "DEFAULT"
+          },
+          "type" : "DEFAULT"
+        } ],
+        "codeName" : "Pphoneid",
+        "logicName" : "父手机标识",
+        "name" : "PPHONEID",
+        "stdDataType" : 25,
+        "stringLength" : 100
+      }, {
+        "getAllPSAppDEFUIModes" : [ {
+          "codeName" : "MobileDefault",
+          "name" : "[PPHONEID2][父手机标识2]移动端默认",
+          "getPSDEFFormItem" : {
+            "codeName" : "MobileDefault",
+            "editorType" : "HIDDEN",
+            "name" : "[PPHONEID2][父手机标识2]移动端默认",
+            "getRefPSDataEntity" : {
+              "modelref" : true,
+              "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+            },
+            "stringLength" : 100,
+            "uIMode" : "MOBILEDEFAULT",
+            "mobileMode" : true
+          },
+          "type" : "MOBILEDEFAULT",
+          "mobileMode" : true
+        }, {
+          "codeName" : "Default",
+          "name" : "[PPHONEID2][父手机标识2]",
+          "getPSDEFFormItem" : {
+            "codeName" : "Default",
+            "editorType" : "HIDDEN",
+            "name" : "[PPHONEID2][父手机标识2]",
+            "getRefPSDataEntity" : {
+              "modelref" : true,
+              "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+            },
+            "stringLength" : 100,
+            "uIMode" : "DEFAULT"
+          },
+          "type" : "DEFAULT"
+        } ],
+        "codeName" : "Pphoneid2",
+        "logicName" : "父手机标识2",
+        "name" : "PPHONEID2",
+        "stdDataType" : 25,
+        "stringLength" : 100
       } ],
       "getAllPSAppDELogics" : [ {
         "codeName" : "PhoneNumber",
@@ -17919,6 +18035,28 @@
           "sourceType" : "DEFIELD",
           "stdDataType" : 25,
           "type" : "SIMPLE"
+        }, {
+          "codeName" : "Pphoneid",
+          "logicName" : "父手机标识",
+          "name" : "Pphoneid",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID",
+            "codeName" : "Pphoneid"
+          },
+          "sourceType" : "DEFIELD",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
+        }, {
+          "codeName" : "Pphoneid2",
+          "logicName" : "父手机标识2",
+          "name" : "Pphoneid2",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID2",
+            "codeName" : "Pphoneid2"
+          },
+          "sourceType" : "DEFIELD",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
         }, {
           "codeName" : "Pphoneid3",
           "logicName" : "父手机标识3",
@@ -17994,6 +18132,17 @@
           "sourceType" : "DEFSEARCHMODE",
           "stdDataType" : 25,
           "type" : "SIMPLE"
+        }, {
+          "codeName" : "N_PPHONEID2_EQ",
+          "logicName" : "父手机标识2",
+          "name" : "N_PPHONEID2_EQ",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID2",
+            "codeName" : "Pphoneid2"
+          },
+          "sourceType" : "DEFSEARCHMODE",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
         }, {
           "codeName" : "N_PPHONEID3_EQ",
           "logicName" : "父手机标识3",
@@ -18016,6 +18165,17 @@
           "sourceType" : "DEFSEARCHMODE",
           "stdDataType" : 25,
           "type" : "SIMPLE"
+        }, {
+          "codeName" : "N_PPHONEID_EQ",
+          "logicName" : "父手机标识",
+          "name" : "N_PPHONEID_EQ",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID",
+            "codeName" : "Pphoneid"
+          },
+          "sourceType" : "DEFSEARCHMODE",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
         } ],
         "sourceType" : "DE",
         "type" : "DEFILTER"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Phone.json

@@ -526,6 +526,30 @@
         "name" : "PPHONEID4",
         "codeName" : "Pphoneid4"
       }
+    }, {
+      "caption" : "父手机标识",
+      "name" : "PPHONEID",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      },
+      "getPSDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      }
+    }, {
+      "caption" : "父手机标识2",
+      "name" : "PPHONEID2",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      },
+      "getPSDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      }
     } ],
     "updateDataAccessAction" : "UPDATE",
     "getUpdatePSAppDEAction" : {
@@ -1109,6 +1133,84 @@
     "name" : "PPHONEID4",
     "stdDataType" : 25,
     "stringLength" : 100
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[PPHONEID][父手机标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "HIDDEN",
+        "name" : "[PPHONEID][父手机标识]移动端默认",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[PPHONEID][父手机标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "HIDDEN",
+        "name" : "[PPHONEID][父手机标识]",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "Pphoneid",
+    "logicName" : "父手机标识",
+    "name" : "PPHONEID",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[PPHONEID2][父手机标识2]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "HIDDEN",
+        "name" : "[PPHONEID2][父手机标识2]移动端默认",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[PPHONEID2][父手机标识2]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "HIDDEN",
+        "name" : "[PPHONEID2][父手机标识2]",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "Pphoneid2",
+    "logicName" : "父手机标识2",
+    "name" : "PPHONEID2",
+    "stdDataType" : 25,
+    "stringLength" : 100
   } ],
   "getAllPSAppDELogics" : [ {
     "codeName" : "PhoneNumber",
@@ -1506,6 +1608,28 @@
       "sourceType" : "DEFIELD",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "Pphoneid",
+      "logicName" : "父手机标识",
+      "name" : "Pphoneid",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
+      "codeName" : "Pphoneid2",
+      "logicName" : "父手机标识2",
+      "name" : "Pphoneid2",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "Pphoneid3",
       "logicName" : "父手机标识3",
@@ -1581,6 +1705,17 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "N_PPHONEID2_EQ",
+      "logicName" : "父手机标识2",
+      "name" : "N_PPHONEID2_EQ",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "N_PPHONEID3_EQ",
       "logicName" : "父手机标识3",
@@ -1603,6 +1738,17 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "N_PPHONEID_EQ",
+      "logicName" : "父手机标识",
+      "name" : "N_PPHONEID_EQ",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Phone/PSGRIDS/Main.json

@@ -200,6 +200,20 @@
       "name" : "PPHONEID4",
       "codeName" : "Pphoneid4"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID",
+      "codeName" : "Pphoneid"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid2",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID2",
+      "codeName" : "Pphoneid2"
+    }
   }, {
     "dataType" : 25,
     "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Phone/PSGRIDS/Usr0301885452.json

@@ -139,6 +139,20 @@
       "name" : "PPHONEID4",
       "codeName" : "Pphoneid4"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID",
+      "codeName" : "Pphoneid"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid2",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID2",
+      "codeName" : "Pphoneid2"
+    }
   }, {
     "dataType" : 25,
     "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Phone/PSLISTS/Mob.json

@@ -174,6 +174,20 @@
       "name" : "PPHONEID4",
       "codeName" : "Pphoneid4"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID",
+      "codeName" : "Pphoneid"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid2",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID2",
+      "codeName" : "Pphoneid2"
+    }
   } ],
   "pagingSize" : 1000,
   "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/phoneGridExpView.json

@@ -364,6 +364,20 @@
           "name" : "PPHONEID4",
           "codeName" : "Pphoneid4"
         }
+      }, {
+        "dataType" : 25,
+        "name" : "pphoneid",
+        "getPSAppDEField" : {
+          "name" : "PPHONEID",
+          "codeName" : "Pphoneid"
+        }
+      }, {
+        "dataType" : 25,
+        "name" : "pphoneid2",
+        "getPSAppDEField" : {
+          "name" : "PPHONEID2",
+          "codeName" : "Pphoneid2"
+        }
       }, {
         "dataType" : 25,
         "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/phoneGridView.json

@@ -947,6 +947,20 @@
         "name" : "PPHONEID4",
         "codeName" : "Pphoneid4"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid2",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      }
     }, {
       "dataType" : 25,
       "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/phoneUsr0301714103GridExpView.json

@@ -302,6 +302,20 @@
           "name" : "PPHONEID4",
           "codeName" : "Pphoneid4"
         }
+      }, {
+        "dataType" : 25,
+        "name" : "pphoneid",
+        "getPSAppDEField" : {
+          "name" : "PPHONEID",
+          "codeName" : "Pphoneid"
+        }
+      }, {
+        "dataType" : 25,
+        "name" : "pphoneid2",
+        "getPSAppDEField" : {
+          "name" : "PPHONEID2",
+          "codeName" : "Pphoneid2"
+        }
       }, {
         "dataType" : 25,
         "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPPORTALVIEWS/AppPortalView.json

@@ -297,6 +297,20 @@
             "name" : "PPHONEID4",
             "codeName" : "Pphoneid4"
           }
+        }, {
+          "dataType" : 25,
+          "name" : "pphoneid",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID",
+            "codeName" : "Pphoneid"
+          }
+        }, {
+          "dataType" : 25,
+          "name" : "pphoneid2",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID2",
+            "codeName" : "Pphoneid2"
+          }
         } ],
         "pagingSize" : 1000,
         "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json

@@ -1943,6 +1943,20 @@
                 "name" : "PPHONEID4",
                 "codeName" : "Pphoneid4"
               }
+            }, {
+              "dataType" : 25,
+              "name" : "pphoneid",
+              "getPSAppDEField" : {
+                "name" : "PPHONEID",
+                "codeName" : "Pphoneid"
+              }
+            }, {
+              "dataType" : 25,
+              "name" : "pphoneid2",
+              "getPSAppDEField" : {
+                "name" : "PPHONEID2",
+                "codeName" : "Pphoneid2"
+              }
             } ],
             "pagingSize" : 1000,
             "getRemovePSControlAction" : {
@@ -3354,6 +3368,20 @@
             "name" : "PPHONEID4",
             "codeName" : "Pphoneid4"
           }
+        }, {
+          "dataType" : 25,
+          "name" : "pphoneid",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID",
+            "codeName" : "Pphoneid"
+          }
+        }, {
+          "dataType" : 25,
+          "name" : "pphoneid2",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID2",
+            "codeName" : "Pphoneid2"
+          }
         }, {
           "dataType" : 25,
           "name" : "srfmajortext",
@@ -4832,6 +4860,30 @@
             "name" : "PPHONEID4",
             "codeName" : "Pphoneid4"
           }
+        }, {
+          "caption" : "父手机标识",
+          "name" : "PPHONEID",
+          "orderValue" : 1000,
+          "getPSAppDEField" : {
+            "name" : "PPHONEID",
+            "codeName" : "Pphoneid"
+          },
+          "getPSDEField" : {
+            "name" : "PPHONEID",
+            "codeName" : "Pphoneid"
+          }
+        }, {
+          "caption" : "父手机标识2",
+          "name" : "PPHONEID2",
+          "orderValue" : 1000,
+          "getPSAppDEField" : {
+            "name" : "PPHONEID2",
+            "codeName" : "Pphoneid2"
+          },
+          "getPSDEField" : {
+            "name" : "PPHONEID2",
+            "codeName" : "Pphoneid2"
+          }
         } ],
         "updateDataAccessAction" : "UPDATE",
         "getUpdatePSAppDEAction" : {
@@ -5415,6 +5467,84 @@
         "name" : "PPHONEID4",
         "stdDataType" : 25,
         "stringLength" : 100
+      }, {
+        "getAllPSAppDEFUIModes" : [ {
+          "codeName" : "MobileDefault",
+          "name" : "[PPHONEID][父手机标识]移动端默认",
+          "getPSDEFFormItem" : {
+            "codeName" : "MobileDefault",
+            "editorType" : "HIDDEN",
+            "name" : "[PPHONEID][父手机标识]移动端默认",
+            "getRefPSDataEntity" : {
+              "modelref" : true,
+              "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+            },
+            "stringLength" : 100,
+            "uIMode" : "MOBILEDEFAULT",
+            "mobileMode" : true
+          },
+          "type" : "MOBILEDEFAULT",
+          "mobileMode" : true
+        }, {
+          "codeName" : "Default",
+          "name" : "[PPHONEID][父手机标识]",
+          "getPSDEFFormItem" : {
+            "codeName" : "Default",
+            "editorType" : "HIDDEN",
+            "name" : "[PPHONEID][父手机标识]",
+            "getRefPSDataEntity" : {
+              "modelref" : true,
+              "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+            },
+            "stringLength" : 100,
+            "uIMode" : "DEFAULT"
+          },
+          "type" : "DEFAULT"
+        } ],
+        "codeName" : "Pphoneid",
+        "logicName" : "父手机标识",
+        "name" : "PPHONEID",
+        "stdDataType" : 25,
+        "stringLength" : 100
+      }, {
+        "getAllPSAppDEFUIModes" : [ {
+          "codeName" : "MobileDefault",
+          "name" : "[PPHONEID2][父手机标识2]移动端默认",
+          "getPSDEFFormItem" : {
+            "codeName" : "MobileDefault",
+            "editorType" : "HIDDEN",
+            "name" : "[PPHONEID2][父手机标识2]移动端默认",
+            "getRefPSDataEntity" : {
+              "modelref" : true,
+              "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+            },
+            "stringLength" : 100,
+            "uIMode" : "MOBILEDEFAULT",
+            "mobileMode" : true
+          },
+          "type" : "MOBILEDEFAULT",
+          "mobileMode" : true
+        }, {
+          "codeName" : "Default",
+          "name" : "[PPHONEID2][父手机标识2]",
+          "getPSDEFFormItem" : {
+            "codeName" : "Default",
+            "editorType" : "HIDDEN",
+            "name" : "[PPHONEID2][父手机标识2]",
+            "getRefPSDataEntity" : {
+              "modelref" : true,
+              "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+            },
+            "stringLength" : 100,
+            "uIMode" : "DEFAULT"
+          },
+          "type" : "DEFAULT"
+        } ],
+        "codeName" : "Pphoneid2",
+        "logicName" : "父手机标识2",
+        "name" : "PPHONEID2",
+        "stdDataType" : 25,
+        "stringLength" : 100
       } ],
       "getAllPSAppDELogics" : [ {
         "codeName" : "PhoneNumber",
@@ -5812,6 +5942,28 @@
           "sourceType" : "DEFIELD",
           "stdDataType" : 25,
           "type" : "SIMPLE"
+        }, {
+          "codeName" : "Pphoneid",
+          "logicName" : "父手机标识",
+          "name" : "Pphoneid",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID",
+            "codeName" : "Pphoneid"
+          },
+          "sourceType" : "DEFIELD",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
+        }, {
+          "codeName" : "Pphoneid2",
+          "logicName" : "父手机标识2",
+          "name" : "Pphoneid2",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID2",
+            "codeName" : "Pphoneid2"
+          },
+          "sourceType" : "DEFIELD",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
         }, {
           "codeName" : "Pphoneid3",
           "logicName" : "父手机标识3",
@@ -5887,6 +6039,17 @@
           "sourceType" : "DEFSEARCHMODE",
           "stdDataType" : 25,
           "type" : "SIMPLE"
+        }, {
+          "codeName" : "N_PPHONEID2_EQ",
+          "logicName" : "父手机标识2",
+          "name" : "N_PPHONEID2_EQ",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID2",
+            "codeName" : "Pphoneid2"
+          },
+          "sourceType" : "DEFSEARCHMODE",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
         }, {
           "codeName" : "N_PPHONEID3_EQ",
           "logicName" : "父手机标识3",
@@ -5909,6 +6072,17 @@
           "sourceType" : "DEFSEARCHMODE",
           "stdDataType" : 25,
           "type" : "SIMPLE"
+        }, {
+          "codeName" : "N_PPHONEID_EQ",
+          "logicName" : "父手机标识",
+          "name" : "N_PPHONEID_EQ",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID",
+            "codeName" : "Pphoneid"
+          },
+          "sourceType" : "DEFSEARCHMODE",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
         } ],
         "sourceType" : "DE",
         "type" : "DEFILTER"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json

@@ -526,6 +526,30 @@
         "name" : "PPHONEID4",
         "codeName" : "Pphoneid4"
       }
+    }, {
+      "caption" : "父手机标识",
+      "name" : "PPHONEID",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      },
+      "getPSDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      }
+    }, {
+      "caption" : "父手机标识2",
+      "name" : "PPHONEID2",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      },
+      "getPSDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      }
     } ],
     "updateDataAccessAction" : "UPDATE",
     "getUpdatePSAppDEAction" : {
@@ -1109,6 +1133,84 @@
     "name" : "PPHONEID4",
     "stdDataType" : 25,
     "stringLength" : 100
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[PPHONEID][父手机标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "HIDDEN",
+        "name" : "[PPHONEID][父手机标识]移动端默认",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[PPHONEID][父手机标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "HIDDEN",
+        "name" : "[PPHONEID][父手机标识]",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "Pphoneid",
+    "logicName" : "父手机标识",
+    "name" : "PPHONEID",
+    "stdDataType" : 25,
+    "stringLength" : 100
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[PPHONEID2][父手机标识2]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "HIDDEN",
+        "name" : "[PPHONEID2][父手机标识2]移动端默认",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[PPHONEID2][父手机标识2]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "HIDDEN",
+        "name" : "[PPHONEID2][父手机标识2]",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "Pphoneid2",
+    "logicName" : "父手机标识2",
+    "name" : "PPHONEID2",
+    "stdDataType" : 25,
+    "stringLength" : 100
   } ],
   "getAllPSAppDELogics" : [ {
     "codeName" : "PhoneNumber",
@@ -1506,6 +1608,28 @@
       "sourceType" : "DEFIELD",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "Pphoneid",
+      "logicName" : "父手机标识",
+      "name" : "Pphoneid",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
+      "codeName" : "Pphoneid2",
+      "logicName" : "父手机标识2",
+      "name" : "Pphoneid2",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "Pphoneid3",
       "logicName" : "父手机标识3",
@@ -1581,6 +1705,17 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "N_PPHONEID2_EQ",
+      "logicName" : "父手机标识2",
+      "name" : "N_PPHONEID2_EQ",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "N_PPHONEID3_EQ",
       "logicName" : "父手机标识3",
@@ -1603,6 +1738,17 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "N_PPHONEID_EQ",
+      "logicName" : "父手机标识",
+      "name" : "N_PPHONEID_EQ",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSDASHBOARDS/Dashboard.json

@@ -608,6 +608,20 @@
             "name" : "PPHONEID4",
             "codeName" : "Pphoneid4"
           }
+        }, {
+          "dataType" : 25,
+          "name" : "pphoneid",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID",
+            "codeName" : "Pphoneid"
+          }
+        }, {
+          "dataType" : 25,
+          "name" : "pphoneid2",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID2",
+            "codeName" : "Pphoneid2"
+          }
         }, {
           "dataType" : 25,
           "name" : "srfmajortext",
@@ -1611,6 +1625,20 @@
           "name" : "PPHONEID4",
           "codeName" : "Pphoneid4"
         }
+      }, {
+        "dataType" : 25,
+        "name" : "pphoneid",
+        "getPSAppDEField" : {
+          "name" : "PPHONEID",
+          "codeName" : "Pphoneid"
+        }
+      }, {
+        "dataType" : 25,
+        "name" : "pphoneid2",
+        "getPSAppDEField" : {
+          "name" : "PPHONEID2",
+          "codeName" : "Pphoneid2"
+        }
       } ],
       "pagingSize" : 1000,
       "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSDATAVIEWS/Usr0301739228.json

@@ -134,6 +134,20 @@
       "name" : "PPHONEID4",
       "codeName" : "Pphoneid4"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID",
+      "codeName" : "Pphoneid"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid2",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID2",
+      "codeName" : "Pphoneid2"
+    }
   } ],
   "pagingSize" : 1000,
   "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSGRIDS/Main.json

@@ -234,6 +234,20 @@
       "name" : "PPHONEID4",
       "codeName" : "Pphoneid4"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID",
+      "codeName" : "Pphoneid"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid2",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID2",
+      "codeName" : "Pphoneid2"
+    }
   }, {
     "dataType" : 25,
     "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSGRIDS/Usr0301444416.json

@@ -137,6 +137,20 @@
       "name" : "PPHONEID4",
       "codeName" : "Pphoneid4"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID",
+      "codeName" : "Pphoneid"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid2",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID2",
+      "codeName" : "Pphoneid2"
+    }
   }, {
     "dataType" : 25,
     "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSGRIDS/Usr0321571980.json

@@ -137,6 +137,20 @@
       "name" : "PPHONEID4",
       "codeName" : "Pphoneid4"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID",
+      "codeName" : "Pphoneid"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid2",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID2",
+      "codeName" : "Pphoneid2"
+    }
   }, {
     "dataType" : 25,
     "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSLISTS/Mob.json

@@ -213,6 +213,20 @@
       "name" : "PPHONEID4",
       "codeName" : "Pphoneid4"
     }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID",
+      "codeName" : "Pphoneid"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "pphoneid2",
+    "getPSAppDEField" : {
+      "name" : "PPHONEID2",
+      "codeName" : "Pphoneid2"
+    }
   } ],
   "pagingSize" : 1000,
   "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneDashboardView.json

@@ -636,6 +636,20 @@
               "name" : "PPHONEID4",
               "codeName" : "Pphoneid4"
             }
+          }, {
+            "dataType" : 25,
+            "name" : "pphoneid",
+            "getPSAppDEField" : {
+              "name" : "PPHONEID",
+              "codeName" : "Pphoneid"
+            }
+          }, {
+            "dataType" : 25,
+            "name" : "pphoneid2",
+            "getPSAppDEField" : {
+              "name" : "PPHONEID2",
+              "codeName" : "Pphoneid2"
+            }
           }, {
             "dataType" : 25,
             "name" : "srfmajortext",
@@ -1639,6 +1653,20 @@
             "name" : "PPHONEID4",
             "codeName" : "Pphoneid4"
           }
+        }, {
+          "dataType" : 25,
+          "name" : "pphoneid",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID",
+            "codeName" : "Pphoneid"
+          }
+        }, {
+          "dataType" : 25,
+          "name" : "pphoneid2",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID2",
+            "codeName" : "Pphoneid2"
+          }
         } ],
         "pagingSize" : 1000,
         "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneDashboardView9.json

@@ -636,6 +636,20 @@
               "name" : "PPHONEID4",
               "codeName" : "Pphoneid4"
             }
+          }, {
+            "dataType" : 25,
+            "name" : "pphoneid",
+            "getPSAppDEField" : {
+              "name" : "PPHONEID",
+              "codeName" : "Pphoneid"
+            }
+          }, {
+            "dataType" : 25,
+            "name" : "pphoneid2",
+            "getPSAppDEField" : {
+              "name" : "PPHONEID2",
+              "codeName" : "Pphoneid2"
+            }
           }, {
             "dataType" : 25,
             "name" : "srfmajortext",
@@ -1639,6 +1653,20 @@
             "name" : "PPHONEID4",
             "codeName" : "Pphoneid4"
           }
+        }, {
+          "dataType" : 25,
+          "name" : "pphoneid",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID",
+            "codeName" : "Pphoneid"
+          }
+        }, {
+          "dataType" : 25,
+          "name" : "pphoneid2",
+          "getPSAppDEField" : {
+            "name" : "PPHONEID2",
+            "codeName" : "Pphoneid2"
+          }
         } ],
         "pagingSize" : 1000,
         "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneGridExpView.json

@@ -351,6 +351,20 @@
           "name" : "PPHONEID4",
           "codeName" : "Pphoneid4"
         }
+      }, {
+        "dataType" : 25,
+        "name" : "pphoneid",
+        "getPSAppDEField" : {
+          "name" : "PPHONEID",
+          "codeName" : "Pphoneid"
+        }
+      }, {
+        "dataType" : 25,
+        "name" : "pphoneid2",
+        "getPSAppDEField" : {
+          "name" : "PPHONEID2",
+          "codeName" : "Pphoneid2"
+        }
       }, {
         "dataType" : 25,
         "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneGridView.json

@@ -612,6 +612,20 @@
         "name" : "PPHONEID4",
         "codeName" : "Pphoneid4"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid2",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      }
     }, {
       "dataType" : 25,
       "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneListView.json

@@ -590,6 +590,20 @@
         "name" : "PPHONEID4",
         "codeName" : "Pphoneid4"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid2",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      }
     } ],
     "pagingSize" : 1000,
     "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phonePhoneView.json

@@ -410,6 +410,20 @@
         "name" : "PPHONEID4",
         "codeName" : "Pphoneid4"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid2",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      }
     }, {
       "dataType" : 25,
       "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0301269576GridView.json

@@ -328,6 +328,20 @@
         "name" : "PPHONEID4",
         "codeName" : "Pphoneid4"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid2",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      }
     }, {
       "dataType" : 25,
       "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0301495134DataViewExpView.json

@@ -268,6 +268,20 @@
           "name" : "PPHONEID4",
           "codeName" : "Pphoneid4"
         }
+      }, {
+        "dataType" : 25,
+        "name" : "pphoneid",
+        "getPSAppDEField" : {
+          "name" : "PPHONEID",
+          "codeName" : "Pphoneid"
+        }
+      }, {
+        "dataType" : 25,
+        "name" : "pphoneid2",
+        "getPSAppDEField" : {
+          "name" : "PPHONEID2",
+          "codeName" : "Pphoneid2"
+        }
       } ],
       "pagingSize" : 1000,
       "getRemovePSControlAction" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0321564959GridView.json

@@ -338,6 +338,20 @@
         "name" : "PPHONEID4",
         "codeName" : "Pphoneid4"
       }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID",
+        "codeName" : "Pphoneid"
+      }
+    }, {
+      "dataType" : 25,
+      "name" : "pphoneid2",
+      "getPSAppDEField" : {
+        "name" : "PPHONEID2",
+        "codeName" : "Pphoneid2"
+      }
     }, {
       "dataType" : 25,
       "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPPORTALVIEWS/AppPortalView.json

@@ -841,6 +841,20 @@
                 "name" : "PPHONEID4",
                 "codeName" : "Pphoneid4"
               }
+            }, {
+              "dataType" : 25,
+              "name" : "pphoneid",
+              "getPSAppDEField" : {
+                "name" : "PPHONEID",
+                "codeName" : "Pphoneid"
+              }
+            }, {
+              "dataType" : 25,
+              "name" : "pphoneid2",
+              "getPSAppDEField" : {
+                "name" : "PPHONEID2",
+                "codeName" : "Pphoneid2"
+              }
             }, {
               "dataType" : 25,
               "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -6789,6 +6789,20 @@
                     "name" : "PPHONEID4",
                     "codeName" : "Pphoneid4"
                   }
+                }, {
+                  "dataType" : 25,
+                  "name" : "pphoneid",
+                  "getPSAppDEField" : {
+                    "name" : "PPHONEID",
+                    "codeName" : "Pphoneid"
+                  }
+                }, {
+                  "dataType" : 25,
+                  "name" : "pphoneid2",
+                  "getPSAppDEField" : {
+                    "name" : "PPHONEID2",
+                    "codeName" : "Pphoneid2"
+                  }
                 }, {
                   "dataType" : 25,
                   "name" : "srfmajortext",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json

@@ -979,6 +979,20 @@
       "name" : "PHONETYPE",
       "stdDataType" : 25,
       "nullable" : true
+    }, {
+      "codeName" : "PPHONEID",
+      "length" : 100,
+      "logicName" : "父手机标识",
+      "name" : "PPHONEID",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "PPHONEID2",
+      "length" : 100,
+      "logicName" : "父手机标识2",
+      "name" : "PPHONEID2",
+      "stdDataType" : 25,
+      "nullable" : true
     }, {
       "codeName" : "PPHONEID3",
       "length" : 100,
@@ -1009,6 +1023,30 @@
       "nullable" : true
     } ],
     "getAllPSSysDBIndices" : [ {
+      "getAllPSSysDBIndexColumns" : [ {
+        "name" : "PPHONEID",
+        "getPSSysDBColumn" : {
+          "modelref" : true,
+          "id" : "PPHONEID"
+        }
+      } ],
+      "codeName" : "IF_FDBADD83A5CD9BA",
+      "indexType" : "NORMAL",
+      "name" : "DER1N_PHONE_PHONE_PPHONEID",
+      "sourceType" : "DER"
+    }, {
+      "getAllPSSysDBIndexColumns" : [ {
+        "name" : "PPHONEID2",
+        "getPSSysDBColumn" : {
+          "modelref" : true,
+          "id" : "PPHONEID2"
+        }
+      } ],
+      "codeName" : "IF_FBDDB46B0AC2A47",
+      "indexType" : "NORMAL",
+      "name" : "DER1N_PHONE_PHONE_PPHONEID2",
+      "sourceType" : "DER"
+    }, {
       "getAllPSSysDBIndexColumns" : [ {
         "name" : "PPHONEID3",
         "getPSSysDBColumn" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json

@@ -2031,6 +2031,32 @@
       "enableModify" : true,
       "keyField" : false,
       "majorField" : false
+    }, {
+      "codeName" : "Pphoneid",
+      "codeName2" : "Pphoneid",
+      "logicName" : "父手机标识",
+      "name" : "PPHONEID",
+      "orderValue" : 1000,
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "allowEmpty" : true,
+      "enableCreate" : true,
+      "enableModify" : true,
+      "keyField" : false,
+      "majorField" : false
+    }, {
+      "codeName" : "Pphoneid2",
+      "codeName2" : "Pphoneid2",
+      "logicName" : "父手机标识2",
+      "name" : "PPHONEID2",
+      "orderValue" : 1000,
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "allowEmpty" : true,
+      "enableCreate" : true,
+      "enableModify" : true,
+      "keyField" : false,
+      "majorField" : false
     } ],
     "getPSDEServiceAPIMethods" : [ {
       "dataAccessAction" : "CREATE",