From a5f944c2bc0107e5df936937f1c33e5e03eb8fed Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 06 九月 2025 19:15:48 +0800
Subject: [PATCH] 解锁增加解锁原因和展示
---
blade-service/blade-mdm/src/main/resources/processesbpmn/program-replace.bpmn20.xml | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/resources/processesbpmn/program-replace.bpmn20.xml b/blade-service/blade-mdm/src/main/resources/processesbpmn/program-replace.bpmn20.xml
index 42a8f68..86b3f78 100644
--- a/blade-service/blade-mdm/src/main/resources/processesbpmn/program-replace.bpmn20.xml
+++ b/blade-service/blade-mdm/src/main/resources/processesbpmn/program-replace.bpmn20.xml
@@ -3,17 +3,17 @@
<process id="program-replace" name="鏇挎崲" isExecutable="true">
<startEvent id="sid-0e059345-0bf2-4c18-af59-ee7aeef674c7"/>
<endEvent id="replaceApproveEnd" name="閫氳繃缁撴潫">
- <extensionElements>
- <flowable:executionListener expression="${replaceFinishListener.handle(execution)}" event="end"/>
- </extensionElements>
+ <extensionElements>
+ <flowable:executionListener expression="${replaceFinishListener.handle(execution)}" event="end"/>
+ </extensionElements>
</endEvent>
<userTask id="repalceCheckTask" name="鏁版帶绋嬪簭鏍″" flowable:assignee="${assignee}"/>
- <userTask id="repalceProgrammingTask" name="鏁版帶绋嬪簭缂栧啓" flowable:assignee="${assignee}"/>
+ <userTask id="replaceProgrammingTask" name="鏁版帶绋嬪簭缂栧啓" flowable:assignee="${assignee}"/>
<userTask id="replaceApprove" name="绋嬪簭鏇挎崲瀹℃牳" flowable:assignee="${assignee}"/>
<sequenceFlow id="sid-bf9c31fa-f8c4-4ff5-b4d9-ce3cc0bd1fa2" sourceRef="replaceApprove" targetRef="replaceApproveEnd">
<conditionExpression>${approve=='Y'}</conditionExpression>
</sequenceFlow>
- <sequenceFlow id="sid-318e94d8-f335-428a-b2a1-81cb2e59993f" sourceRef="repalceProgrammingTask" targetRef="repalceCheckTask">
+ <sequenceFlow id="sid-318e94d8-f335-428a-b2a1-81cb2e59993f" sourceRef="replaceProgrammingTask" targetRef="repalceCheckTask">
<conditionExpression>${approve=='Y'}</conditionExpression>
</sequenceFlow>
<sequenceFlow id="sid-ffcf7c0a-7775-45fc-8e0a-368d70522633" sourceRef="repalceCheckTask" targetRef="replaceApprove">
@@ -22,15 +22,20 @@
<sequenceFlow id="sid-c4180f0a-6120-4504-96e3-28ddd7975c15" sourceRef="replaceApprove" targetRef="repalceCheckTask">
<conditionExpression>${approve=='N'}</conditionExpression>
</sequenceFlow>
- <sequenceFlow id="sid-b78c5f58-0487-4cda-8ed8-0ea581b9e934" sourceRef="repalceCheckTask" targetRef="repalceProgrammingTask">
+ <sequenceFlow id="sid-b78c5f58-0487-4cda-8ed8-0ea581b9e934" sourceRef="repalceCheckTask" targetRef="replaceProgrammingTask">
<conditionExpression>${approve=='N'}</conditionExpression>
</sequenceFlow>
<sequenceFlow id="sid-36e913be-1be9-49d3-a8a3-51aadd0e945c" sourceRef="sid-0e059345-0bf2-4c18-af59-ee7aeef674c7" targetRef="repalceCheckTask"/>
- <endEvent id="sid-75a8afef-26b1-4dce-9ad9-4a1d4efff08c" name="閫�鍑虹粨鏉�">
- </endEvent>
- <sequenceFlow id="sid-c86f3a13-5e74-423a-b80d-19ef482eb9e1" sourceRef="repalceProgrammingTask" targetRef="sid-75a8afef-26b1-4dce-9ad9-4a1d4efff08c">
+ <endEvent id="sid-75a8afef-26b1-4dce-9ad9-4a1d4efff08c" name="閫�鍑虹粨鏉�"/>
+ <sequenceFlow id="sid-c86f3a13-5e74-423a-b80d-19ef482eb9e1" sourceRef="replaceProgrammingTask" targetRef="exceptionHandleTask">
<conditionExpression>${approve=='N'}</conditionExpression>
</sequenceFlow>
+ <scriptTask id="exceptionHandleTask" name="寮傚父璁剧疆浠诲姟" scriptFormat="groovy">
+ <script><![CDATA[
+ execution.setVariable("exception", "1");
+ ]]></script>
+ </scriptTask>
+ <sequenceFlow id="sid-bb78fe61-b286-4147-ae83-9e95f8d39afe" sourceRef="exceptionHandleTask" targetRef="sid-75a8afef-26b1-4dce-9ad9-4a1d4efff08c"/>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_program-replace">
<bpmndi:BPMNPlane bpmnElement="program-replace" id="BPMNPlane_program-replace">
@@ -43,7 +48,7 @@
<bpmndi:BPMNShape id="shape-69fea4e5-2bbd-43d3-9bbb-53342e3d898d" bpmnElement="repalceCheckTask">
<omgdc:Bounds x="-137.5" y="-105.0" width="50.000004" height="35.0"/>
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="shape-9d186c35-7e72-4cff-99f6-88352cb15b55" bpmnElement="repalceProgrammingTask">
+ <bpmndi:BPMNShape id="shape-9d186c35-7e72-4cff-99f6-88352cb15b55" bpmnElement="replaceProgrammingTask">
<omgdc:Bounds x="-145.0" y="2.5" width="45.0" height="35.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="shape-bd196b3d-c1ab-4167-a264-7cfc2cf6ec9e" bpmnElement="replaceApprove">
@@ -74,12 +79,19 @@
<omgdi:waypoint x="-137.5" y="-96.25"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="shape-3f281eec-371b-43b4-8b6e-b1985a98b3c6" bpmnElement="sid-75a8afef-26b1-4dce-9ad9-4a1d4efff08c">
- <omgdc:Bounds x="-10.0" y="5.0" width="30.0" height="30.0"/>
+ <omgdc:Bounds x="85.0" y="50.0" width="30.0" height="30.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="edge-57d6332c-3cbf-48e6-ac07-a81e31a72155" bpmnElement="sid-c86f3a13-5e74-423a-b80d-19ef482eb9e1">
<omgdi:waypoint x="-100.0" y="28.75"/>
- <omgdi:waypoint x="-50.0" y="20.0"/>
- <omgdi:waypoint x="-10.0" y="12.5"/>
+ <omgdi:waypoint x="-60.0" y="50.0"/>
+ <omgdi:waypoint x="-35.0" y="56.25"/>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="shape-54d1b102-8869-4675-93a6-2cb479d0dd4a" bpmnElement="exceptionHandleTask">
+ <omgdc:Bounds x="-35.0" y="22.5" width="55.0" height="45.0"/>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="edge-6e56e84b-e2e7-418d-ae90-e4117c63938f" bpmnElement="sid-bb78fe61-b286-4147-ae83-9e95f8d39afe">
+ <omgdi:waypoint x="20.0" y="56.25"/>
+ <omgdi:waypoint x="85.0" y="57.5"/>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
--
Gitblit v1.9.3