From 1930b4e59d60c015ffa7bfee92e4bc227b90dcb3 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期三, 28 五月 2025 15:41:41 +0800 Subject: [PATCH] 1.Dnc产品结构树检索nc文件 2.新增批次功能 3.新增审签查询流程 4.修改刀具系统查询 --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocRelativeController.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocRelativeController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocRelativeController.java index 91181e2..8b77545 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocRelativeController.java +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DocRelativeController.java @@ -11,6 +11,7 @@ import org.jeecg.modules.dnc.response.QueryListResponseResult; import org.jeecg.modules.dnc.response.ResponseResult; import org.jeecg.modules.dnc.service.IDocRelativeService; +import org.jeecg.modules.mdc.entity.MdcEquipment; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -38,8 +39,8 @@ @AutoLog(value = "璁惧鍏宠仈鏂囨。琛�-鏌ヨ鏂囨。涓嬬殑鎵�鏈夊叧鑱旇澶囦俊鎭�") @ApiOperation(value = "璁惧鍏宠仈鏂囨。琛�-鏌ヨ鏂囨。涓嬬殑鎵�鏈夊叧鑱旇澶囦俊鎭�", notes = "璁惧鍏宠仈鏂囨。琛�-鏌ヨ鏂囨。涓嬬殑鎵�鏈夊叧鑱旇澶囦俊鎭�") @GetMapping("/get/device/{docId}") - public QueryListResponseResult<DeviceInfo> findDeviceByDocId(@PathVariable("docId") String docId) { - List<DeviceInfo> list = relativeService.findDeviceByDocId(docId); + public QueryListResponseResult<MdcEquipment> findDeviceByDocId(@PathVariable("docId") String docId) { + List<MdcEquipment> list = relativeService.findDeviceByDocId(docId); if(list == null) list = Collections.emptyList(); return new QueryListResponseResult<>(CommonCode.SUCCESS, list); -- Gitblit v1.9.3