From a5a094d5eb9eabb81acd714c964e51f1a99502b8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 25 三月 2026 10:37:51 +0800
Subject: [PATCH] 查询仓库---查询全部货架
---
inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java | 7 +++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java | 5 +++++
inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseMapper.java | 1 +
inspect-server/src/main/resources/mapper/WarehouseMapper.xml | 18 ++++++++++++++++++
inspect-server/src/main/java/com/yuanchu/mom/service/WarehouseService.java | 3 ++-
5 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
index 1265f2f..c4c7490 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/WarehouseController.java
@@ -34,6 +34,13 @@
return Result.success(warehouseService.selectWarehouse());
}
+ @ValueClassify("鏍峰搧绠＄悊")
+ @GetMapping("/selectWarehouseAll")
+ @ApiOperation("鏌ヨ浠撳簱---鏌ヨ鍏ㄩ儴璐ф灦")
+ public Result selectWarehouseAll() {
+ return Result.success(warehouseService.selectWarehouseAll());
+ }
+
@ValueClassify("鏍峰搧绠＄悊")
@PostMapping("/addShelf")
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseMapper.java
index e699369..6af6415 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/WarehouseMapper.java
@@ -15,6 +15,7 @@
public interface WarehouseMapper extends BaseMapper<Warehouse> {
List<WarehouseDto> selectWarehouseList();
+ List<WarehouseDto> selectWarehouseListAll();
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/WarehouseService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/WarehouseService.java
index 7a6e4f9..8ef82a5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/WarehouseService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/WarehouseService.java
@@ -20,6 +20,7 @@
int addWarehouse(String name);
List<WarehouseDto> selectWarehouse();
+ List<WarehouseDto> selectWarehouseAll();
int addShelf(WarehouseShelf warehouseShelf);
@@ -39,4 +40,4 @@
Map<String, Object> getSampleRecord(Integer id);
-}
\ No newline at end of file
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java
index e37c5f2..2927fee 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/WarehouseServiceImpl.java
@@ -65,6 +65,11 @@
}
@Override
+ public List<WarehouseDto> selectWarehouseAll() {
+ return warehouseMapper.selectWarehouseListAll();
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public int addShelf(WarehouseShelf warehouseShelf) {
warehouseShelfMapper.insert(warehouseShelf);
diff --git a/inspect-server/src/main/resources/mapper/WarehouseMapper.xml b/inspect-server/src/main/resources/mapper/WarehouseMapper.xml
index 492b935..c97521f 100644
--- a/inspect-server/src/main/resources/mapper/WarehouseMapper.xml
+++ b/inspect-server/src/main/resources/mapper/WarehouseMapper.xml
@@ -52,4 +52,22 @@
and state=1
order by id, sId, crow, ccol
</select>
+
+ <select id="selectWarehouseListAll" resultMap="Warehouse">
+ select w.id,
+ w.name,
+ ws.id sId,
+ ws.name sName,
+ ws.row,
+ ws.col,
+ wc.id cId,
+ wc.row crow,
+ wc.col ccol
+ from warehouse w
+ left join warehouse_shelf ws on w.id = ws.warehouse_id
+ left join warehouse_cell wc on shelf_id = ws.id
+ where
+ state=1
+ order by id, sId, crow, ccol
+ </select>
</mapper>
--
Gitblit v1.9.3