From 30cb19306570b0838bbc5ec7e01377f3d17b4281 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 21 六月 2025 20:03:51 +0800
Subject: [PATCH] ncNode增加字段
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 91 ++++++++++++++++++++++++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 5 -
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DncSendBackService.java | 9 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java | 12 +--
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java | 16 -----
5 files changed, 105 insertions(+), 28 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
new file mode 100644
index 0000000..6b01c31
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
@@ -0,0 +1,91 @@
+package org.springblade.mdm.flow.service;
+
+import org.flowable.engine.IdentityService;
+import org.flowable.engine.RuntimeService;
+import org.flowable.engine.runtime.ProcessInstance;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.mdm.flow.excution.AutoAssignUsersService;
+import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.program.entity.NcProgram;
+import org.springblade.mdm.program.service.NcProgramService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 鍥哄寲娴佺▼鏈嶅姟
+ */
+@Service
+public class CureFlowService {
+
+ @Autowired
+ private RuntimeService runtimeService;
+ @Autowired
+ private AutoAssignUsersService autoAssignUsersService;
+ @Autowired
+ private IdentityService identityService;
+
+ @Autowired
+ private NcProgramService ncProgramService;
+ /**
+ * 鍥哄寲娴佺▼鐨刱ey
+ */
+ private static final String PROCESS_KEY = "program-cure";
+
+ public void start(long programId){
+ Map<String, Object> vars = new HashMap<>();
+ /*
+ Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO.getProducePlanId());
+ Map<String, Object> vars = new HashMap<>(preAssignee);
+
+ vars.put("machineCode",startVO.getMachineCode());
+ vars.put("machineMode",startVO.getMachineMode());
+
+ vars.put("processNo",startVO.getProcessNo());
+ vars.put("processName",startVO.getProcessName());
+ vars.put("processEdition",startVO.getProcessEdition());
+
+ vars.put("craftEdition",startVO.getCraftEdition());
+ vars.put("planStartTime",startVO.getPlanStartTime());
+ vars.put("drawingNo",startVO.getDrawingNo());
+ vars.put("drawingNoEdition",startVO.getDrawingNoEdition());
+ vars.put("planLockDays",startVO.getPlanLockDays());
+
+ //闆剁粍浠朵唬鐮�
+ String partNo = generatePartNo(startVO);
+ vars.put("partNo",partNo);
+
+ NcProgram curedNcProgram = ncProgramService.getCuredNcProgram(partNo,startVO.getMachineCode());
+ vars.put("curedNcProgram",curedNcProgram);
+
+ //璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
+ vars.put("hasCuredProgram",curedNcProgram != null ? "Y":"N");
+ */
+ String businessKey = "0";//涓氬姟琛╧ey
+
+ identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
+ ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
+
+ int a=1;
+ //log.info()
+ }
+
+ /**
+ * 鐢熸垚闆剁粍浠剁紪鍙�
+ * 鍥惧彿銆佸浘鍙风増娆°�佸伐搴忓彿銆佸伐搴忓悕绉般�佸伐鑹虹増娆°�佸伐搴忕増娆� 缁勫悎璧锋潵鑾峰緱闆剁粍浠跺彿
+ * @param startVO
+ * @return
+ */
+ String generatePartNo(TaskAssignVO startVO){
+ //TODO 杩欎釜鏍煎紡鏈‘瀹氾紝闇�瑕佺‘璁�
+ return String.format("%s-%s-%s-%s-%s-%s",
+ startVO.getDrawingNo(),
+ startVO.getDrawingNoEdition(),
+ startVO.getProcessNo(),
+ startVO.getProcessName(),
+ startVO.getCraftEdition(),
+ startVO.getProcessEdition());
+ }
+}
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 9134b8e..6adad7c 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,22 +29,6 @@
public class DncSendBackController {
private final DncSendBackService dncSendBackService;
-
- /**
- * dnc鍥炰紶鏂囦欢瀵煎叆
- *
- * @param file 娴佺▼鏂囦欢
- */
- /*
- @PostMapping("dnc-sendback-upload")
- @ApiOperationSupport(order = 4)
- @Operation(summary = "dnc鍥炰紶鏂囦欢瀵煎叆", description = "dnc鍥炰紶鏂囦欢瀵煎叆")
- public R dncSendBackUpload(@RequestParam MultipartFile file) {
- boolean temp = Objects.requireNonNull(file.getOriginalFilename()).endsWith("pkg");
- temp = true;//涓存椂鏀捐
- return R.data(Kv.create().set("name", file.getOriginalFilename()).set("success", temp));
- }
- */
/**
* 涓婁紶DNC鍥炰紶鏂囦欢
*
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
index 334bda0..74a0d41 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
@@ -1,7 +1,6 @@
package org.springblade.mdm.program.controller;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
@@ -10,7 +9,6 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.secure.BladeUser;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.program.service.NcNodeService;
@@ -18,7 +16,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Map;
/**
* 绋嬪簭鑺傜偣
@@ -49,7 +46,7 @@
@PostMapping("/update")
@Operation(summary = "淇敼鑺傜偣", description = "鑺傜偣淇℃伅,蹇呴』浼犲叆ID")
public R<Boolean> update(@RequestBody NcNodeVO vo) {
- ncNodeService.updateNcCode(vo);
+ ncNodeService.updateNcNode(vo);
return R.<Boolean>status(true);
}
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 e722731..b95dd4c 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
@@ -35,6 +35,7 @@
import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
import org.flowable.engine.*;
import org.springblade.core.tool.utils.FileUtil;
+import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -133,13 +134,19 @@
return datas;
}
/**
- * 鍏ュ簱鍥炰紶鏂囦欢
+ * 鍏ュ簱鍥炰紶鏂囦欢,骞跺惎鍔ㄥ浐鍖栨祦绋�
* @param ids
* @return
*/
public void dncFileAccept(String ids) {
+ List<Long> idList = Func.toLongList(ids);
+ for (Long id : idList) {
+ //鍚姩鍥哄寲娴佺▼
+ }
}
+
+
}
class ZipFileDirectoryScanner {
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
index be75a9a..cee231b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
@@ -1,15 +1,10 @@
package org.springblade.mdm.program.service;
-import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.flowable.engine.*;
import org.springblade.core.mp.base.BizServiceImpl;
-import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.machine.MachineService;
-import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.mapper.NcNodeMapper;
import org.springblade.mdm.program.vo.NcNodeVO;
@@ -38,8 +33,11 @@
this.save(ncNode);
}
-
- public void updateNcCode(NcNodeVO vo) {
+ /**
+ * 鏇存柊鑺傜偣
+ * @param vo
+ */
+ public void updateNcNode(NcNodeVO vo) {
NcNode ncNode = this.getById(vo.getId());
ncNode.setName(vo.getName());
ncNode.setNodeType(vo.getNodeType());
--
Gitblit v1.9.3