From 18d9c0bdc04e71cf3903c30c139f59dab744cf3f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 15:09:35 +0800
Subject: [PATCH] 偏离回传 流程改名
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 20 --------------------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 16 ++++++----------
2 files changed, 6 insertions(+), 30 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 f71268b..c8403f4 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
@@ -61,8 +61,7 @@
NcNode programPackage = this.ncNodeService.getById(nodeId);
vars.put(FlowContants.NODE_ID,programPackage.getId());
vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
- //鏈哄簥鍨嬪彿
- //vars.put(FlowContants.MACHINE_MODE,programPackage.getm);
+
//鏈哄簥鍨嬪彿
Machine machine = machineService.getByCode(programPackage.getMachineCode());
if(machine != null) {
@@ -82,13 +81,7 @@
vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
- /*
- vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
- vars.put(FlowContants.CHECKER,div.getCheckerId());
- vars.put(FlowContants.SENIOR,div.getSeniorId());
- vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
- */
flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
//ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
vars.put(FlowContants.ASSIGNEE,vars.get(FlowContants.PROGRAMMER));
@@ -99,8 +92,11 @@
vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
vars.put(FlowContants.TITLE,programPackage.getName()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
- vars.put(FlowContants.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
-
+ if(programPackage.getDeviation() != null) {
+ vars.put(FlowContants.MY_PROCESS_NAME, "鍋忕鍥炰紶");
+ }else {
+ vars.put(FlowContants.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
+ }
ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);
//鏇存柊绋嬪簭鍖呭悕鑺傜偣鐨勬祦绋嬪疄渚媔d
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
index e5c132e..9d7da5f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
@@ -78,7 +78,6 @@
bladeRedis.setEx(getFileKey(),bfile.getName(), Duration.ofHours(2));
try(InputStream zipFileInputStream = ossTemplate.statFileStream(bfile.getName());) {
- //InputStream zipFileInputStream = file.getInputStream();//test
list = parseProgramListFromZip(zipFileInputStream);
}
} catch (IOException e) {
@@ -211,27 +210,8 @@
String zipFileName = bladeRedis.get(filekey);
log.info("filekey={},鏂囦欢鍚�={}",filekey,zipFileName);
- //Map<Long,List<NcNode>> programPackageSubMap = new HashMap<>();
-
Map<Long,List<FlowProgramFile>> pkgIdFileMap = dealWithBackFile(zipFileName,acceptIdList);
- ///List<NcNode> newProgramPackageList = updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
- //updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
- /*
- log.info("闇�瑕佸惎鍔ㄥ浐鍖栨祦绋嬬殑绋嬪簭鍖呭悕鏁伴噺:{}",newProgramPackageList.size());
- for(NcNode pkgNode :newProgramPackageList){
- exchange = new NcProgramExchange();
- exchange.setName(pkgNode.getName());
- exchange.setExchangeType(2);//鍥炰紶
- exchange.setNcNodeId(pkgNode.getId());
-
- this.save(exchange);
- }*/
- //bladeRedis.del(filekey);
- //this.ossTemplate.removeFile(zipFileName);
- //log.info("鍒犻櫎oss鏂囦欢:{}",zipFileName);
-
- //cureFlowService.startCure(newProgramPackageList,programPackageSubMap);
cureFlowService.startCureNew(pkgIdFileMap);
}
--
Gitblit v1.9.3