From 88c32cde660d6f6dc44f497aa0b78452c9fe1357 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 10 二月 2022 16:51:21 +0800
Subject: [PATCH] 仓库状态

---
 src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml
index 3192bd6..8595882 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysWarehouseDao.xml
@@ -71,7 +71,7 @@
     where su.valid_flag = 1
     <include refid="queryWhereSql"/>
   </select>
-  
+
   <select id="getAllSysWarehouseList" resultMap="SysWarehouse">
     select * from sys_warehouse
     where valid_flag = 1
@@ -101,8 +101,8 @@
     select * from sys_warehouse
     where bar_code = #{barCode}
   </select>
-  
-  
+
+
   <select id="selectWarehouse" resultMap="SysWarehouseDto">
  SELECT
 	sw.id,
@@ -128,4 +128,20 @@
 	where sw.valid_flag = 1
 	AND swc.valid_flag = 1
   </select>
+  <select id="selectAllWarehouse" resultType="java.util.Map">
+    select
+    sw.id,
+    sw.type,
+    bm.meta_value typeName,
+    sw.name,
+    sw.info_code infoCode,
+    sw.bar_code  barCode,
+    sw.location1,
+    sw.location2,
+    date_format(sw.create_time,'%Y-%m-%d %H:%i:%S')  createTime,
+    sw.department
+    from sys_warehouse as sw
+    left join base_meta bm on bm.id = sw.type
+    where  sw.valid_flag = 1
+  </select>
 </mapper>

--
Gitblit v1.9.2