From fc588c6e5ccac038cab378931d9bac3033e28f98 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 04 七月 2025 11:29:16 +0800
Subject: [PATCH] 增加产品型号
---
blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml | 88 +++++++++++++++++--------------------------
1 files changed, 35 insertions(+), 53 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml b/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml
index 69752fa..8d30a0c 100644
--- a/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml
+++ b/blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml
@@ -3,11 +3,19 @@
<process id="dispatch" name="浠诲姟娲惧伐" isExecutable="true">
<startEvent id="start" name="寮�濮�"/>
<sequenceFlow id="sid-c1619263-d1ff-4106-9315-f9ab9a3bee71" sourceRef="start" targetRef="teamLeaderTask"/>
- <userTask id="teamLeaderTask" name="涓撲笟缁勯暱" flowable:assignee="${teamLeader}"/>
- <userTask id="programmingTask" name="缂栧埗" flowable:assignee="${programmer}"/>
- <userTask id="check" name="鏍″" flowable:assignee="${checker}"/>
- <userTask id="approveTask" name="楂樺笀瀹℃壒" flowable:assignee="${senior}"/>
- <endEvent id="approveEnd" name="瀹℃壒瀹屾垚"/>
+ <userTask id="teamLeaderTask" name="浠诲姟鍒嗘淳" flowable:assignee="${teamLeader}">
+ <documentation>涓撲笟缁勯暱浠诲姟鍒嗘淳</documentation>
+ </userTask>
+ <userTask id="programmingTask" name="鏁版帶绋嬪簭缂栧啓" flowable:assignee="${assignee}"/>
+ <userTask id="check" name="鏁版帶绋嬪簭鏍″" flowable:assignee="${assignee}"/>
+ <userTask id="approveTask" name="鏁版帶绋嬪簭瀹℃壒" flowable:assignee="${assignee}">
+ <documentation>楂樺笀鏁版帶绋嬪簭瀹℃壒</documentation>
+ </userTask>
+ <endEvent id="approveEnd" name="瀹℃壒瀹屾垚">
+ <extensionElements>
+ <flowable:executionListener expression="${dispatchFinishListener.handle(execution)}" event="end"/>
+ </extensionElements>
+ </endEvent>
<sequenceFlow id="programingToCheck" sourceRef="programmingTask" targetRef="check" name="缂栧埗瀹屾垚缁欐牎瀵�">
<conditionExpression xsi:type="tFormalExpression">${approve=='Y'}</conditionExpression>
</sequenceFlow>
@@ -24,32 +32,23 @@
<conditionExpression xsi:type="tFormalExpression">${approve=='Y'}</conditionExpression>
</sequenceFlow>
<serviceTask id="cureCheckServiceTask" flowable:exclusive="true" name="鍥哄寲绋嬪簭妫�鏌ユ湇鍔′换鍔�" flowable:expression="cureProgramCheckTask.execute(execution)"/>
- <userTask id="sid-015ac835-1083-489a-9496-97dbb9432d09" name="妫�鏌ョ▼搴忔槸鍚﹀彲鐢�"/>
+ <userTask id="confirmIsUseableTask" name="妫�鏌ョ▼搴忔槸鍚﹀彲鐢�" flowable:assignee="${assignee}"/>
<sequenceFlow id="sid-46ccac64-2d48-4933-88a6-f2941ae131dd" sourceRef="teamLeaderTask" targetRef="programmingTask">
- <conditionExpression xsi:type="tFormalExpression">hasCuredProgram==鈥楴'</conditionExpression>
+ <conditionExpression xsi:type="tFormalExpression">${approve=='Y' && hasCuredProgram=='N'}</conditionExpression>
</sequenceFlow>
<sequenceFlow id="sid-af92e6ab-bc80-43ed-8b09-1d3ec54cc9e7" sourceRef="teamLeaderTask" targetRef="cureCheckServiceTask">
- <conditionExpression xsi:type="tFormalExpression">hasCuredProgram==鈥榊'</conditionExpression>
+ <conditionExpression xsi:type="tFormalExpression">${approve=='Y' && hasCuredProgram=='Y'}</conditionExpression>
</sequenceFlow>
- <sequenceFlow id="sid-353381d5-35c7-47b0-bf5b-2bafe865ab5e" sourceRef="cureCheckServiceTask" targetRef="sid-015ac835-1083-489a-9496-97dbb9432d09"/>
- <sequenceFlow id="sid-d144dad0-dc94-4a2b-96d6-9d8451b05ec1" sourceRef="sid-015ac835-1083-489a-9496-97dbb9432d09" targetRef="sid-82237034-5cb2-45c7-9a74-e2d5abb3b398" name="鍥哄寲绋嬪簭鍙敤">
- <conditionExpression>approve=='Y'</conditionExpression>
+ <sequenceFlow id="sid-353381d5-35c7-47b0-bf5b-2bafe865ab5e" sourceRef="cureCheckServiceTask" targetRef="confirmIsUseableTask"/>
+ <sequenceFlow id="sid-d144dad0-dc94-4a2b-96d6-9d8451b05ec1" sourceRef="confirmIsUseableTask" targetRef="check" name="鍥哄寲绋嬪簭鍙敤">
+ <conditionExpression>${approve=='Y'}</conditionExpression>
</sequenceFlow>
<sequenceFlow id="sid-d4133565-1a45-4bb6-b603-9b9e4db1cdbb" sourceRef="approveTask" targetRef="check">
- <conditionExpression>{approve=='N'}</conditionExpression>
+ <conditionExpression>${approve=='N'}</conditionExpression>
</sequenceFlow>
- <exclusiveGateway id="sid-82237034-5cb2-45c7-9a74-e2d5abb3b398" name="鍙敤绋嬪簭娴佽浆缃戝叧"/>
- <sequenceFlow id="sid-b15dcf6a-a48c-4e01-b6bc-5c2a74ca817e" sourceRef="sid-82237034-5cb2-45c7-9a74-e2d5abb3b398" targetRef="check" name="宸ュ簭鐗堟涓�鑷村苟涓斿彲鐢�">
- <conditionExpression xsi:type="tFormalExpression">processEditionEqual=='Y'</conditionExpression>
+ <sequenceFlow id="sid-80b50f96-7601-4ba2-8c32-968923170d25" sourceRef="confirmIsUseableTask" targetRef="programmingTask">
+ <conditionExpression>${approve=='N'}</conditionExpression>
</sequenceFlow>
- <sequenceFlow id="sid-6249886b-7c4a-4904-9b0b-cf743932be9f" sourceRef="sid-82237034-5cb2-45c7-9a74-e2d5abb3b398" targetRef="emptyUpgradeProcessEdtionServiceTask">
- <conditionExpression xsi:type="tFormalExpression">processEditionEqual=='N'</conditionExpression>
- </sequenceFlow>
- <sequenceFlow id="sid-598e1dbe-85b3-40d0-89c8-bd2580ecbfc5" sourceRef="emptyUpgradeProcessEdtionServiceTask" targetRef="check"/>
- <sequenceFlow id="sid-80b50f96-7601-4ba2-8c32-968923170d25" sourceRef="sid-015ac835-1083-489a-9496-97dbb9432d09" targetRef="programmingTask">
- <conditionExpression>approve=='N'</conditionExpression>
- </sequenceFlow>
- <serviceTask id="emptyUpgradeProcessEdtionServiceTask" flowable:exclusive="true" name="绌哄崌鐗�" flowable:expression="programEmptyUpgradeProcessEdtionTask.execute(execution)"/>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_dispatch">
<bpmndi:BPMNPlane bpmnElement="dispatch" id="BPMNPlane_dispatch">
@@ -70,10 +69,10 @@
<omgdc:Bounds x="130.0" y="-135.0" width="60.0" height="55.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="shape-a42e90ff-9c82-4d5b-8f5b-0804754e89a6" bpmnElement="approveTask">
- <omgdc:Bounds x="220.0" y="-14.0" width="50.0" height="45.0"/>
+ <omgdc:Bounds x="130.0" y="-4.0" width="50.0" height="45.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="shape-f14acaf6-9747-4d52-87a1-d4c5b8f3d166" bpmnElement="approveEnd">
- <omgdc:Bounds x="245.0" y="51.0" width="30.0" height="30.0"/>
+ <omgdc:Bounds x="295.0" y="-6.5" width="30.0" height="30.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="edge-6f05f47f-7804-4dd0-b6d2-e435b9efaa3c" bpmnElement="programingToCheck">
<omgdi:waypoint x="12.5" y="-92.5"/>
@@ -89,20 +88,21 @@
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="edge-d05b5f9f-9108-4a41-9e48-4db1e1b1e325" bpmnElement="flowToSeriorTask">
<omgdi:waypoint x="190.0" y="-93.75"/>
- <omgdi:waypoint x="270.0" y="-2.75"/>
+ <omgdi:waypoint x="180.0" y="7.25"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="edge-715efa53-6c03-407b-87ec-640f99c481a0" bpmnElement="sid-c0b195e7-17e5-44bf-8115-8b7126cb3ab3">
- <omgdi:waypoint x="270.0" y="19.749996"/>
- <omgdi:waypoint x="245.0" y="58.5"/>
+ <omgdi:waypoint x="180.0" y="29.749996"/>
+ <omgdi:waypoint x="295.0" y="1.0"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="shape-8455618d-c1b9-4e6a-bca4-de965cc81633" bpmnElement="cureCheckServiceTask">
<omgdc:Bounds x="-275.0" y="37.500004" width="65.0" height="39.999996"/>
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="shape-8f7064fc-4838-44cc-bf6d-ca15932a1e2e" bpmnElement="sid-015ac835-1083-489a-9496-97dbb9432d09">
- <omgdc:Bounds x="-165.0" y="37.5" width="55.0" height="40.0"/>
+ <bpmndi:BPMNShape id="shape-8f7064fc-4838-44cc-bf6d-ca15932a1e2e" bpmnElement="confirmIsUseableTask">
+ <omgdc:Bounds x="-135.0" y="37.5" width="55.0" height="40.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="edge-0408fc3c-c133-40e3-9006-c315b12e9790" bpmnElement="sid-46ccac64-2d48-4933-88a6-f2941ae131dd">
<omgdi:waypoint x="-192.5" y="-92.500015"/>
+ <omgdi:waypoint x="-132.5" y="-100.0"/>
<omgdi:waypoint x="-72.49999" y="-107.50001"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="edge-d8883eca-269a-42cd-b2d4-134da6596afb" bpmnElement="sid-af92e6ab-bc80-43ed-8b09-1d3ec54cc9e7">
@@ -111,38 +111,20 @@
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="edge-44016aa6-bf48-4c73-8aaa-4cedf795d68b" bpmnElement="sid-353381d5-35c7-47b0-bf5b-2bafe865ab5e">
<omgdi:waypoint x="-210.0" y="57.5"/>
- <omgdi:waypoint x="-165.0" y="57.5"/>
+ <omgdi:waypoint x="-135.0" y="57.5"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="edge-64e64024-1ffd-4cdf-be8f-4c5e4911a5bb" bpmnElement="sid-d144dad0-dc94-4a2b-96d6-9d8451b05ec1">
- <omgdi:waypoint x="-110.0" y="47.5"/>
- <omgdi:waypoint x="-60.0" y="0.0"/>
+ <omgdi:waypoint x="-80.0" y="47.5"/>
+ <omgdi:waypoint x="145.0" y="-80.00001"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="edge-7a5135fe-5eb1-425c-b920-3e2b5bf18454" bpmnElement="sid-d4133565-1a45-4bb6-b603-9b9e4db1cdbb">
- <omgdi:waypoint x="257.5" y="-14.0"/>
+ <omgdi:waypoint x="167.5" y="-4.0"/>
<omgdi:waypoint x="175.0" y="-80.0"/>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="shape-50f64465-52e3-4ba9-b36d-ebac41ab8b22" bpmnElement="sid-82237034-5cb2-45c7-9a74-e2d5abb3b398">
- <omgdc:Bounds x="-60.0" y="-20.0" width="40.0" height="40.0"/>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="edge-4b95c6df-601d-48e8-a9a4-98499ae5ddf3" bpmnElement="sid-b15dcf6a-a48c-4e01-b6bc-5c2a74ca817e">
- <omgdi:waypoint x="-20.0" y="0.0"/>
- <omgdi:waypoint x="130.0" y="-93.75"/>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="edge-dbb7a807-e493-42fe-b229-b9f2ec25b5ee" bpmnElement="sid-6249886b-7c4a-4904-9b0b-cf743932be9f">
- <omgdi:waypoint x="-40.0" y="20.0"/>
- <omgdi:waypoint x="30.0" y="57.5"/>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="edge-092f7d8d-2467-4794-af93-fdc9ad503923" bpmnElement="sid-598e1dbe-85b3-40d0-89c8-bd2580ecbfc5">
- <omgdi:waypoint x="86.25" y="30.0"/>
- <omgdi:waypoint x="145.0" y="-79.99999"/>
- </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="edge-223da197-47f2-44ef-847e-40d1fae1009b" bpmnElement="sid-80b50f96-7601-4ba2-8c32-968923170d25">
- <omgdi:waypoint x="-123.75" y="37.5"/>
+ <omgdi:waypoint x="-93.75" y="37.5"/>
<omgdi:waypoint x="-51.25" y="-77.5"/>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="shape-0fe942f6-dea9-427c-aef6-0db9c3e3707b" bpmnElement="emptyUpgradeProcessEdtionServiceTask">
- <omgdc:Bounds x="30.0" y="30.0" width="75.0" height="55.0"/>
- </bpmndi:BPMNShape>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</definitions>
--
Gitblit v1.9.3