From 0a0d4c44db491c34335d069f42f7e6f4cc0e5786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?= <9290821+guowen-the-cat@user.noreply.gitee.com> Date: Thu, 18 Sep 2025 10:28:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=98=E7=82=B9=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=20=E4=BF=AE=E6=94=B9=E8=B4=A7=E4=BD=8D=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasCargoSpaceController.java | 12 ++++++++ .../mapper/BasCargoSpaceMapper.java | 8 +++++ .../service/IBasCargoSpaceService.java | 8 +++++ .../impl/BasCargoSpaceServiceImpl.java | 11 +++++++ .../bas/cargoSpace/BasCargoSpaceMapper.xml | 29 ++++++++++++++++++- ruoyi-ui/src/api/bas/cargoSpace.js | 9 ++++++ ruoyi-ui/src/views/check/create/index.vue | 8 +++-- 7 files changed, 81 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/controller/BasCargoSpaceController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/controller/BasCargoSpaceController.java index 3d75741..5c1db48 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/controller/BasCargoSpaceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/controller/BasCargoSpaceController.java @@ -43,6 +43,18 @@ public class BasCargoSpaceController extends BaseController return getDataTable(list); } + /** + * 查询货位列表（根据巷道出库锁状态过滤） + */ + @PreAuthorize("@ss.hasPermi('bas:cargoSpace:list')") + @GetMapping("/listByRoadway") + public TableDataInfo listByRoadway(BasCargoSpace basCargoSpace) + { + startPage(); + List list = basCargoSpaceService.selectBasCargoSpaceListByRoadway(basCargoSpace); + return getDataTable(list); + } + /** * 导出库存信息列表 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java index 511fe1e..8358230 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java @@ -76,4 +76,12 @@ public interface BasCargoSpaceMapper extends BaseMapper * @return */ BasCargoSpace selectEmptyCargoSpaceByWarehouseId(BasCargoSpace basWarehouse); + + /** + * 查询库存信息列表（根据巷道出库锁状态过滤） + * + * @param basCargoSpace 库存信息 + * @return 库存信息集合 + */ + public List selectBasCargoSpaceListByRoadway(BasCargoSpace basCargoSpace); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/IBasCargoSpaceService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/IBasCargoSpaceService.java index 479b9b5..42c6ead 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/IBasCargoSpaceService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/IBasCargoSpaceService.java @@ -68,4 +68,12 @@ public interface IBasCargoSpaceService extends IService * @return */ BasCargoSpace selectEmptyCargoSpaceByWarehouseId(BasCargoSpace basWarehouse); + + /** + * 查询库存信息列表（根据巷道出库锁状态过滤） + * + * @param basCargoSpace 库存信息 + * @return 库存信息集合 + */ + public List selectBasCargoSpaceListByRoadway(BasCargoSpace basCargoSpace); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java index 4dda0e8..f4cfa10 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java @@ -101,5 +101,16 @@ public class BasCargoSpaceServiceImpl extends ServiceImpl selectBasCargoSpaceListByRoadway(BasCargoSpace basCargoSpace) { + return basCargoSpaceMapper.selectBasCargoSpaceListByRoadway(basCargoSpace); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml index dfb6150..f8d4105 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml @@ -189,5 +189,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY the_platoon, the_column, the_floor - + diff --git a/ruoyi-ui/src/api/bas/cargoSpace.js b/ruoyi-ui/src/api/bas/cargoSpace.js index 9813ecd..2468905 100644 --- a/ruoyi-ui/src/api/bas/cargoSpace.js +++ b/ruoyi-ui/src/api/bas/cargoSpace.js @@ -42,3 +42,12 @@ export function delCargoSpace(cargoSpaceId) { method: 'delete' }) } + +// 查询库存信息列表（根据巷道出库锁状态过滤） +export function listCargoSpaceByRoadway(query) { + return request({ + url: '/bas/cargoSpace/listByRoadway', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue index 32afab4..78e7aa3 100644 --- a/ruoyi-ui/src/views/check/create/index.vue +++ b/ruoyi-ui/src/views/check/create/index.vue @@ -254,7 +254,7 @@ import { listWarehouse } from "@/api/bas/warehouse"; import { saveCheckStock } from "@/api/check/stockCheck"; import { listManagement} from "@/api/stock/management" - import { listCargoSpace} from "@/api/bas/cargoSpace" + import { listCargoSpaceByRoadway} from "@/api/bas/cargoSpace" export default { name: "AddOutStock", @@ -320,7 +320,8 @@ productName: null, cargoSpaceName: null, warehouseId: null, - status: null + status: null, + locked:null }, // 托盘详情弹窗显示状态 trayDetailVisible: false, @@ -382,7 +383,8 @@ if (this.formData.checkType==='2'){ this.trayQueryParams.warehouseId = "01"; this.trayQueryParams.status = 2; - listCargoSpace(this.trayQueryParams).then(response => { + this.trayQueryParams.locked='N'; + listCargoSpaceByRoadway(this.trayQueryParams).then(response => { this.trayOptions = response.rows; this.trayTotal = response.total; this.trayLoading = false;