From 80a641659a361c9f55c57936daca0a1790f777d5 Mon Sep 17 00:00:00 2001 From: yangys <y_ys79@sina.com> Date: 星期四, 12 六月 2025 22:55:06 +0800 Subject: [PATCH] 机床组改为字典 --- blade-service/blade-mdm/src/main/resources/processesbpmn/dispatch.bpmn20.xml | 92 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 73 insertions(+), 19 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 109f35d..549a53d 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 @@ -7,11 +7,32 @@ <userTask id="programmingTask" name="缂栧埗" flowable:assignee="${programmer}"/> <sequenceFlow id="sid-ac678e85-9f7b-4e8d-903f-2591ea7721ab" sourceRef="teamLeaderTask" targetRef="programmingTask"/> <userTask id="check" name="鏍″" flowable:assignee="${checker}"/> - <sequenceFlow id="sid-6c33a84d-d03e-47f6-87c1-8e676b25e572" sourceRef="programmingTask" targetRef="check"/> - <userTask id="approveTask" name="楂樺笀瀹℃壒"/> - <sequenceFlow id="sid-2e73fc3f-6802-4a94-984c-e1b9a50f8489" sourceRef="check" targetRef="approveTask"/> + <sequenceFlow id="sid-6c33a84d-d03e-47f6-87c1-8e676b25e572" sourceRef="programmingTask" targetRef="programGateway"/> + <userTask id="approveTask" name="楂樺笀瀹℃壒" flowable:assignee="${senior}"/> + <sequenceFlow id="toCheckApproveGateway" sourceRef="check" targetRef="checkApproveGateway" name="鏍″瀹℃壒鍒ゆ柇缃戝叧"/> <endEvent id="approveEnd" name="瀹℃壒瀹屾垚"/> - <sequenceFlow id="sid-1a414739-a80f-4436-8d7a-e7b65fae8233" sourceRef="approveTask" targetRef="approveEnd"/> + <sequenceFlow id="sid-1a414739-a80f-4436-8d7a-e7b65fae8233" sourceRef="approveTask" targetRef="seriorApproveGateway"/> + <exclusiveGateway id="programGateway" name="缂栧埗瀹屾垚鍒ゆ柇缃戝叧"/> + <sequenceFlow id="programingToCheck" sourceRef="programGateway" targetRef="check" name="缂栧埗瀹屾垚缁欐牎瀵�"> + <conditionExpression xsi:type="tFormalExpression">${approve=='Y'}</conditionExpression> + </sequenceFlow> + <sequenceFlow id="programingBackToLeader" sourceRef="programGateway" targetRef="teamLeaderTask" name="缂栧埗椹冲洖"> + <conditionExpression xsi:type="tFormalExpression">${approve=='N'}</conditionExpression> + </sequenceFlow> + <exclusiveGateway id="checkApproveGateway" name="鏍″瀹℃壒鍒ゆ柇缃戝叧"/> + <sequenceFlow id="flowCheckToPrograming" sourceRef="checkApproveGateway" targetRef="programmingTask" name="flow鏍″椹冲洖鍒扮紪鍒�"> + <conditionExpression xsi:type="tFormalExpression">${approve=='N'}</conditionExpression> + </sequenceFlow> + <sequenceFlow id="flowToSeriorTask" sourceRef="checkApproveGateway" targetRef="approveTask" name="鍒伴珮甯堝鎵�"> + <conditionExpression xsi:type="tFormalExpression">${approve=='Y'}</conditionExpression> + </sequenceFlow> + <exclusiveGateway id="seriorApproveGateway" name="楂樺笀鍒ゆ柇缃戝叧"/> + <sequenceFlow id="sid-c0b195e7-17e5-44bf-8115-8b7126cb3ab3" sourceRef="seriorApproveGateway" targetRef="approveEnd"> + <conditionExpression xsi:type="tFormalExpression">${approve=='Y'}</conditionExpression> + </sequenceFlow> + <sequenceFlow id="sid-03430665-d042-46b3-ab65-5ecde104ce8e" sourceRef="seriorApproveGateway" targetRef="check"> + <conditionExpression xsi:type="tFormalExpression"/> + </sequenceFlow> </process> <bpmndi:BPMNDiagram id="BPMNDiagram_dispatch"> <bpmndi:BPMNPlane bpmnElement="dispatch" id="BPMNPlane_dispatch"> @@ -20,38 +41,71 @@ </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="edge-5783eb04-78a8-4bde-b8bb-c12d28f07609" bpmnElement="sid-c1619263-d1ff-4106-9315-f9ab9a3bee71"> <omgdi:waypoint x="-290.0" y="-92.5"/> - <omgdi:waypoint x="-185.0" y="-75.0"/> + <omgdi:waypoint x="-240.0" y="-92.5"/> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="shape-720b1ec1-043e-4a8a-bc4d-c50cf01678d7" bpmnElement="teamLeaderTask"> - <omgdc:Bounds x="-185.0" y="-115.0" width="100.0" height="80.0"/> + <omgdc:Bounds x="-240.0" y="-125.0" width="70.0" height="65.0"/> </bpmndi:BPMNShape> <bpmndi:BPMNShape id="shape-b1baea86-1882-4c5c-886f-44e3d9be3746" bpmnElement="programmingTask"> - <omgdc:Bounds x="-20.0" y="-115.0" width="100.0" height="80.0"/> + <omgdc:Bounds x="-115.0" y="-122.5" width="85.0" height="60.0"/> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="edge-0079d499-1c0d-4745-9886-40df39794833" bpmnElement="sid-ac678e85-9f7b-4e8d-903f-2591ea7721ab"> - <omgdi:waypoint x="-85.0" y="-75.0"/> - <omgdi:waypoint x="-20.0" y="-75.0"/> + <omgdi:waypoint x="-170.0" y="-92.5"/> + <omgdi:waypoint x="-115.0" y="-92.5"/> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="shape-9237838e-5de2-4db7-8d46-3f4a69de7e6e" bpmnElement="check"> - <omgdc:Bounds x="105.0" y="-115.0" width="100.0" height="80.0"/> + <omgdc:Bounds x="85.0" y="-120.0" width="60.0" height="55.0"/> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="edge-72007fd8-6ed8-402f-8bbc-81bd6c856fa7" bpmnElement="sid-6c33a84d-d03e-47f6-87c1-8e676b25e572"> - <omgdi:waypoint x="80.0" y="-55.0"/> - <omgdi:waypoint x="105.0" y="-95.0"/> + <omgdi:waypoint x="-30.0" y="-77.5"/> + <omgdi:waypoint x="-30.0" y="-15.0"/> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="shape-a42e90ff-9c82-4d5b-8f5b-0804754e89a6" bpmnElement="approveTask"> - <omgdc:Bounds x="15.0" y="16.0" width="100.0" height="80.0"/> + <omgdc:Bounds x="130.0" y="1.0" width="50.0" height="45.0"/> </bpmndi:BPMNShape> - <bpmndi:BPMNEdge id="edge-7fe1281a-3bbf-4308-90a5-cbf70aa019dd" bpmnElement="sid-2e73fc3f-6802-4a94-984c-e1b9a50f8489"> - <omgdi:waypoint x="130.0" y="-35.0"/> - <omgdi:waypoint x="90.0" y="16.0"/> + <bpmndi:BPMNEdge id="edge-7fe1281a-3bbf-4308-90a5-cbf70aa019dd" bpmnElement="toCheckApproveGateway"> + <omgdi:waypoint x="145.0" y="-92.5"/> + <omgdi:waypoint x="240.0" y="-30.0"/> </bpmndi:BPMNEdge> <bpmndi:BPMNShape id="shape-f14acaf6-9747-4d52-87a1-d4c5b8f3d166" bpmnElement="approveEnd"> - <omgdc:Bounds x="205.0" y="41.0" width="30.0" height="30.0"/> + <omgdc:Bounds x="245.0" y="51.0" width="30.0" height="30.0"/> </bpmndi:BPMNShape> <bpmndi:BPMNEdge id="edge-9cb8c108-2b94-4e39-b7ed-93ff0d86fe73" bpmnElement="sid-1a414739-a80f-4436-8d7a-e7b65fae8233"> - <omgdi:waypoint x="115.0" y="56.0"/> - <omgdi:waypoint x="205.0" y="56.0"/> + <omgdi:waypoint x="130.0" y="34.75"/> + <omgdi:waypoint x="55.0" y="70.0"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="shape-b505d942-4475-416a-aec6-c02164e6ee05" bpmnElement="programGateway"> + <omgdc:Bounds x="-50.0" y="-15.0" width="40.0" height="40.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="edge-6f05f47f-7804-4dd0-b6d2-e435b9efaa3c" bpmnElement="programingToCheck"> + <omgdi:waypoint x="-10.0" y="5.0"/> + <omgdi:waypoint x="85.0" y="-78.75"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="edge-b38a8021-a54d-4671-aaf2-408bdbbbd374" bpmnElement="programingBackToLeader"> + <omgdi:waypoint x="-50.0" y="5.0"/> + <omgdi:waypoint x="-170.0" y="-76.25"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="shape-b113f604-a178-455b-9518-9f4953322948" bpmnElement="checkApproveGateway"> + <omgdc:Bounds x="220.0" y="-30.0" width="40.0" height="40.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="edge-c2232174-4a73-4c39-ac85-fc3854f0f18c" bpmnElement="flowCheckToPrograming"> + <omgdi:waypoint x="220.0" y="-10.0"/> + <omgdi:waypoint x="-30.0" y="-92.5"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="edge-d05b5f9f-9108-4a41-9e48-4db1e1b1e325" bpmnElement="flowToSeriorTask"> + <omgdi:waypoint x="240.0" y="10.0"/> + <omgdi:waypoint x="180.0" y="12.25"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNShape id="shape-6be62567-0538-4a4f-b3ce-e819d7182666" bpmnElement="seriorApproveGateway"> + <omgdc:Bounds x="35.0" y="70.0" width="40.0" height="40.0"/> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="edge-715efa53-6c03-407b-87ec-640f99c481a0" bpmnElement="sid-c0b195e7-17e5-44bf-8115-8b7126cb3ab3"> + <omgdi:waypoint x="75.0" y="90.0"/> + <omgdi:waypoint x="245.0" y="73.5"/> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="edge-782277fd-866f-44d5-9046-af7c34c4b85c" bpmnElement="sid-03430665-d042-46b3-ab65-5ecde104ce8e"> + <omgdi:waypoint x="35.0" y="90.0"/> + <omgdi:waypoint x="100.0" y="-65.0"/> </bpmndi:BPMNEdge> </bpmndi:BPMNPlane> </bpmndi:BPMNDiagram> -- Gitblit v1.9.3