From fc3ae614a4c5a2a7cdb9029ecfc4372eb1c28b18 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 09 九月 2025 11:41:42 +0800
Subject: [PATCH] 补充确认表，审批表模板字段
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 68 ++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 28 deletions(-)
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 59730bd..af018b9 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
@@ -4,20 +4,17 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.enums.ParameterIn;
-import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
-import org.springblade.mdm.basesetting.machine.vo.MachineVO;
+import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
+import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProgramFlowStatusQueryService;
@@ -42,6 +39,7 @@
private final NcNodeService ncNodeService;
private final ProgramFlowStatusQueryService programFlowStatusQueryService;
private final FlowProgramFileService flowProgramFileService;
+ private final TaskDispatchService taskDispatchService;
/**
* 鏂板
*/
@@ -67,6 +65,25 @@
return R.<Boolean>status(true);
}
+ @PostMapping("/lock")
+ @Operation(summary = "閿佸畾鑺傜偣(绋嬪簭鍖呭悕)")
+ public R<Boolean> lock(@Parameter(description="绋嬪簭鍖呭悕鑺傜偣id)")Long id,@Parameter(description="閿佸畾鍘熷洜)")String remark) {
+ ncNodeService.lock(id,remark);
+ return R.<Boolean>status(true);
+ }
+
+ @GetMapping("/query-lock-remark")
+ @Operation(summary = "鏌ヨ閿佸畾鍘熷洜")
+ public R<String> queryLockRemark(@Parameter(description="绋嬪簭鍖呭悕鑺傜偣id)")Long id) {
+
+ NcNode node = ncNodeService.getById(id);
+ if(node.hasLocked()){
+ return R.data(node.getRemark());
+ }else{
+ return R.data(StringUtils.EMPTY);
+ }
+ }
+
@GetMapping("/lazy-list")
@Operation(summary = "鎳掑姞杞藉垪琛�", description = "绋嬪簭鐩綍鏍戝舰缁撴瀯")
public R<List<NcNodeVO>> lazyList(Long parentId) {
@@ -83,35 +100,30 @@
@GetMapping("/search-list")
@Operation(summary = "鏌ヨ鏍戠姸鍒楄〃", description = "绋嬪簭鐩綍鏍戝舰缁撴瀯锛堟煡璇笓鐢級")
- public R<List<NcNodeVO>> searchList(NcNodeQueryVO queryVO) {
+ public R<List<NcNodeVO>> searchList(NcNodeOldQueryVO queryVO) {
if(Func.isEmpty(queryVO.getName())){
return R.fail("璇疯緭鍏ュ悕绉�");
}
List<NcNodeVO> list = ncNodeService.searchList(queryVO);
- /*
- if(list != null && !list.isEmpty()) {
- for(NcNodeVO ncNodeVO : list) {
- if(!"70".equals(ncNodeVO.getNodeType())){
- break;
- }
- NcProgram program = ncProgramService.getByBindNodeId(ncNodeVO.getId());
- if(program != null) {
- ncNodeVO.setProcessEdition(program.getProcessEdition());
- ncNodeVO.setDrawingNo(program.getDrawingNo());
- ncNodeVO.setMachineCode(program.getMachineCode());
- ncNodeVO.setProcessName(program.getProcessName());
- ncNodeVO.setVersionNumber(program.getVersionNumber());
- //record涓壘涓嶅埌鏃舵湭鍚姩0锛涙壘鍒颁簡闇�瑕佹煡璇㈡祦绋嬪疄渚媔d锛屾槸鍚﹁繍琛屼腑
- ncNodeVO.setFlowStatus(programFlowStatusQueryService.queryFlowStatus(program.getId()));
- }
- }
-
- }
-
- */
return R.data(list);
}
+ @GetMapping("/search-list2")
+ @Operation(summary = "娑夊瘑缃戦椤垫悳绱�", description = "鎼滅储鎸囧畾闆剁粍浠跺彿")
+ public R<List<NcNodeVO>> search(NcNodeQueryVO queryVO) {
+ if(Func.isEmpty(queryVO.getDrawingNo())){
+ return R.fail("璇疯緭鍏ラ浂缁勪欢鍙�");
+ }
+ List<NcNodeVO> list = ncNodeService.searchList2(queryVO);
+
+ return R.data(list);
+ }
+
+ @GetMapping("/drawing-no-pick")
+ @Operation(summary = "棣栭〉鎼滅储闆剁粍浠朵笅鎷夋暟鎹�", description = "鎼滅储鎸囧畾闆剁粍浠跺彿")
+ public R<List<String>> drawingNoPick(String drawingNo) {
+ return R.data(taskDispatchService.drawingNoSeletDropList(drawingNo));
+ }
@GetMapping("/history-by-nodeid")
@Operation(summary = "鏍规嵁缁戝畾鑺傜偣id鑾峰彇鍘嗗彶鍒楄〃", description = "绋嬪簭鍘嗗彶鍒楄〃锛屼粎鈥樼▼搴忓寘鈥欏瓧鍏稿��70鐨勬暟鎹�傜敤浜庢樉绀虹▼搴忕殑鈥樺巻鍙茬増鏈��")
--
Gitblit v1.9.3