From 5c94d425e13217ecf98411703276e2e751497dac Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 24 六月 2025 22:18:56 +0800
Subject: [PATCH] 机床回传文件增加excel导出
---
blade-service/blade-mdm/src/main/resources/processesbpmn/program-cure.bpmn20.xml | 69 ++++++++++++++++++++++++++++++----
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 4 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java | 4 +-
3 files changed, 66 insertions(+), 11 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
index de98c65..14295ab 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
@@ -49,6 +49,10 @@
vars.put("machineCode",machine.getCode());
vars.put("machineMode",machine.getName());
vars.put("processEdition",prog.getProcessEdition());
+ vars.put("programId",prog.getProcessEdition());
+ vars.put("program",prog);
+
+
//vars.put("processNo",startVO.getProcessNo());prog.getProcessEdition()
//vars.put("processName",startVO.getProcessName());
/*
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
index fc62cc6..970cd82 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
@@ -29,7 +29,7 @@
@RestController
@RequestMapping("/program/dncsendback/")
@AllArgsConstructor
-@Tag(name = "DNC鍥炰紶绋嬪簭鎺ュ彛", description = "DNC鍥炰紶绋嬪簭鎺ュ彛")
+@Tag(name = "DNC瀵煎叆", description = "DNC瀵煎叆鎺ュ彛")
@Slf4j
public class DncSendBackController {
@@ -42,7 +42,7 @@
*/
@PostMapping("upload")
@ApiOperationSupport(order = 1)
- @Operation(summary = "涓婁紶DNC鍥炰紶鏂囦欢", description = "鍥炰紶瀵煎叆")
+ @Operation(summary = "涓婁紶鏂囦欢", description = "涓婁紶DNC鍥炰紶鏂囦欢")
public R<Void> dncSendBackUpload(@RequestParam MultipartFile file) {
try {
ncProgramExchangeService.dncSendBackUpload(file);
diff --git a/blade-service/blade-mdm/src/main/resources/processesbpmn/program-cure.bpmn20.xml b/blade-service/blade-mdm/src/main/resources/processesbpmn/program-cure.bpmn20.xml
index 94361e8..f253164 100644
--- a/blade-service/blade-mdm/src/main/resources/processesbpmn/program-cure.bpmn20.xml
+++ b/blade-service/blade-mdm/src/main/resources/processesbpmn/program-cure.bpmn20.xml
@@ -7,8 +7,30 @@
<sequenceFlow id="sid-09c7cf44-bb1a-40f4-b231-919afae5c02f" sourceRef="sid-abe970b9-1bee-49a1-91b4-1184c47c10b7" targetRef="cureProgramTask"/>
<endEvent id="end" name="鍥哄寲缁撴潫"/>
<userTask id="seniorApproveTask" name="楂樺笀瀹℃牳"/>
- <sequenceFlow id="sid-8dd21f02-ac10-4318-b897-19b4cdc558c7" sourceRef="cureProgramTask" targetRef="seniorApproveTask"/>
- <sequenceFlow id="sid-504610fe-2b87-4df4-8f42-f10c8bf3ce01" sourceRef="seniorApproveTask" targetRef="end"/>
+ <sequenceFlow id="sid-8dd21f02-ac10-4318-b897-19b4cdc558c7" sourceRef="cureProgramTask" targetRef="cureCheckTask">
+ <conditionExpression>${approve=='Y'}</conditionExpression>
+ </sequenceFlow>
+ <sequenceFlow id="sid-504610fe-2b87-4df4-8f42-f10c8bf3ce01" sourceRef="seniorApproveTask" targetRef="cureOKOperateTask">
+ <conditionExpression>${approve=='Y'</conditionExpression>
+ </sequenceFlow>
+ <userTask id="cureCheckTask" name="鍥哄寲鏍″"/>
+ <sequenceFlow id="sid-b4ad2b36-5fcc-4449-924b-55b0425b1278" sourceRef="cureCheckTask" targetRef="cureProgramTask">
+ <conditionExpression>${approve=='N'</conditionExpression>
+ </sequenceFlow>
+ <sequenceFlow id="sid-f626de1f-b668-49b8-bd06-6e8039abf2fc" sourceRef="cureCheckTask" targetRef="seniorApproveTask">
+ <conditionExpression>${approve=='Y'</conditionExpression>
+ </sequenceFlow>
+ <endEvent id="cureProgramingNoEnd" name="鍥哄寲缂栧埗缁撴潫"/>
+ <sequenceFlow id="sid-a3a0654d-e9fd-4814-a1bd-384dce8a3b7a" sourceRef="cureProgramTask" targetRef="cureProgramingNoEnd">
+ <conditionExpression>${approve=='N'</conditionExpression>
+ </sequenceFlow>
+ <sequenceFlow id="sid-c04cc547-0baf-4514-8056-54b1612cdefd" sourceRef="seniorApproveTask" targetRef="cureCheckTask">
+ <conditionExpression>${approve=='N'}</conditionExpression>
+ </sequenceFlow>
+ <serviceTask id="cureOKOperateTask" flowable:exclusive="true" name="鍥哄寲澶勭悊浠诲姟">
+ <documentation>璁剧疆鏁版嵁鐨勫浐鍖栨爣蹇楋紝鐢熸垚鍥哄寲绋嬪簭鍒楄〃</documentation>
+ </serviceTask>
+ <sequenceFlow id="sid-253f5be1-3275-47d6-a3a1-5d1eaf01ec79" sourceRef="cureOKOperateTask" targetRef="end"/>
</process>
<bpmndi:BPMNDiagram id="BPMNDiagram_program-cure">
<bpmndi:BPMNPlane bpmnElement="program-cure" id="BPMNPlane_program-cure">
@@ -16,15 +38,15 @@
<omgdc:Bounds x="-215.0" y="-85.0" width="30.0" height="30.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="shape-702fceb1-2073-4a25-a94d-86c2392dfc6f" bpmnElement="cureProgramTask">
- <omgdc:Bounds x="-110.0" y="-95.0" width="75.0" height="55.0"/>
+ <omgdc:Bounds x="-130.0" y="-97.5" width="75.0" height="55.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="edge-fbb946ca-a477-4237-b78f-72cf4e0b8479" bpmnElement="sid-910649a5-8dac-48a2-b42d-9f1132d61b26">
- <omgdi:waypoint x="-110.0" y="-67.5"/>
- <omgdi:waypoint x="-110.0" y="-67.5"/>
+ <omgdi:waypoint x="-130.0" y="-70.0"/>
+ <omgdi:waypoint x="-130.0" y="-70.0"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="edge-53030742-9070-4825-949f-edc502019050" bpmnElement="sid-09c7cf44-bb1a-40f4-b231-919afae5c02f">
<omgdi:waypoint x="-185.0" y="-77.5"/>
- <omgdi:waypoint x="-110.0" y="-81.25"/>
+ <omgdi:waypoint x="-130.0" y="-83.75"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="shape-99ebb425-cb2f-45f3-93e2-4ca390bc8099" bpmnElement="end">
<omgdc:Bounds x="190.0" y="-82.5" width="30.0" height="30.0"/>
@@ -33,12 +55,41 @@
<omgdc:Bounds x="25.0" y="-95.0" width="65.0" height="35.0"/>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="edge-94601323-c6bd-48f8-94fd-f61c6b550126" bpmnElement="sid-8dd21f02-ac10-4318-b897-19b4cdc558c7">
- <omgdi:waypoint x="-35.0" y="-67.5"/>
- <omgdi:waypoint x="25.0" y="-68.75"/>
+ <omgdi:waypoint x="-55.0" y="-70.0"/>
+ <omgdi:waypoint x="-18.75" y="-30.0"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="edge-b93559c6-90f6-46e1-a6e6-4b0a2a5bc33b" bpmnElement="sid-504610fe-2b87-4df4-8f42-f10c8bf3ce01">
<omgdi:waypoint x="90.0" y="-68.75"/>
- <omgdi:waypoint x="190.0" y="-67.5"/>
+ <omgdi:waypoint x="110.0" y="-30.0"/>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="shape-973e6efe-200d-4455-b93a-291f4275cff3" bpmnElement="cureCheckTask">
+ <omgdc:Bounds x="-35.0" y="-30.0" width="65.0" height="55.0"/>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="edge-647fdbd6-6c23-4065-b2a9-481064f87e66" bpmnElement="sid-b4ad2b36-5fcc-4449-924b-55b0425b1278">
+ <omgdi:waypoint x="-35.0" y="-16.25"/>
+ <omgdi:waypoint x="-111.25" y="-42.5"/>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="edge-a7d3717d-3b8b-45d5-9c16-cc9384d91ad4" bpmnElement="sid-f626de1f-b668-49b8-bd06-6e8039abf2fc">
+ <omgdi:waypoint x="13.75" y="-30.0"/>
+ <omgdi:waypoint x="25.0" y="-68.75"/>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="shape-b240ebd6-4961-477a-9621-67f9b92bde64" bpmnElement="cureProgramingNoEnd">
+ <omgdc:Bounds x="-160.0" y="-5.0" width="30.0" height="30.0"/>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="edge-d760db6d-fd9f-435e-8d42-3613cb75be57" bpmnElement="sid-a3a0654d-e9fd-4814-a1bd-384dce8a3b7a">
+ <omgdi:waypoint x="-130.0" y="-56.25"/>
+ <omgdi:waypoint x="-137.5" y="-5.0"/>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="edge-5c7dd10c-358c-4088-8af7-4d2ada7247db" bpmnElement="sid-c04cc547-0baf-4514-8056-54b1612cdefd">
+ <omgdi:waypoint x="41.25" y="-60.0"/>
+ <omgdi:waypoint x="30.0" y="-16.25"/>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="shape-3fd20ebd-d032-45ac-b790-0e96cfa030ff" bpmnElement="cureOKOperateTask">
+ <omgdc:Bounds x="110.0" y="-42.5" width="65.0" height="50.0"/>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="edge-8d82a390-1882-4936-b824-4d3cf309c628" bpmnElement="sid-253f5be1-3275-47d6-a3a1-5d1eaf01ec79">
+ <omgdi:waypoint x="175.0" y="-30.0"/>
+ <omgdi:waypoint x="197.5" y="-52.5"/>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
--
Gitblit v1.9.3