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

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

@@ -825,8 +825,7 @@
         "editorType" : "DATEPICKER",
         "name" : "[END][结束时间]",
         "uIMode" : "DEFAULT",
-        "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS",
-        "allowEmpty" : false
+        "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"
       },
       "type" : "DEFAULT"
     }, {
@@ -838,7 +837,6 @@
         "name" : "[END][结束时间]移动端默认",
         "uIMode" : "MOBILEDEFAULT",
         "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS",
-        "allowEmpty" : false,
         "mobileMode" : true
       },
       "type" : "MOBILEDEFAULT",
@@ -874,8 +872,7 @@
     },
     "serviceCodeName" : "End",
     "stdDataType" : 5,
-    "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS",
-    "allowEmpty" : false
+    "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"
   }, {
     "getAllPSDEFDTColumns" : [ {
       "columnName" : "PHONEID",
@@ -2520,13 +2517,13 @@
     "name" : "xxx",
     "getPSDELogicNodes" : [ {
       "codeName" : "Begin",
-      "leftPos" : 200,
+      "leftPos" : 190,
       "logicNodeType" : "BEGIN",
       "name" : "开始",
       "getPSDELogicLinks" : [ {
         "getDstPSDELogicNode" : {
           "modelref" : true,
-          "id" : "PREPAREPARAM1"
+          "id" : "DEACTION1"
         },
         "name" : "连接名称",
         "getSrcPSDELogicNode" : {
@@ -2534,7 +2531,7 @@
           "id" : "Begin"
         }
       } ],
-      "topPos" : 200,
+      "topPos" : 120,
       "parallelOutput" : true
     }, {
       "codeName" : "THROWEXCEPTION1",
@@ -2545,7 +2542,7 @@
       "topPos" : 110
     }, {
       "codeName" : "PREPAREPARAM1",
-      "leftPos" : 460,
+      "leftPos" : 420,
       "logicNodeType" : "PREPAREPARAM",
       "name" : "准备参数",
       "getPSDELogicLinks" : [ {
@@ -2596,6 +2593,39 @@
         "srcValue" : "1111",
         "srcValueType" : "SRCVALUE"
       } ],
+      "topPos" : 210
+    }, {
+      "codeName" : "DEACTION1",
+      "getDstPSDEAction" : {
+        "modelref" : true,
+        "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Create.json"
+      },
+      "getDstPSDELogicParam" : {
+        "modelref" : true,
+        "id" : "Default"
+      },
+      "getDstPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+      },
+      "leftPos" : 100,
+      "logicNodeType" : "DEACTION",
+      "name" : "实体行为",
+      "getPSDELogicLinks" : [ {
+        "getDstPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "END1"
+        },
+        "name" : "连接名称",
+        "getSrcPSDELogicNode" : {
+          "modelref" : true,
+          "id" : "DEACTION1"
+        }
+      } ],
+      "getRetPSDELogicParam" : {
+        "modelref" : true,
+        "id" : "createparam"
+      },
       "topPos" : 340
     }, {
       "codeName" : "SUBSYSSAMETHOD1",
@@ -2673,6 +2703,15 @@
       },
       "default" : true,
       "entityParam" : true
+    }, {
+      "codeName" : "createparam",
+      "logicName" : "createparam",
+      "name" : "createparam",
+      "getParamPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+      },
+      "entityParam" : true
     }, {
       "codeName" : "simpleVar",
       "logicName" : "简单",
@@ -2705,8 +2744,7 @@
       },
       "sourceType" : "DEFIELD",
       "stdDataType" : 5,
-      "type" : "SIMPLE",
-      "allowEmpty" : false
+      "type" : "SIMPLE"
     }, {
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
       "logicName" : "建立时间",

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

@@ -7,13 +7,13 @@
   "name" : "xxx",
   "getPSDELogicNodes" : [ {
     "codeName" : "Begin",
-    "leftPos" : 200,
+    "leftPos" : 190,
     "logicNodeType" : "BEGIN",
     "name" : "开始",
     "getPSDELogicLinks" : [ {
       "getDstPSDELogicNode" : {
         "modelref" : true,
-        "id" : "PREPAREPARAM1"
+        "id" : "DEACTION1"
       },
       "name" : "连接名称",
       "getSrcPSDELogicNode" : {
@@ -21,7 +21,7 @@
         "id" : "Begin"
       }
     } ],
-    "topPos" : 200,
+    "topPos" : 120,
     "parallelOutput" : true
   }, {
     "codeName" : "THROWEXCEPTION1",
@@ -32,7 +32,7 @@
     "topPos" : 110
   }, {
     "codeName" : "PREPAREPARAM1",
-    "leftPos" : 460,
+    "leftPos" : 420,
     "logicNodeType" : "PREPAREPARAM",
     "name" : "准备参数",
     "getPSDELogicLinks" : [ {
@@ -83,6 +83,39 @@
       "srcValue" : "1111",
       "srcValueType" : "SRCVALUE"
     } ],
+    "topPos" : 210
+  }, {
+    "codeName" : "DEACTION1",
+    "getDstPSDEAction" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Create.json"
+    },
+    "getDstPSDELogicParam" : {
+      "modelref" : true,
+      "id" : "Default"
+    },
+    "getDstPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+    },
+    "leftPos" : 100,
+    "logicNodeType" : "DEACTION",
+    "name" : "实体行为",
+    "getPSDELogicLinks" : [ {
+      "getDstPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "END1"
+      },
+      "name" : "连接名称",
+      "getSrcPSDELogicNode" : {
+        "modelref" : true,
+        "id" : "DEACTION1"
+      }
+    } ],
+    "getRetPSDELogicParam" : {
+      "modelref" : true,
+      "id" : "createparam"
+    },
     "topPos" : 340
   }, {
     "codeName" : "SUBSYSSAMETHOD1",
@@ -160,6 +193,15 @@
     },
     "default" : true,
     "entityParam" : true
+  }, {
+    "codeName" : "createparam",
+    "logicName" : "createparam",
+    "name" : "createparam",
+    "getParamPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Phone.json"
+    },
+    "entityParam" : true
   }, {
     "codeName" : "simpleVar",
     "logicName" : "简单",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxxA.json.bpmn

@@ -6,36 +6,43 @@
                 <tns:import name="org.springframework.util.StringUtils"/>
                 <tns:import name="cn.ibizlab.trainsys.util.helper.RuleUtils"/>
                                 <tns:metaData express="" name="phonexxxadefault" type="entity"/>
+                                <tns:metaData express="new cn.ibizlab.trainsys.core.common.domain.Phone()" name="phonexxxacreateparam" type="refentity"/>
                                 <tns:metaData express="new HashMap()" name="phonexxxasimplevar" type="refentity"/>
                                 <tns:metaData express="new HashMap()" name="phonexxxasimplenum" type="refentity"/>
+                                    <tns:metaData express="T(cn.ibizlab.trainsys.util.security.SpringContextHolder).getBean(T(cn.ibizlab.trainsys.core.common.service.IPhoneService))" name="phoneservice" type="service"/>
                     <tns:metaData express="T(cn.ibizlab.trainsys.util.security.SpringContextHolder).getBean(T(cn.ibizlab.trainsys.core.common.service.IPhoneService))" name="iBzSysPhoneDefaultService" type="service"/>
                     <tns:metaData express="T(cn.ibizlab.trainsys.util.security.AuthenticationUser).getAuthenticationUser()" name="curuser" type="session"/>
                             <tns:global identifier="phonexxxadefault" type="cn.ibizlab.trainsys.core.common.domain.Phone" />
+                            <tns:global identifier="phonexxxacreateparam" type="cn.ibizlab.trainsys.core.common.domain.Phone" />
             </extensionElements>
                         <startEvent id="begin" isInterrupting="true"/>
                         <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="phonexxxathrowexception1" id="throwexception1" implementation="http://www.jboss.org/drools/rule" name="抛出异常"/>
                         <endEvent id="throwexception1_end" name="end"/>
                         <sequenceFlow id="throwexception1_end_line" sourceRef="throwexception1" targetRef="throwexception1_end"/>
                         <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="phonexxxaprepareparam1" id="prepareparam1" implementation="http://www.jboss.org/drools/rule" name="准备参数"/>
+                        <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="phonexxxadeaction1" id="deaction1" implementation="http://www.jboss.org/drools/rule" name="实体行为"/>
                         <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="phonexxxasubsyssamethod1" id="subsyssamethod1" implementation="http://www.jboss.org/drools/rule" name="外部接口调用"/>
                         <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="phonexxxabindparam1" id="bindparam1" implementation="http://www.jboss.org/drools/rule" name="绑定参数"/>
                         <businessRuleTask activiti:exclusive="true" g:ruleFlowGroup="phonexxxaend1" id="end1" implementation="http://www.jboss.org/drools/rule" name="结束"/>
                         <endEvent id="end1_end" name="end"/>
                         <sequenceFlow id="end1_end_line" sourceRef="end1" targetRef="end1_end"/>
-                    <sequenceFlow id="begin_prepareparam1" sourceRef="begin" targetRef="prepareparam1">
+                    <sequenceFlow id="begin_deaction1" sourceRef="begin" targetRef="deaction1">
                     </sequenceFlow>
                     <sequenceFlow id="prepareparam1_subsyssamethod1" sourceRef="prepareparam1" targetRef="subsyssamethod1">
                     </sequenceFlow>
                     <sequenceFlow id="gateway-prepareparam1_throwexception1" sourceRef="gateway-prepareparam1" targetRef="throwexception1">
                             <conditionExpression  language="http://www.jboss.org/drools/rule" ><![CDATA[
                                             $phonexxxadefault:Phone();
+                                            $phonexxxacreateparam:Phone();
                                             $phonexxxasimplevar:Map();
                                             $phonexxxasimplenum:Map();
-                                    eval($phonexxxadefault==phonexxxadefault && );
+                                    eval($phonexxxadefault==phonexxxadefault && $phonexxxacreateparam==phonexxxacreateparam && );
                                 eval((RuleUtils.test($phonexxxadefault.get("error"),"EQ","1")))
                                 ]]>
                             </conditionExpression>
                     </sequenceFlow>
+                    <sequenceFlow id="deaction1_end1" sourceRef="deaction1" targetRef="end1">
+                    </sequenceFlow>
                     <sequenceFlow id="subsyssamethod1_bindparam1" sourceRef="subsyssamethod1" targetRef="bindparam1">
                     </sequenceFlow>
                     <sequenceFlow id="bindparam1_end1" sourceRef="bindparam1" targetRef="end1">

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxxA.json.drl

@@ -6,8 +6,10 @@ package cn.ibizlab.trainsys.common.logic.phonelogic.xxxa;
         import org.springframework.util.ObjectUtils;
         import cn.ibizlab.trainsys.util.errors.BadRequestAlertException;
                 global cn.ibizlab.trainsys.core.common.domain.Phone phonexxxadefault;
+                global cn.ibizlab.trainsys.core.common.domain.Phone phonexxxacreateparam;
                 global java.util.Map phonexxxasimplevar;
                 global java.util.Map phonexxxasimplenum;
+                    global cn.ibizlab.trainsys.core.common.service.IPhoneService phoneservice;
         global cn.ibizlab.trainsys.core.common.service.IPhoneService iBzSysPhoneDefaultService;
         global cn.ibizlab.trainsys.util.security.AuthenticationUser curuser;
 
@@ -27,6 +29,7 @@ package cn.ibizlab.trainsys.common.logic.phonelogic.xxxa;
             when
             then
                         update(phonexxxadefault);//更新fact中变量值
+                        update(phonexxxacreateparam);//更新fact中变量值
                         update(phonexxxasimplevar);//更新fact中变量值
                         update(phonexxxasimplenum);//更新fact中变量值
             end
@@ -38,6 +41,19 @@ package cn.ibizlab.trainsys.common.logic.phonelogic.xxxa;
             then
                             phonexxxadefault.set("money","1111");
                         update(phonexxxadefault);//更新fact中变量值
+                        update(phonexxxacreateparam);//更新fact中变量值
+                        update(phonexxxasimplevar);//更新fact中变量值
+                        update(phonexxxasimplenum);//更新fact中变量值
+            end
+
+            //逻辑处理节点[实体行为]
+            rule "deaction1"
+            ruleflow-group "phonexxxadeaction1"
+            when
+            then
+                        phoneservice.create(phonexxxadefault);
+                        update(phonexxxadefault);//更新fact中变量值
+                        update(phonexxxacreateparam);//更新fact中变量值
                         update(phonexxxasimplevar);//更新fact中变量值
                         update(phonexxxasimplenum);//更新fact中变量值
             end
@@ -48,6 +64,7 @@ package cn.ibizlab.trainsys.common.logic.phonelogic.xxxa;
             when
             then
                         update(phonexxxadefault);//更新fact中变量值
+                        update(phonexxxacreateparam);//更新fact中变量值
                         update(phonexxxasimplevar);//更新fact中变量值
                         update(phonexxxasimplenum);//更新fact中变量值
             end
@@ -58,6 +75,7 @@ package cn.ibizlab.trainsys.common.logic.phonelogic.xxxa;
             when
             then
                         update(phonexxxadefault);//更新fact中变量值
+                        update(phonexxxacreateparam);//更新fact中变量值
                         update(phonexxxasimplevar);//更新fact中变量值
                         update(phonexxxasimplenum);//更新fact中变量值
             end
@@ -68,6 +86,7 @@ package cn.ibizlab.trainsys.common.logic.phonelogic.xxxa;
             when
             then
                         update(phonexxxadefault);//更新fact中变量值
+                        update(phonexxxacreateparam);//更新fact中变量值
                         update(phonexxxasimplevar);//更新fact中变量值
                         update(phonexxxasimplenum);//更新fact中变量值
             end
\ No newline at end of file

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

@@ -686,8 +686,7 @@
         "editorType" : "DATEPICKER",
         "name" : "[END][结束时间]",
         "uIMode" : "DEFAULT",
-        "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS",
-        "allowEmpty" : false
+        "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"
       },
       "type" : "DEFAULT"
     }, {
@@ -699,7 +698,6 @@
         "name" : "[END][结束时间]移动端默认",
         "uIMode" : "MOBILEDEFAULT",
         "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS",
-        "allowEmpty" : false,
         "mobileMode" : true
       },
       "type" : "MOBILEDEFAULT",
@@ -1530,8 +1528,7 @@
       },
       "sourceType" : "DEFIELD",
       "stdDataType" : 5,
-      "type" : "SIMPLE",
-      "allowEmpty" : false
+      "type" : "SIMPLE"
     }, {
       "codeName" : "CreateDate",
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",

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

@@ -686,8 +686,7 @@
         "editorType" : "DATEPICKER",
         "name" : "[END][结束时间]",
         "uIMode" : "DEFAULT",
-        "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS",
-        "allowEmpty" : false
+        "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"
       },
       "type" : "DEFAULT"
     }, {
@@ -699,7 +698,6 @@
         "name" : "[END][结束时间]移动端默认",
         "uIMode" : "MOBILEDEFAULT",
         "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS",
-        "allowEmpty" : false,
         "mobileMode" : true
       },
       "type" : "MOBILEDEFAULT",
@@ -1530,8 +1528,7 @@
       },
       "sourceType" : "DEFIELD",
       "stdDataType" : 5,
-      "type" : "SIMPLE",
-      "allowEmpty" : false
+      "type" : "SIMPLE"
     }, {
       "codeName" : "CreateDate",
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",

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

@@ -1579,16 +1579,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   }, {
@@ -5131,8 +5131,7 @@
             "editorType" : "DATEPICKER",
             "name" : "[END][结束时间]",
             "uIMode" : "DEFAULT",
-            "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS",
-            "allowEmpty" : false
+            "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"
           },
           "type" : "DEFAULT"
         }, {
@@ -5144,7 +5143,6 @@
             "name" : "[END][结束时间]移动端默认",
             "uIMode" : "MOBILEDEFAULT",
             "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS",
-            "allowEmpty" : false,
             "mobileMode" : true
           },
           "type" : "MOBILEDEFAULT",
@@ -5975,8 +5973,7 @@
           },
           "sourceType" : "DEFIELD",
           "stdDataType" : 5,
-          "type" : "SIMPLE",
-          "allowEmpty" : false
+          "type" : "SIMPLE"
         }, {
           "codeName" : "CreateDate",
           "jsonFormat" : "yyyy-MM-dd HH:mm:ss",

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

@@ -686,8 +686,7 @@
         "editorType" : "DATEPICKER",
         "name" : "[END][结束时间]",
         "uIMode" : "DEFAULT",
-        "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS",
-        "allowEmpty" : false
+        "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"
       },
       "type" : "DEFAULT"
     }, {
@@ -699,7 +698,6 @@
         "name" : "[END][结束时间]移动端默认",
         "uIMode" : "MOBILEDEFAULT",
         "valueFormat" : "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS",
-        "allowEmpty" : false,
         "mobileMode" : true
       },
       "type" : "MOBILEDEFAULT",
@@ -1530,8 +1528,7 @@
       },
       "sourceType" : "DEFIELD",
       "stdDataType" : 5,
-      "type" : "SIMPLE",
-      "allowEmpty" : false
+      "type" : "SIMPLE"
     }, {
       "codeName" : "CreateDate",
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",

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

@@ -12816,16 +12816,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   }, {
@@ -12854,16 +12854,16 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       }
     }, {
       "name" : "消息类型-常规信息",
@@ -12886,95 +12886,89 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
       },
       "position" : "POPUP"
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       },
       "position" : "POPUP"
     }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
       }
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg9"
+      }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
-    }, {
       "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -12986,21 +12980,27 @@
         "modelref" : true,
         "id" : "ViewMsg12"
       }
+    }, {
+      "name" : "关闭模式-本次删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
     } ]
   }, {
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     } ]
   } ],

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

@@ -3772,7 +3772,7 @@
       "name" : "END",
       "orderValue" : 220,
       "stdDataType" : 5,
-      "allowEmpty" : false,
+      "allowEmpty" : true,
       "enableCreate" : true,
       "enableModify" : true,
       "keyField" : false,