From ccee11b0db9b3166e7617f431d802fb386815c5d Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 17 Apr 2023 09:28:16 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E5=8C=BA=E5=9F=9F=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/pdm/rest/DeviceController.java | 8 ++++++ .../org/nl/wms/pdm/service/DeviceService.java | 7 +++++ .../org/nl/wms/pdm/service/dto/DeviceDto.java | 1 + .../pdm/service/impl/DeviceServiceImpl.java | 7 +++++ .../org/nl/wms/pdm/wql/PDM_BI_DEVICE01.wql | 6 ++-- .../src/main/java/org/nl/wms/wms.xls | Bin 266752 -> 267264 bytes lms/nladmin-ui/src/api/wms/pdm/device.js | 9 +++++- .../src/views/wms/pdm/device/index.vue | 27 +++++++++++++++++- 8 files changed, 61 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java index 7dfbfbf..0b14755 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DeviceController.java @@ -74,4 +74,12 @@ public class DeviceController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + @GetMapping("/getAllRegions") + @Log("查询生产设备") + @ApiOperation("查询生产设备") + //@SaCheckPermission("device:list") + public ResponseEntity getAllRegions(){ + return new ResponseEntity<>(deviceService.getAllRegions(),HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java index 147b5b8..8492b31 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/DeviceService.java @@ -1,6 +1,7 @@ package org.nl.wms.pdm.service; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.wms.pdm.service.dto.DeviceDto; import org.springframework.data.domain.Pageable; @@ -65,4 +66,10 @@ public interface DeviceService { void changeActive(JSONObject json); + + /** + * 获取所有区域信息 + * @return + */ + JSONArray getAllRegions(); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceDto.java index e191895..34e6f92 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/dto/DeviceDto.java @@ -51,6 +51,7 @@ public class DeviceDto implements Serializable { * 是否启用 */ private String is_active; + private String region_code; /** * 创建人 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java index 14ccae5..1cd5f90 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DeviceServiceImpl.java @@ -135,4 +135,11 @@ public class DeviceServiceImpl implements DeviceService { WQLObject.getWQLObject("PDM_BI_Device").update(json); } + @Override + public JSONArray getAllRegions() { + WQLObject wo = WQLObject.getWQLObject("SCH_BASE_Region"); + JSONArray resultJSONArray = wo.query().getResultJSONArray(0); + return resultJSONArray; + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_DEVICE01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_DEVICE01.wql index 0578a92..5fd0b67 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_DEVICE01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_DEVICE01.wql @@ -42,9 +42,11 @@ IF 输入.flag = "1" PAGEQUERY SELECT - device.* + device.*, + region.region_name FROM PDM_BI_Device device + LEFT JOIN sch_base_region region ON region.region_code = device.region_code WHERE device.is_delete = '0' @@ -55,4 +57,4 @@ ENDSELECT ENDPAGEQUERY - ENDIF \ No newline at end of file + ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 0142a6e7a82aecbfdc333d75ebc76b9adfdccdba..8e0d61b724cbe422be41782c3485cb656e98ac18 100644 GIT binary patch delta 45128 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 al@Fr%x?fgS-3X-Q-PjUX8Q9oTA^#udLhu;? delta 45257 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 diff --git a/lms/nladmin-ui/src/api/wms/pdm/device.js b/lms/nladmin-ui/src/api/wms/pdm/device.js index b901755..25adbd4 100644 --- a/lms/nladmin-ui/src/api/wms/pdm/device.js +++ b/lms/nladmin-ui/src/api/wms/pdm/device.js @@ -31,6 +31,13 @@ export function getWorkprocedure() { }) } +export function getAllRegions() { + return request({ + url: 'api/device/getAllRegions', + method: 'get' + }) +} + export function getItemByDevice(data) { return request({ url: 'api/device/getItemByDevice', @@ -71,4 +78,4 @@ export function changeActive(data) { }) } -export default { add, edit, del, getWorkprocedure, getItemByDeviceId, copyAdd, changeActive } +export default { add, edit, del, getWorkprocedure, getItemByDeviceId, copyAdd, changeActive, getAllRegions } diff --git a/lms/nladmin-ui/src/views/wms/pdm/device/index.vue b/lms/nladmin-ui/src/views/wms/pdm/device/index.vue index 3562501..21cc3bb 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/device/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/device/index.vue @@ -59,6 +59,23 @@ + + + + + @@ -89,6 +106,7 @@ +