tony001 发布系统代码 [TrainSys，Mob]

70f40eaf · ibizdev · 266613ed · 70f40eaf · 70f40eaf · 70f40eaf
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
 * [Mob](ibizmos:/pssysapps/Mob.ibizmodel) 

 ## 工作流
-   无
+* [测试流程(WorkFlow)](workflow/WorkFlowWf.md)

 ## 服务接口
 * [默认服务接口](service/TrainSys.md)

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test.json
@@ -28,6 +28,10 @@
    "modelref" : true,
    "path" : "PSMODULES/Test/PSDATAENTITIES/WorkFlow.json"
  } ],
+  "getAllPSWorkflows" : [ {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSWORKFLOWS/WorkFlowWf.json"
+  } ],
  "codeName" : "Test",
  "dynaModelFilePath" : "PSMODULES/Test.json",
  "name" : "测试模块"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/WorkFlow.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/WorkFlow.json
@@ -1284,6 +1284,35 @@
    "logicName" : "更新",
    "name" : "UPDATE"
  } ],
+  "getAllPSDEWFs" : [ {
+    "codeName" : "WF",
+    "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/WorkFlow/PSWFDES/WF.json",
+    "getEntityStatePSCodeList" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSCODELISTS/WFStatus.json"
+    },
+    "name" : "WORKFLOW",
+    "getPSWorkflow" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSWORKFLOWS/WorkFlowWf.json"
+    },
+    "getUDStatePSDEField" : {
+      "name" : "WFSTATE",
+      "codeName" : "Wfstate"
+    },
+    "wFProxyMode" : 0,
+    "getWFStepPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSCODELISTS/WorkFlowWfStep.json"
+    },
+    "getWFStepPSDEField" : {
+      "name" : "WFSTEP",
+      "codeName" : "Wfstep"
+    },
+    "defaultMode" : true,
+    "enableUserStart" : true,
+    "useWFProxyApp" : false
+  } ],
  "getAllPSModelDatas" : [ {
    "codeName" : "EditView",
    "logicName" : "工作流实体编辑视图",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSWORKFLOWS/WorkFlowWf.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSWORKFLOWS/WorkFlowWf.json
 {
  "codeName" : "WorkFlowWf",
  "dynaModelFilePath" : "PSMODULES/Test/PSWORKFLOWS/WorkFlowWf.json",
-  "logicName" : "工作流(WorkFlow)",
-  "name" : "工作流(WorkFlow)",
+  "logicName" : "测试流程(WorkFlow)",
+  "name" : "测试流程(WorkFlow)",
  "getPSSystemModule" : {
    "modelref" : true,
    "path" : "PSMODULES/Test.json"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSWORKFLOWS/WorkFlowWf/PSWFVERSIONS/WorkFlowWfv1.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSWORKFLOWS/WorkFlowWf/PSWFVERSIONS/WorkFlowWfv1.json
 {
  "codeName" : "WorkFlowWfv1",
  "dynaModelFilePath" : "PSMODULES/Test/PSWORKFLOWS/WorkFlowWf/PSWFVERSIONS/WorkFlowWfv1.json",
-  "name" : "工作流(WorkFlow) v1",
+  "name" : "测试流程(WorkFlow) v1",
  "wFCodeName" : "WorkFlowWf",
  "wFVersion" : 1,
  "hasMobStartView" : false,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSWORKFLOWS/WorkFlowWf/PSWFVERSIONS/WorkFlowWfv1.json.bpmn
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSWORKFLOWS/WorkFlowWf/PSWFVERSIONS/WorkFlowWfv1.json.bpmn
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.flowable.org/processdef">
-    <process id="trainsys-workflowwfv1" isClosed="false" isExecutable="true" name="工作流(WorkFlow) v1" processType="None">
+    <process id="trainsys-workflowwfv1" isClosed="false" isExecutable="true" name="测试流程(WorkFlow) v1" processType="None">
        <extensionElements>
            <flowable:eventListener delegateExpression="${processInstanceListener}"  />
            <flowable:field name="bookings">

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/WorkFlow.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/WorkFlow.json
@@ -1215,6 +1215,51 @@
    "requestParamType" : "ENTITY",
    "requestPath" : "/select",
    "builtinMethod" : false
+  }, {
+    "codeName" : "WFClose",
+    "methodType" : "WFACTION",
+    "name" : "WFCLOSE",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFGoto",
+    "methodType" : "WFACTION",
+    "name" : "WFGOTO",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFMarkRead",
+    "methodType" : "WFACTION",
+    "name" : "WFMARKREAD",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFReassign",
+    "methodType" : "WFACTION",
+    "name" : "WFREASSIGN",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFRestart",
+    "methodType" : "WFACTION",
+    "name" : "WFRESTART",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFRollback",
+    "methodType" : "WFACTION",
+    "name" : "WFROLLBACK",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFSendBack",
+    "methodType" : "WFACTION",
+    "name" : "WFSENDBACK",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFStart",
+    "methodType" : "WFACTION",
+    "name" : "WFSTART",
+    "builtinMethod" : true
+  }, {
+    "codeName" : "WFSubmit",
+    "methodType" : "WFACTION",
+    "name" : "WFSUBMIT",
+    "builtinMethod" : true
  } ],
  "getAllPSAppViews" : [ {
    "modelref" : true,
@@ -1282,6 +1327,6 @@
  "enableUICreate" : true,
  "enableUIModify" : true,
  "enableUIRemove" : true,
-  "enableWFActions" : false,
+  "enableWFActions" : true,
  "major" : true
 }
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/WorkFlow/PSFORMS/WorkFlowEditView_Form.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/WorkFlow/PSFORMS/WorkFlowEditView_Form.json
@@ -543,6 +543,36 @@
      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WorkFlow.json"
    }
  },
+  "getWFStartPSControlAction" : {
+    "modelref" : true,
+    "id" : "wfstart",
+    "actionName" : "WFSTART",
+    "actionType" : "WFACTION",
+    "name" : "wfstart",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "WFStart"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WorkFlow.json"
+    }
+  },
+  "getWFSubmitPSControlAction" : {
+    "modelref" : true,
+    "id" : "wfsubmit",
+    "actionName" : "WFSUBMIT",
+    "actionType" : "WFACTION",
+    "name" : "wfsubmit",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "WFSubmit"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WorkFlow.json"
+    }
+  },
  "noTabHeader" : false,
  "modelid" : "A8BA07E3-3C30-4706-8C38-B629CD7FACCF",
  "modeltype" : "PSDEFORM_EDITFORM"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/WorkFlowWorkFlowEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/WorkFlowWorkFlowEditView.json
@@ -33,6 +33,10 @@
      "value" : 0
    } ]
  } ],
+  "getPSAppWF" : {
+    "modelref" : true,
+    "id" : "WorkFlowWf"
+  },
  "getPSControls" : [ {
    "codeName" : "WorkFlowEditViewtoolbar",
    "controlType" : "TOOLBAR",
@@ -105,6 +109,66 @@
      },
      "showCaption" : true,
      "showIcon" : true
+    }, {
+      "getCapPSLanguageRes" : {
+        "defaultContent" : "启动流程",
+        "lanResTag" : "TBB.TEXT.*.STARTWF",
+        "lanResType" : "TBB.TEXT",
+        "name" : "工具栏按钮文本[*.STARTWF]",
+        "refFlag" : true
+      },
+      "caption" : "开始流程",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "deuiaction2",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_deuiaction2"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf04b@FontAwesome",
+        "cssClass" : "fa fa-play"
+      },
+      "getPSUIAction" : {
+        "getCapPSLanguageRes" : {
+          "defaultContent" : "启动流程",
+          "lanResTag" : "TBB.TEXT.*.STARTWF",
+          "lanResType" : "TBB.TEXT",
+          "name" : "工具栏按钮文本[*.STARTWF]",
+          "refFlag" : true
+        },
+        "caption" : "开始流程",
+        "codeName" : "SaveAndStart",
+        "fullCodeName" : "SaveAndStart",
+        "name" : "编辑界面_保存并开始流程操作",
+        "getPSSysImage" : {
+          "glyph" : "xf04b@FontAwesome",
+          "cssClass" : "fa fa-play"
+        },
+        "predefinedType" : "EDITVIEW_SAVEANDSTARTWFACTION",
+        "timeout" : 60000,
+        "getTooltipPSLanguageRes" : {
+          "defaultContent" : "启动流程",
+          "lanResTag" : "TBB.TOOLTIP.*.STARTWF",
+          "lanResType" : "TBB.TOOLTIP",
+          "name" : "工具栏按钮提示[*.STARTWF]",
+          "refFlag" : true
+        },
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "SaveAndStart",
+        "uIActionType" : "DEUIACTION"
+      },
+      "tooltip" : "开始流程",
+      "getTooltipPSLanguageRes" : {
+        "defaultContent" : "启动流程",
+        "lanResTag" : "TBB.TOOLTIP.*.STARTWF",
+        "lanResType" : "TBB.TOOLTIP",
+        "name" : "工具栏按钮提示[*.STARTWF]",
+        "refFlag" : true
+      },
+      "showCaption" : true,
+      "showIcon" : true
    }, {
      "getCapPSLanguageRes" : {
        "defaultContent" : "关闭",
@@ -315,6 +379,30 @@
          "modelref" : true,
          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WorkFlow.json"
        }
+      }, {
+        "actionName" : "WFSTART",
+        "actionType" : "WFACTION",
+        "name" : "wfstart",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFStart"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WorkFlow.json"
+        }
+      }, {
+        "actionName" : "WFSUBMIT",
+        "actionType" : "WFACTION",
+        "name" : "wfsubmit",
+        "getPSAppDEMethod" : {
+          "modelref" : true,
+          "id" : "WFSubmit"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WorkFlow.json"
+        }
      } ],
      "enableDEFieldPrivilege" : false,
      "id" : "编辑表单处理器"
@@ -798,6 +886,36 @@
        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WorkFlow.json"
      }
    },
+    "getWFStartPSControlAction" : {
+      "modelref" : true,
+      "id" : "wfstart",
+      "actionName" : "WFSTART",
+      "actionType" : "WFACTION",
+      "name" : "wfstart",
+      "getPSAppDEMethod" : {
+        "modelref" : true,
+        "id" : "WFStart"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WorkFlow.json"
+      }
+    },
+    "getWFSubmitPSControlAction" : {
+      "modelref" : true,
+      "id" : "wfsubmit",
+      "actionName" : "WFSUBMIT",
+      "actionType" : "WFACTION",
+      "name" : "wfsubmit",
+      "getPSAppDEMethod" : {
+        "modelref" : true,
+        "id" : "WFSubmit"
+      },
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WorkFlow.json"
+      }
+    },
    "noTabHeader" : false,
    "name" : "form",
    "modelid" : "A8BA07E3-3C30-4706-8C38-B629CD7FACCF",
@@ -847,6 +965,14 @@
    "layoutPanel" : true,
    "useDefaultLayout" : true
  },
+  "getPSWFVersion" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSWORKFLOWS/WorkFlowWf/PSWFVERSIONS/WorkFlowWfv1.json"
+  },
+  "getPSWorkflow" : {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSWORKFLOWS/WorkFlowWf.json"
+  },
  "title" : "工作流编辑",
  "viewStyle" : "DEFAULT",
  "viewType" : "DEEDITVIEW",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -3720,6 +3720,26 @@
    "resource" : "Reginfo",
    "view" : "StuInfoList"
  } ],
+  "getAllPSAppWFs" : [ {
+    "codeName" : "WorkFlowWf",
+    "name" : "测试流程(WorkFlow)",
+    "getPSAppWFDEs" : [ {
+      "name" : "WORKFLOW",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WorkFlow.json"
+      },
+      "getPSAppWF" : {
+        "modelref" : true,
+        "id" : "WorkFlowWf"
+      }
+    } ],
+    "getPSWorkflow" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSWORKFLOWS/WorkFlowWf.json"
+    },
+    "hasPSAppWFVer" : false
+  } ],
  "getAllPSDEOPPrivs" : [ {
    "logicName" : "建立",
    "name" : "CREATE"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
@@ -913,6 +913,10 @@
      "modelref" : true,
      "path" : "PSMODULES/Test/PSDATAENTITIES/WorkFlow.json"
    } ],
+    "getAllPSWorkflows" : [ {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSWORKFLOWS/WorkFlowWf.json"
+    } ],
    "codeName" : "Test",
    "dynaModelFilePath" : "PSMODULES/Test.json",
    "name" : "测试模块"
@@ -980,6 +984,10 @@
    "dynaModelFilePath" : "PSMODULES/common.json",
    "name" : "公共模块"
  } ],
+  "getAllPSWorkflows" : [ {
+    "modelref" : true,
+    "path" : "PSMODULES/Test/PSWORKFLOWS/WorkFlowWf.json"
+  } ],
  "codeName" : "TrainSys",
  "defaultLanguage" : "ZH_CN",
  "getDefaultPSSysI18N" : {