From f6328d49bde67d38c0dbd9a12b7f7c8cf049c5fe Mon Sep 17 00:00:00 2001 From: liyuqi Date: Fri, 21 Mar 2025 08:59:37 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=90=8E=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=202.=E6=B7=BB=E5=8A=A0=E5=BA=93=E4=BD=8D=E5=8F=AF?= =?UTF-8?q?=E8=A7=86=E5=8C=96=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev_wms_client/src/api/location.js | 10 +++++++++- dev_wms_client/src/router/index.js | 1 + .../controller/wms/LocationController.java | 11 +++++++++++ .../controller/ILocationControllerService.java | 9 +++++++++ .../LocationControllerServiceImpl.java | 17 +++++++++++++++++ 5 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dev_wms_client/src/api/location.js b/dev_wms_client/src/api/location.js index 96bfff6..7629fe3 100644 --- a/dev_wms_client/src/api/location.js +++ b/dev_wms_client/src/api/location.js @@ -32,9 +32,17 @@ const updateELocationInfo = (params) => { }) } +const getAllLocations = () => { + return request({ + url: '/location/getAllLocations', + method: 'get' + }) +} + export { getLocations, updateLocation, getELocationsByPage, - updateELocationInfo + updateELocationInfo, + getAllLocations } \ No newline at end of file diff --git a/dev_wms_client/src/router/index.js b/dev_wms_client/src/router/index.js index e386a4b..3a344ec 100644 --- a/dev_wms_client/src/router/index.js +++ b/dev_wms_client/src/router/index.js @@ -35,6 +35,7 @@ const routes = [ { path: '/dbsList', component: () => import('@/layout/dbsList.vue') },// dbs计划 { path: '/kittingList', component: () => import('@/layout/kittingList.vue') },// 配料单 { path: '/kittingRelation', component: () => import('@/layout/kittingRelation.vue') },// 配料单 + { path: '/locationVisualization', component: () => import('@/layout/locationVisualization.vue')} // 库位可视化 ] }, { diff --git a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/LocationController.java b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/LocationController.java index db60fce..077d807 100644 --- a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/LocationController.java +++ b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/LocationController.java @@ -9,6 +9,8 @@ import com.wms_main.service.controller.ILocationControllerService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 卡特相关控制类 */ @@ -39,4 +41,13 @@ public class LocationController { public WmsApiResponse> queryLocationsByPage(@RequestBody LocationQuery locationQuery) { return locationControllerService.queryLocationsByPage(locationQuery); } + + /** + * 获取所有库位信息 + * @return 所有库位列表 + */ + @GetMapping("/getAllLocations") + public WmsApiResponse> getAllLocations() { + return locationControllerService.getAllLocations(); + } } diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/ILocationControllerService.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/ILocationControllerService.java index ab32a38..42ffbc6 100644 --- a/dev_wms_serve/src/main/java/com/wms_main/service/controller/ILocationControllerService.java +++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/ILocationControllerService.java @@ -3,9 +3,12 @@ package com.wms_main.service.controller; import com.wms_main.model.dto.query.LocationQuery; import com.wms_main.model.dto.response.wms.BaseWmsApiResponse; import com.wms_main.model.dto.response.wms.WmsApiResponse; +import com.wms_main.model.po.TAppLocation; import com.wms_main.model.vo.wms.LocationVo; import com.wms_main.model.vo.wms.PageVo; +import java.util.List; + /** * 库位控制类服务 */ @@ -23,4 +26,10 @@ public interface ILocationControllerService { * @return 查询结果 */ WmsApiResponse> queryLocationsByPage(LocationQuery locationQuery); + + /** + * 获取所有库位信息 + * @return 库位列表 + */ + WmsApiResponse> getAllLocations(); } diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/LocationControllerServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/LocationControllerServiceImpl.java index 572d9fc..a03cde9 100644 --- a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/LocationControllerServiceImpl.java +++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/LocationControllerServiceImpl.java @@ -89,4 +89,21 @@ public class LocationControllerServiceImpl implements ILocationControllerService PageVo pageVo = PageVo.of(poPage, LocationVo::of); return WmsApiResponse.success("查询库位成功", pageVo); } + + /** + * 获取所有库位信息---实现 + * @return 库位列表 + */ + @Override + public WmsApiResponse> getAllLocations() { + // 获取所有库位数据 + List locationList = appLocationService.list(); + + // 将PO对象转换为VO对象 + List locationVoList = locationList.stream() + .map(LocationVo::of) + .toList(); + + return WmsApiResponse.success("获取所有库位成功", locationVoList); + } }