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

app_Web/swarm.yaml

@@ -3,7 +3,7 @@ services:
   trainsys-app-web:
     image: dstimage
     ports:
-      - "50100:80"
+      - "80:80"
     networks:
       - agent_network
     environment:

config.xml

@@ -55,15 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
-      if [ -e app_Web/.dynamic ]
-      then
-          cd app_Web
-      else
-          cd app_Web/app
-      fi
-      sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.07.29.003#g" swarm.yaml
-      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth    
       </command>
     </hudson.tasks.Shell>
   </builders>

trainsys-core/src/main/resources/liquibase/cn/ibizlab/trainsys/DEFAULT/h2_table.xml

@@ -156,6 +156,31 @@
         </createTable>
     </changeSet>
 
+    <!--输出实体[T_PRINT]数据结构 -->
+    <changeSet author="root" id="T_PRINT">
+        <createTable tableName="T_PRINT" remarks="PRINT">
+            <column name="CREATEDATE" remarks="建立时间" type="DATETIME">
+            </column>
+            <column name="CREATEMAN" remarks="建立人" type="VARCHAR(60)">
+            </column>
+            <column name="DEPTID" remarks="组织部门标识" type="VARCHAR(60)">
+            </column>
+            <column name="ORGID" remarks="组织机构标识" type="VARCHAR(60)">
+            </column>
+            <column name="PRINTID" remarks="PRINT标识" type="VARCHAR(100)">
+                <constraints primaryKey="true" primaryKeyName="PK_T_PRINT_PRINTID"/>
+            </column>
+            <column name="PRINTNAME" remarks="PRINT名称" type="VARCHAR(200)">
+            </column>
+            <column name="STUNO" remarks="PRINTMODEL" type="VARCHAR(100)">
+            </column>
+            <column name="UPDATEDATE" remarks="更新时间" type="DATETIME">
+            </column>
+            <column name="UPDATEMAN" remarks="更新人" type="VARCHAR(60)">
+            </column>
+        </createTable>
+    </changeSet>
+
     <!--输出实体[T_RAWMATERIAL]数据结构 -->
     <changeSet author="root" id="T_RAWMATERIAL">
         <createTable tableName="T_RAWMATERIAL" remarks="原材料">

trainsys-core/src/main/resources/liquibase/h2_table.xml

@@ -131,40 +131,40 @@
         </createTable>
     </changeSet>
 
-    <!--输出实体[PHONE]数据结构 -->
-    <changeSet author="root" id="tab-phone-45-5">
-        <createTable tableName="T_PHONE">
-                <column name="PHONEID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_PHONE"/>
+    <!--输出实体[PRINT]数据结构 -->
+    <changeSet author="root" id="tab-print-15-5">
+        <createTable tableName="T_PRINT">
+                <column name="PRINTNAME" remarks="" type="VARCHAR(200)">
                 </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
+                <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
-                <column name="PHONENAME" remarks="" type="VARCHAR(200)">
+                <column name="PRINTID" remarks="" type="VARCHAR(100)">
+                    <constraints primaryKey="true" primaryKeyName="PK_PRINT"/>
                 </column>
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>
-                <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
-                </column>
-                <column name="DEPTID" remarks="" type="VARCHAR(60)">
+                <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
                 <column name="ORGID" remarks="" type="VARCHAR(60)">
                 </column>
-                <column name="PHONETYPE" remarks="" type="VARCHAR(100)">
+                <column name="DEPTID" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="STUNO" remarks="" type="VARCHAR(100)">
                 </column>
         </createTable>
     </changeSet>
 
-    <!--输出实体[RAWMATERIAL]数据结构 -->
-    <changeSet author="root" id="tab-rawmaterial-25-6">
-        <createTable tableName="T_RAWMATERIAL">
-                <column name="RAWMATERIALID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_RAWMATERIAL"/>
+    <!--输出实体[PHONE]数据结构 -->
+    <changeSet author="root" id="tab-phone-45-6">
+        <createTable tableName="T_PHONE">
+                <column name="PHONEID" remarks="" type="VARCHAR(100)">
+                    <constraints primaryKey="true" primaryKeyName="PK_PHONE"/>
                 </column>
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
-                <column name="RAWMATERIALNAME" remarks="" type="VARCHAR(200)">
+                <column name="PHONENAME" remarks="" type="VARCHAR(200)">
                 </column>
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -172,11 +172,17 @@
                 </column>
                 <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
+                <column name="DEPTID" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="ORGID" remarks="" type="VARCHAR(60)">
+                </column>
+                <column name="PHONETYPE" remarks="" type="VARCHAR(100)">
+                </column>
         </createTable>
     </changeSet>
 
     <!--输出实体[REGINFO]数据结构 -->
-    <changeSet author="root" id="tab-reginfo-36-7">
+    <changeSet author="root" id="tab-reginfo-36-8">
         <createTable tableName="T_REGINFO">
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -211,7 +217,7 @@
     </changeSet>
 
     <!--输出实体[REGINFOF]数据结构 -->
-    <changeSet author="root" id="tab-reginfof-26-8">
+    <changeSet author="root" id="tab-reginfof-28-9">
         <createTable tableName="T_REGINFOF">
                 <column name="REGINFOFID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_REGINFOF"/>
@@ -244,7 +250,7 @@
     </changeSet>
 
     <!--输出实体[STUDENT]数据结构 -->
-    <changeSet author="root" id="tab-student-28-9">
+    <changeSet author="root" id="tab-student-28-10">
         <createTable tableName="T_STUDENT">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -278,7 +284,7 @@
 
 
     <!--输出实体[BXDMX]外键关系 -->
-    <changeSet author="root" id="fk-bxdmx-31-10">
+    <changeSet author="root" id="fk-bxdmx-31-11">
        <addForeignKeyConstraint baseColumnNames="BXDID" baseTableName="T_BXDMX" constraintName="F821DB7B87E31B879F" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BXDID" referencedTableName="T_BXD" validate="true"/>
     </changeSet>
 

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common.json

@@ -21,6 +21,9 @@
   }, {
     "modelref" : true,
     "path" : "PSMODULES/common/PSDATAENTITIES/BookType.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/PRINT.json"
   }, {
     "modelref" : true,
     "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/CheckKey.json

+{
+  "actionMode" : "CHECKKEY",
+  "actionType" : "BUILTIN",
+  "codeName" : "CheckKey",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/CheckKey.json",
+  "logicName" : "CheckKey",
+  "name" : "CheckKey",
+  "getPSDEActionInput" : {
+    "name" : "CheckKeyInput",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "PRINTDTO"
+    },
+    "type" : "DTO"
+  },
+  "getPSDEActionReturn" : {
+    "name" : "CheckKeyResult",
+    "stdDataType" : 9,
+    "type" : "SIMPLE"
+  },
+  "builtinAction" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/Create.json

+{
+  "actionMode" : "CREATE",
+  "actionType" : "BUILTIN",
+  "codeName" : "Create",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/Create.json",
+  "logicName" : "Create",
+  "name" : "Create",
+  "orderValue" : 1,
+  "getPSDEActionInput" : {
+    "name" : "CreateInput",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "PRINTDTO"
+    },
+    "type" : "DTO",
+    "output" : true
+  },
+  "getPSDEActionReturn" : {
+    "name" : "CreateResult",
+    "type" : "VOID"
+  },
+  "builtinAction" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/Get.json

+{
+  "actionMode" : "READ",
+  "actionType" : "BUILTIN",
+  "codeName" : "Get",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/Get.json",
+  "logicName" : "Get",
+  "name" : "Get",
+  "orderValue" : 31,
+  "getPSDEActionInput" : {
+    "getKeyPSDEField" : {
+      "name" : "PRINTID",
+      "codeName" : "PRINTId"
+    },
+    "name" : "GetInput",
+    "type" : "KEYFIELD"
+  },
+  "getPSDEActionReturn" : {
+    "name" : "GetResult",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "PRINTDTO"
+    },
+    "type" : "DTO"
+  },
+  "builtinAction" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/GetDraft.json

+{
+  "actionMode" : "GETDRAFT",
+  "actionType" : "BUILTIN",
+  "codeName" : "GetDraft",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/GetDraft.json",
+  "logicName" : "GetDraft",
+  "name" : "GetDraft",
+  "orderValue" : 41,
+  "getPSDEActionInput" : {
+    "name" : "GetDraftInput",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "PRINTDTO"
+    },
+    "type" : "DTO"
+  },
+  "getPSDEActionReturn" : {
+    "name" : "GetDraftResult",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "PRINTDTO"
+    },
+    "type" : "DTO"
+  },
+  "builtinAction" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/Remove.json

+{
+  "actionMode" : "DELETE",
+  "actionType" : "BUILTIN",
+  "batchActionMode" : 1,
+  "codeName" : "Remove",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/Remove.json",
+  "logicName" : "Remove",
+  "name" : "Remove",
+  "orderValue" : 21,
+  "getPSDEActionInput" : {
+    "getKeyPSDEField" : {
+      "name" : "PRINTID",
+      "codeName" : "PRINTId"
+    },
+    "name" : "RemoveInput",
+    "type" : "KEYFIELDS"
+  },
+  "getPSDEActionReturn" : {
+    "name" : "RemoveResult",
+    "type" : "VOID"
+  },
+  "batchAction" : true,
+  "builtinAction" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/Save.json

+{
+  "actionMode" : "UNKNOWN",
+  "actionType" : "BUILTIN",
+  "codeName" : "Save",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/Save.json",
+  "logicName" : "Save",
+  "name" : "Save",
+  "getPSDEActionInput" : {
+    "name" : "SaveInput",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "PRINTDTO"
+    },
+    "type" : "DTO"
+  },
+  "getPSDEActionReturn" : {
+    "name" : "SaveResult",
+    "type" : "VOID"
+  },
+  "builtinAction" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/Update.json

+{
+  "actionMode" : "UPDATE",
+  "actionType" : "BUILTIN",
+  "codeName" : "Update",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/Update.json",
+  "logicName" : "Update",
+  "name" : "Update",
+  "orderValue" : 11,
+  "getPSDEActionInput" : {
+    "name" : "UpdateInput",
+    "getPSDEMethodDTO" : {
+      "modelref" : true,
+      "id" : "PRINTDTO"
+    },
+    "type" : "DTO",
+    "output" : true
+  },
+  "getPSDEActionReturn" : {
+    "name" : "UpdateResult",
+    "type" : "VOID"
+  },
+  "builtinAction" : true
+}
\ No newline at end of file

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

+{
+  "dBType" : "MYSQL5",
+  "name" : "MySQL5",
+  "getPSDEDataQueryCodeExps" : [ {
+    "expression" : "t1.`CREATEDATE`",
+    "name" : "CREATEDATE"
+  }, {
+    "expression" : "t1.`CREATEMAN`",
+    "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`DEPTID`",
+    "name" : "DEPTID"
+  }, {
+    "expression" : "t1.`ORGID`",
+    "name" : "ORGID"
+  }, {
+    "expression" : "t1.`PRINTID`",
+    "name" : "PRINTID"
+  }, {
+    "expression" : "t1.`PRINTNAME`",
+    "name" : "PRINTNAME"
+  }, {
+    "expression" : "t1.`STUNO`",
+    "name" : "STUNO"
+  }, {
+    "expression" : "t1.`UPDATEDATE`",
+    "name" : "UPDATEDATE"
+  }, {
+    "expression" : "t1.`UPDATEMAN`",
+    "name" : "UPDATEMAN"
+  } ],
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`ORGID`,\nt1.`PRINTID`,\nt1.`PRINTNAME`,\nt1.`STUNO`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_PRINT` t1 \n",
+  "id" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
+}
\ No newline at end of file

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

+{
+  "dBType" : "MYSQL5",
+  "name" : "MySQL5",
+  "getPSDEDataQueryCodeExps" : [ {
+    "expression" : "t1.`STUNO`",
+    "name" : "STUNO"
+  }, {
+    "expression" : "t1.`CREATEDATE`",
+    "name" : "CREATEDATE"
+  }, {
+    "expression" : "t1.`CREATEMAN`",
+    "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`DEPTID`",
+    "name" : "DEPTID"
+  }, {
+    "expression" : "t1.`ORGID`",
+    "name" : "ORGID"
+  }, {
+    "expression" : "t1.`PRINTID`",
+    "name" : "PRINTID"
+  }, {
+    "expression" : "t1.`PRINTNAME`",
+    "name" : "PRINTNAME"
+  }, {
+    "expression" : "t1.`UPDATEDATE`",
+    "name" : "UPDATEDATE"
+  }, {
+    "expression" : "t1.`UPDATEMAN`",
+    "name" : "UPDATEMAN"
+  } ],
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`ORGID`,\nt1.`PRINTID`,\nt1.`PRINTNAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_PRINT` t1 \n",
+  "id" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEDATAQUERIES/Simple/PSDEDQCODES/MYSQL5.json"
+}
\ No newline at end of file

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

+{
+  "dBType" : "MYSQL5",
+  "name" : "MySQL5",
+  "getPSDEDataQueryCodeExps" : [ {
+    "expression" : "t1.`CREATEDATE`",
+    "name" : "CREATEDATE"
+  }, {
+    "expression" : "t1.`CREATEMAN`",
+    "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`DEPTID`",
+    "name" : "DEPTID"
+  }, {
+    "expression" : "t1.`ORGID`",
+    "name" : "ORGID"
+  }, {
+    "expression" : "t1.`PRINTID`",
+    "name" : "PRINTID"
+  }, {
+    "expression" : "t1.`PRINTNAME`",
+    "name" : "PRINTNAME"
+  }, {
+    "expression" : "t1.`STUNO`",
+    "name" : "STUNO"
+  }, {
+    "expression" : "t1.`UPDATEDATE`",
+    "name" : "UPDATEDATE"
+  }, {
+    "expression" : "t1.`UPDATEMAN`",
+    "name" : "UPDATEMAN"
+  } ],
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPTID`,\nt1.`ORGID`,\nt1.`PRINTID`,\nt1.`PRINTNAME`,\nt1.`STUNO`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_PRINT` t1 \n",
+  "id" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/PRINT/PSDEUSERROLES/ALL_R.json

+{
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEUSERROLES/ALL_R.json",
+  "name" : "全部数据（读）",
+  "getPSDEUserRoleOPPrivs" : [ {
+    "dataAccessAction" : "READ",
+    "name" : "READ",
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "READ"
+    }
+  } ],
+  "roleTag" : "ALL_R",
+  "userDRAction" : "READ",
+  "allData" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/PRINT/PSDEUSERROLES/ALL_RW.json

+{
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEUSERROLES/ALL_RW.json",
+  "name" : "全部数据（读写）",
+  "getPSDEUserRoleOPPrivs" : [ {
+    "dataAccessAction" : "CREATE",
+    "name" : "CREATE",
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "CREATE"
+    }
+  }, {
+    "dataAccessAction" : "UPDATE",
+    "name" : "UPDATE",
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "UPDATE"
+    }
+  }, {
+    "dataAccessAction" : "DELETE",
+    "name" : "DELETE",
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "DELETE"
+    }
+  }, {
+    "dataAccessAction" : "READ",
+    "name" : "READ",
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "READ"
+    }
+  } ],
+  "roleTag" : "ALL_RW",
+  "userDRAction" : "READ",
+  "allData" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/PRINT/PSDEUSERROLES/CURDEPT_R.json

+{
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEUSERROLES/CURDEPT_R.json",
+  "name" : "当前部门（读）",
+  "getPSDEUserRoleOPPrivs" : [ {
+    "dataAccessAction" : "READ",
+    "name" : "READ",
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "READ"
+    }
+  } ],
+  "roleTag" : "CURDEPT_R",
+  "secDR" : 1,
+  "userDRAction" : "READ",
+  "enableSecDR" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/PRINT/PSDEUSERROLES/CURDEPT_RW.json

+{
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEUSERROLES/CURDEPT_RW.json",
+  "name" : "当前部门（读写）",
+  "getPSDEUserRoleOPPrivs" : [ {
+    "dataAccessAction" : "DELETE",
+    "name" : "DELETE",
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "DELETE"
+    }
+  }, {
+    "dataAccessAction" : "READ",
+    "name" : "READ",
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "READ"
+    }
+  }, {
+    "dataAccessAction" : "UPDATE",
+    "name" : "UPDATE",
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "UPDATE"
+    }
+  }, {
+    "dataAccessAction" : "CREATE",
+    "name" : "CREATE",
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "CREATE"
+    }
+  } ],
+  "roleTag" : "CURDEPT_RW",
+  "secDR" : 1,
+  "userDRAction" : "READ",
+  "enableSecDR" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/PRINT/PSDEUSERROLES/CURORG_R.json

+{
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEUSERROLES/CURORG_R.json",
+  "name" : "当前组织（读）",
+  "orgDR" : 1,
+  "getPSDEUserRoleOPPrivs" : [ {
+    "dataAccessAction" : "READ",
+    "name" : "READ",
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "READ"
+    }
+  } ],
+  "roleTag" : "CURORG_R",
+  "userDRAction" : "READ",
+  "enableOrgDR" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/PRINT/PSDEUSERROLES/CURORG_RW.json

+{
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEUSERROLES/CURORG_RW.json",
+  "name" : "当前组织（读写）",
+  "orgDR" : 1,
+  "getPSDEUserRoleOPPrivs" : [ {
+    "dataAccessAction" : "READ",
+    "name" : "READ",
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "READ"
+    }
+  }, {
+    "dataAccessAction" : "DELETE",
+    "name" : "DELETE",
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "DELETE"
+    }
+  }, {
+    "dataAccessAction" : "CREATE",
+    "name" : "CREATE",
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "CREATE"
+    }
+  }, {
+    "dataAccessAction" : "UPDATE",
+    "name" : "UPDATE",
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "UPDATE"
+    }
+  } ],
+  "roleTag" : "CURORG_RW",
+  "userDRAction" : "READ",
+  "enableOrgDR" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/RawMaterial.json

@@ -174,14 +174,6 @@
     },
     "builtinAction" : true
   } ],
-  "getAllPSDEDBConfigs" : [ {
-    "dBType" : "MYSQL5",
-    "name" : "MYSQL5",
-    "objNameCase" : "DEFAULT",
-    "standardTableName" : "`T_RAWMATERIAL`",
-    "tableName" : "T_RAWMATERIAL",
-    "valid" : true
-  } ],
   "getAllPSDEDBTables" : [ {
     "getAllPSDEFields" : [ {
       "name" : "RAWMATERIALID",

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

+{
+  "codeName" : "Main",
+  "controlType" : "FORM",
+  "getCreatePSControlAction" : {
+    "modelref" : true,
+    "id" : "create"
+  },
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/PRINT/PSFORMS/Main.json",
+  "getGetDraftFromPSControlAction" : {
+    "modelref" : true,
+    "id" : "loaddraftfrom"
+  },
+  "getGetDraftPSControlAction" : {
+    "modelref" : true,
+    "id" : "loaddraft"
+  },
+  "getGetPSControlAction" : {
+    "modelref" : true,
+    "id" : "load"
+  },
+  "hookEventNames" : [ "LOAD", "SAVE", "REMOVE" ],
+  "logicName" : "主编辑表单",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/PRINT.json"
+  },
+  "getPSControlLogics" : [ {
+    "eventNames" : "LOAD;SAVE;REMOVE",
+    "logicTag" : "form",
+    "logicType" : "APPVIEWENGINE",
+    "name" : "engine_form",
+    "getPSAppViewEngine" : {
+      "modelref" : true,
+      "id" : "engine"
+    }
+  } ],
+  "getPSDEFormItems" : [ {
+    "id" : "srfupdatedate",
+    "hidden" : true,
+    "dataType" : 5,
+    "getPSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    }
+  }, {
+    "id" : "srforikey",
+    "hidden" : true,
+    "dataType" : 25
+  }, {
+    "id" : "srfkey",
+    "hidden" : true,
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "PRINTID",
+      "codeName" : "PRINTId"
+    }
+  }, {
+    "id" : "srfmajortext",
+    "hidden" : true,
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "PRINTNAME",
+      "codeName" : "PRINTName"
+    }
+  }, {
+    "id" : "srftempmode",
+    "hidden" : true,
+    "dataType" : 25
+  }, {
+    "id" : "srfuf",
+    "hidden" : true,
+    "dataType" : 25
+  }, {
+    "id" : "srfdeid",
+    "hidden" : true,
+    "dataType" : 25
+  }, {
+    "id" : "srfsourcekey",
+    "hidden" : true,
+    "dataType" : 25
+  }, {
+    "id" : "printname",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "PRINTNAME",
+      "codeName" : "PRINTName"
+    }
+  }, {
+    "id" : "createman",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "CREATEMAN",
+      "codeName" : "CreateMan"
+    }
+  }, {
+    "id" : "createdate",
+    "dataType" : 5,
+    "getPSAppDEField" : {
+      "name" : "CREATEDATE",
+      "codeName" : "CreateDate"
+    }
+  }, {
+    "id" : "updateman",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "UPDATEMAN",
+      "codeName" : "UpdateMan"
+    }
+  }, {
+    "id" : "updatedate",
+    "dataType" : 5,
+    "getPSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    }
+  }, {
+    "id" : "printid",
+    "hidden" : true,
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "PRINTID",
+      "codeName" : "PRINTId"
+    }
+  } ],
+  "getPSDEFormPages" : [ {
+    "caption" : "基本信息",
+    "codeName" : "formpage1",
+    "detailStyle" : "DEFAULT",
+    "detailType" : "FORMPAGE",
+    "name" : "formpage1",
+    "getPSDEFormDetails" : [ {
+      "actionGroupExtractMode" : "ITEM",
+      "caption" : "PRINT基本信息",
+      "codeName" : "group1",
+      "detailStyle" : "DEFAULT",
+      "detailType" : "GROUPPANEL",
+      "name" : "group1",
+      "getPSDEFormDetails" : [ {
+        "caption" : "PRINT名称",
+        "codeName" : "printname",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "printname",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "PRINTNAME",
+          "codeName" : "PRINTName"
+        },
+        "getPSEditor" : {
+          "editorType" : "TEXTBOX",
+          "maxLength" : 200,
+          "name" : "printname"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      } ],
+      "getPSLayout" : {
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "infoGroupMode" : false,
+      "showCaption" : true
+    } ],
+    "getPSLayout" : {
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "infoGroupMode" : false
+  }, {
+    "caption" : "其它",
+    "codeName" : "formpage2",
+    "detailStyle" : "DEFAULT",
+    "detailType" : "FORMPAGE",
+    "name" : "formpage2",
+    "getPSDEFormDetails" : [ {
+      "actionGroupExtractMode" : "ITEM",
+      "caption" : "操作信息",
+      "codeName" : "group2",
+      "detailStyle" : "DEFAULT",
+      "detailType" : "GROUPPANEL",
+      "name" : "group2",
+      "getPSDEFormDetails" : [ {
+        "caption" : "建立人",
+        "codeName" : "createman",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 3,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "createman",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "CREATEMAN",
+          "codeName" : "CreateMan"
+        },
+        "getPSEditor" : {
+          "editorType" : "SPAN",
+          "name" : "createman",
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+          },
+          "enableLinkView" : false
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "convertToCodeItemText" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "建立时间",
+        "codeName" : "createdate",
+        "dataType" : 5,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 3,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "createdate",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "CREATEDATE",
+          "codeName" : "CreateDate"
+        },
+        "getPSEditor" : {
+          "editorType" : "SPAN",
+          "name" : "createdate",
+          "enableLinkView" : false
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "更新人",
+        "codeName" : "updateman",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 3,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "updateman",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "UPDATEMAN",
+          "codeName" : "UpdateMan"
+        },
+        "getPSEditor" : {
+          "editorType" : "SPAN",
+          "name" : "updateman",
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+          },
+          "enableLinkView" : false
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "convertToCodeItemText" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "更新时间",
+        "codeName" : "updatedate",
+        "dataType" : 5,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 3,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "updatedate",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "UPDATEDATE",
+          "codeName" : "UpdateDate"
+        },
+        "getPSEditor" : {
+          "editorType" : "SPAN",
+          "name" : "updatedate",
+          "enableLinkView" : false
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+        "allowEmpty" : true,
+        "showCaption" : true
+      } ],
+      "getPSLayout" : {
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "infoGroupMode" : false,
+      "showCaption" : true
+    } ],
+    "getPSLayout" : {
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "infoGroupMode" : false
+  } ],
+  "getPSLayout" : {
+    "columnCount" : 24,
+    "layout" : "TABLE_24COL"
+  },
+  "getRemovePSControlAction" : {
+    "modelref" : true,
+    "id" : "remove"
+  },
+  "tabHeaderPos" : "TOP",
+  "getUpdatePSControlAction" : {
+    "modelref" : true,
+    "id" : "update"
+  },
+  "noTabHeader" : false,
+  "modelid" : "f235e1ee47446a0cd00e240d47ca0fd1",
+  "modeltype" : "PSDEFORM_EDITFORM"
+}
\ No newline at end of file

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

+{
+  "aggMode" : "NONE",
+  "codeName" : "Main",
+  "columnEnableLink" : 2,
+  "controlType" : "GRID",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/PRINT/PSGRIDS/Main.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch"
+  },
+  "groupMode" : "NONE",
+  "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
+  "logicName" : "主表格",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/PRINT.json"
+  },
+  "getPSControlLogics" : [ {
+    "eventNames" : "ROWDBLCLICK;SELECTIONCHANGE;REMOVE;LOAD;BEFORELOAD",
+    "logicTag" : "grid",
+    "logicType" : "APPVIEWENGINE",
+    "name" : "engine_grid",
+    "getPSAppViewEngine" : {
+      "modelref" : true,
+      "id" : "engine"
+    }
+  } ],
+  "getPSDEGridColumns" : [ {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "PRINT名称",
+    "codeName" : "printname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "printname",
+    "excelCaption" : "PRINT名称",
+    "name" : "printname",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "PRINTNAME",
+      "codeName" : "PRINTName"
+    },
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "FRONT",
+    "caption" : "更新人",
+    "codeName" : "updateman",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "updateman",
+    "excelCaption" : "更新人",
+    "name" : "updateman",
+    "noPrivDisplayMode" : 1,
+    "getPSAppCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+    },
+    "getPSAppDEField" : {
+      "name" : "UPDATEMAN",
+      "codeName" : "UpdateMan"
+    },
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "更新时间",
+    "codeName" : "updatedate",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "updatedate",
+    "excelCaption" : "更新时间",
+    "name" : "updatedate",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    },
+    "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  } ],
+  "getPSDEGridDataItems" : [ {
+    "dataType" : 25,
+    "name" : "printname",
+    "getPSAppDEField" : {
+      "name" : "PRINTNAME",
+      "codeName" : "PRINTName"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "updateman",
+    "getPSAppDEField" : {
+      "name" : "UPDATEMAN",
+      "codeName" : "UpdateMan"
+    }
+  }, {
+    "format" : "YYYY-MM-DD HH:mm:ss",
+    "dataType" : 5,
+    "name" : "updatedate",
+    "getPSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "PRINTID",
+      "codeName" : "PRINTId"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfdataaccaction",
+    "getPSAppDEField" : {
+      "name" : "PRINTID",
+      "codeName" : "PRINTId"
+    },
+    "dataAccessAction" : true
+  }, {
+    "dataType" : 25,
+    "name" : "srfmajortext",
+    "getPSAppDEField" : {
+      "name" : "PRINTNAME",
+      "codeName" : "PRINTName"
+    }
+  } ],
+  "getPSDEGridEditItems" : [ {
+    "caption" : "PRINT标识",
+    "codeName" : "srfkey",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "PRINTID",
+      "codeName" : "PRINTId"
+    },
+    "getPSEditor" : {
+      "editorType" : "HIDDEN",
+      "name" : "srfkey"
+    },
+    "allowEmpty" : true
+  } ],
+  "pagingSize" : 20,
+  "getRemovePSControlAction" : {
+    "actionName" : "Remove",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "DELETE",
+    "name" : "remove",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Remove"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/PRINT.json"
+    }
+  },
+  "sortMode" : "REMOTE",
+  "hasWFDataItems" : false,
+  "enableColFilter" : false,
+  "enableCustomized" : true,
+  "enableGroup" : false,
+  "enablePagingBar" : true,
+  "enableRowEdit" : false,
+  "enableRowEditOrder" : false,
+  "enableRowNew" : false,
+  "forceFit" : false,
+  "hideHeader" : false,
+  "noSort" : false,
+  "singleSelect" : false,
+  "modelid" : "2f820393ff7ef48f8f0dcdc208852443",
+  "modeltype" : "PSDEGRID"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/PRINT/PSSEARCHFORMS/Default.json

+{
+  "codeName" : "Default",
+  "controlType" : "SEARCHFORM",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/PRINT/PSSEARCHFORMS/Default.json",
+  "hookEventNames" : [ "SEARCH", "LOAD", "SAVE" ],
+  "logicName" : "默认搜索表单",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/PRINT.json"
+  },
+  "getPSControlLogics" : [ {
+    "eventNames" : "SEARCH;LOAD;SAVE",
+    "logicTag" : "searchform",
+    "logicType" : "APPVIEWENGINE",
+    "name" : "engine_searchform",
+    "getPSAppViewEngine" : {
+      "modelref" : true,
+      "id" : "engine"
+    }
+  } ],
+  "getPSDEFormPages" : [ {
+    "caption" : "常规条件",
+    "codeName" : "formpage1",
+    "detailStyle" : "DEFAULT",
+    "detailType" : "FORMPAGE",
+    "name" : "formpage1",
+    "getPSLayout" : {
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "infoGroupMode" : false
+  } ],
+  "getPSLayout" : {
+    "columnCount" : 24,
+    "layout" : "TABLE_24COL"
+  },
+  "searchButtonStyle" : "DEFAULT",
+  "tabHeaderPos" : "TOP",
+  "enableAdvanceSearch" : false,
+  "enableAutoSearch" : false,
+  "enableFilterSave" : false,
+  "noTabHeader" : true,
+  "modelid" : "b537f379011eecaa731c80f3949d3c54",
+  "modeltype" : "PSDEFORM_SEARCHFORM"
+}
\ No newline at end of file

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

@@ -85,6 +85,20 @@
       "name" : "REGINFOFNAME",
       "codeName" : "ReginfofName"
     }
+  }, {
+    "id" : "age11",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "AGE",
+      "codeName" : "Age"
+    }
+  }, {
+    "id" : "age10",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "AGE",
+      "codeName" : "Age"
+    }
   }, {
     "id" : "createman",
     "dataType" : 25,
@@ -173,6 +187,60 @@
       },
       "infoGroupMode" : false,
       "showCaption" : true
+    }, {
+      "caption" : "年龄",
+      "codeName" : "age11",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 4,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "age11",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "AGE",
+        "codeName" : "Age"
+      },
+      "getPSEditor" : {
+        "editorType" : "TEXTBOX",
+        "maxLength" : 100,
+        "name" : "age11"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "allowEmpty" : true,
+      "showCaption" : true
+    }, {
+      "caption" : "年龄",
+      "codeName" : "age10",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "age10",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "AGE",
+        "codeName" : "Age"
+      },
+      "getPSEditor" : {
+        "editorType" : "TEXTBOX",
+        "maxLength" : 100,
+        "name" : "age10"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "allowEmpty" : true,
+      "showCaption" : true
     } ],
     "getPSLayout" : {
       "columnCount" : 24,

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

@@ -1071,6 +1071,20 @@
         "name" : "REGINFOFNAME",
         "codeName" : "ReginfofName"
       }
+    }, {
+      "id" : "age11",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "AGE",
+        "codeName" : "Age"
+      }
+    }, {
+      "id" : "age10",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "AGE",
+        "codeName" : "Age"
+      }
     }, {
       "id" : "createman",
       "dataType" : 25,
@@ -1159,6 +1173,60 @@
         },
         "infoGroupMode" : false,
         "showCaption" : true
+      }, {
+        "caption" : "年龄",
+        "codeName" : "age11",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 4,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "age11",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "AGE",
+          "codeName" : "Age"
+        },
+        "getPSEditor" : {
+          "editorType" : "TEXTBOX",
+          "maxLength" : 100,
+          "name" : "age11"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      }, {
+        "caption" : "年龄",
+        "codeName" : "age10",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "age10",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "AGE",
+          "codeName" : "Age"
+        },
+        "getPSEditor" : {
+          "editorType" : "TEXTBOX",
+          "maxLength" : 100,
+          "name" : "age10"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
       } ],
       "getPSLayout" : {
         "columnCount" : 24,

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

@@ -800,6 +800,11 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json",
     "name" : "BXD",
     "codeName" : "BXD"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/PRINT.json",
+    "name" : "PRINT",
+    "codeName" : "PRINT"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json",
@@ -946,6 +951,12 @@
     "viewType" : "DEEDITVIEW",
     "resource" : "Book",
     "view" : "BookEditViewEditorTest"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/PRINTEditView.json",
+    "viewType" : "DEEDITVIEW",
+    "resource" : "PRINT",
+    "view" : "EditView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView3.json",
@@ -1041,6 +1052,12 @@
     "viewType" : "DEOPTVIEW",
     "resource" : "Book",
     "view" : "OptionView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/PRINTUsr2GridView.json",
+    "viewType" : "DEGRIDVIEW",
+    "resource" : "PRINT",
+    "view" : "Usr2GridView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDGridView.json",

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

@@ -465,6 +465,76 @@
     "name" : "T_PHONE",
     "autoExtendModel" : true,
     "existingModel" : false
+  }, {
+    "getAllPSSysDBColumns" : [ {
+      "codeName" : "CREATEDATE",
+      "length" : 8,
+      "logicName" : "建立时间",
+      "name" : "CREATEDATE",
+      "stdDataType" : 5,
+      "nullable" : true
+    }, {
+      "codeName" : "CREATEMAN",
+      "length" : 60,
+      "logicName" : "建立人",
+      "name" : "CREATEMAN",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "DEPTID",
+      "length" : 60,
+      "logicName" : "组织部门标识",
+      "name" : "DEPTID",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "ORGID",
+      "length" : 60,
+      "logicName" : "组织机构标识",
+      "name" : "ORGID",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "PRINTID",
+      "length" : 100,
+      "logicName" : "PRINT标识",
+      "name" : "PRINTID",
+      "stdDataType" : 25,
+      "pKey" : true
+    }, {
+      "codeName" : "PRINTNAME",
+      "length" : 200,
+      "logicName" : "PRINT名称",
+      "name" : "PRINTNAME",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "STUNO",
+      "length" : 100,
+      "logicName" : "PRINTMODEL",
+      "name" : "STUNO",
+      "stdDataType" : 25,
+      "nullable" : true
+    }, {
+      "codeName" : "UPDATEDATE",
+      "length" : 8,
+      "logicName" : "更新时间",
+      "name" : "UPDATEDATE",
+      "stdDataType" : 5,
+      "nullable" : true
+    }, {
+      "codeName" : "UPDATEMAN",
+      "length" : 60,
+      "logicName" : "更新人",
+      "name" : "UPDATEMAN",
+      "stdDataType" : 25,
+      "nullable" : true
+    } ],
+    "codeName" : "T_PRINT",
+    "logicName" : "PRINT",
+    "name" : "T_PRINT",
+    "autoExtendModel" : true,
+    "existingModel" : false
   }, {
     "getAllPSSysDBColumns" : [ {
       "codeName" : "CREATEDATE",

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

@@ -737,6 +737,233 @@
     "enableDataExport" : true,
     "enableDataImport" : true,
     "major" : true
+  }, {
+    "aPIMode" : 1,
+    "codeName" : "PRINT",
+    "logicName" : "PRINT",
+    "name" : "PRINT",
+    "getPSDEServiceAPIMethods" : [ {
+      "dataAccessAction" : "CREATE",
+      "methodType" : "DEACTION",
+      "name" : "Create",
+      "getPSDEAction" : {
+        "modelref" : true,
+        "path" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/Create.json"
+      },
+      "getPSDEServiceAPIMethodInput" : {
+        "name" : "输入对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "PRINTDTO"
+        },
+        "type" : "DTO"
+      },
+      "getPSDEServiceAPIMethodReturn" : {
+        "name" : "返回对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "PRINTDTO"
+        },
+        "type" : "DTO"
+      },
+      "requestMethod" : "POST",
+      "noServiceCodeName" : true
+    }, {
+      "dataAccessAction" : "READ",
+      "methodType" : "DEACTION",
+      "name" : "Get",
+      "getPSDEAction" : {
+        "modelref" : true,
+        "path" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/Get.json"
+      },
+      "getPSDEServiceAPIMethodInput" : {
+        "getKeyPSDEServiceAPIField" : {
+          "modelref" : true,
+          "id" : "PRINTId"
+        },
+        "name" : "输入对象",
+        "type" : "KEYFIELD"
+      },
+      "getPSDEServiceAPIMethodReturn" : {
+        "name" : "返回对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "PRINTDTO"
+        },
+        "type" : "DTO"
+      },
+      "requestMethod" : "GET",
+      "needResourceKey" : true,
+      "noServiceCodeName" : true
+    }, {
+      "dataAccessAction" : "DELETE",
+      "methodType" : "DEACTION",
+      "name" : "Remove",
+      "getPSDEAction" : {
+        "modelref" : true,
+        "path" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/Remove.json"
+      },
+      "getPSDEServiceAPIMethodInput" : {
+        "getKeyPSDEServiceAPIField" : {
+          "modelref" : true,
+          "id" : "PRINTId"
+        },
+        "name" : "输入对象",
+        "type" : "KEYFIELDS"
+      },
+      "getPSDEServiceAPIMethodReturn" : {
+        "name" : "返回对象",
+        "type" : "VOID"
+      },
+      "requestMethod" : "DELETE",
+      "needResourceKey" : true,
+      "noServiceCodeName" : true
+    }, {
+      "dataAccessAction" : "UPDATE",
+      "methodType" : "DEACTION",
+      "name" : "Update",
+      "getPSDEAction" : {
+        "modelref" : true,
+        "path" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/Update.json"
+      },
+      "getPSDEServiceAPIMethodInput" : {
+        "name" : "输入对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "PRINTDTO"
+        },
+        "type" : "DTO"
+      },
+      "getPSDEServiceAPIMethodReturn" : {
+        "name" : "返回对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "PRINTDTO"
+        },
+        "type" : "DTO"
+      },
+      "requestMethod" : "PUT",
+      "needResourceKey" : true,
+      "noServiceCodeName" : true
+    }, {
+      "codeName" : "CheckKey",
+      "dataAccessAction" : "CREATE",
+      "methodType" : "DEACTION",
+      "name" : "CheckKey",
+      "getPSDEAction" : {
+        "modelref" : true,
+        "path" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/CheckKey.json"
+      },
+      "getPSDEServiceAPIMethodInput" : {
+        "name" : "输入对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "PRINTDTO"
+        },
+        "type" : "DTO"
+      },
+      "getPSDEServiceAPIMethodReturn" : {
+        "name" : "返回对象",
+        "stdDataType" : 9,
+        "type" : "SIMPLE"
+      },
+      "requestMethod" : "POST"
+    }, {
+      "codeName" : "GetDraft",
+      "dataAccessAction" : "CREATE",
+      "methodType" : "DEACTION",
+      "name" : "GetDraft",
+      "getPSDEAction" : {
+        "modelref" : true,
+        "path" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/GetDraft.json"
+      },
+      "getPSDEServiceAPIMethodInput" : {
+        "name" : "输入对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "PRINTDTO"
+        },
+        "type" : "DTO"
+      },
+      "getPSDEServiceAPIMethodReturn" : {
+        "name" : "返回对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "PRINTDTO"
+        },
+        "type" : "DTO"
+      },
+      "requestMethod" : "GET"
+    }, {
+      "codeName" : "Save",
+      "methodType" : "DEACTION",
+      "name" : "Save",
+      "getPSDEAction" : {
+        "modelref" : true,
+        "path" : "PSMODULES/common/PSDATAENTITIES/PRINT/PSDEACTIONS/Save.json"
+      },
+      "getPSDEServiceAPIMethodInput" : {
+        "name" : "输入对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "PRINTDTO"
+        },
+        "type" : "DTO"
+      },
+      "getPSDEServiceAPIMethodReturn" : {
+        "name" : "返回对象",
+        "type" : "VOID"
+      },
+      "requestMethod" : "POST",
+      "needResourceKey" : true
+    }, {
+      "codeName" : "FetchDefault",
+      "dataAccessAction" : "READ",
+      "methodType" : "FETCH",
+      "name" : "FetchDefault",
+      "getPSDEDataSet" : {
+        "modelref" : true,
+        "id" : "Default"
+      },
+      "getPSDEServiceAPIMethodInput" : {
+        "name" : "输入对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "PRINTFilterDTO"
+        },
+        "type" : "DTO"
+      },
+      "getPSDEServiceAPIMethodReturn" : {
+        "name" : "返回对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "PRINTDTO"
+        },
+        "type" : "PAGE"
+      },
+      "requestMethod" : "POST"
+    }, {
+      "codeName" : "Select",
+      "dataAccessAction" : "READ",
+      "methodType" : "SELECT",
+      "name" : "Select",
+      "getPSDEServiceAPIMethodInput" : {
+        "name" : "输入对象",
+        "type" : "UNKNOWN"
+      },
+      "getPSDEServiceAPIMethodReturn" : {
+        "name" : "返回对象",
+        "type" : "UNKNOWN"
+      },
+      "requestMethod" : "POST"
+    } ],
+    "getPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/PRINT.json"
+    },
+    "enableDataExport" : true,
+    "enableDataImport" : true,
+    "major" : true
   }, {
     "aPIMode" : 1,
     "codeName" : "Book",

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

@@ -383,6 +383,10 @@
     "modelref" : true,
     "path" : "PSMODULES/common/PSDATAENTITIES/BookType.json",
     "name" : "BOOKTYPE"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/PRINT.json",
+    "name" : "PRINT"
   }, {
     "modelref" : true,
     "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json",
@@ -598,6 +602,9 @@
     }, {
       "modelref" : true,
       "path" : "PSMODULES/common/PSDATAENTITIES/BookType.json"
+    }, {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/PRINT.json"
     }, {
       "modelref" : true,
       "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"