From 44f2c6f98e394809b8e1eaebe133488c7a32cdb7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 15 十月 2021 10:20:43 +0800
Subject: [PATCH] 1、优化采购管理物品增加二级分类 2、增加仓库是否对外开放 3、修复未绑定业主显示代码问题
---
java110-db/src/main/resources/mapper/store/AllocationUserStorehouseServiceDaoImplMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/AllocationUserStorehouseServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/AllocationUserStorehouseServiceDaoImplMapper.xml
index aa4c9a6..e3ff103 100644
--- a/java110-db/src/main/resources/mapper/store/AllocationUserStorehouseServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/AllocationUserStorehouseServiceDaoImplMapper.xml
@@ -119,10 +119,11 @@
resId,t.res_name,t.res_name resName,t.start_user_id,t.start_user_id startUserId,t.start_user_name,
t.start_user_name startUserName,t.aus_id,t.aus_id ausId,t.b_id,t.b_id
bId,t.stock,t.give_quantity,t.give_quantity giveQuantity,t.create_time createTime,rst.name rstName,rss.spec_name
- specName,td1.name unitCodeName,td2.name miniUnitCodeName
+ specName,td1.name unitCodeName,td2.name miniUnitCodeName,rst1.name parentRstName
from allocation_user_storehouse t
left join resource_store rs on t.res_id = rs.res_id and rs.status_cd = '0'
left join resource_store_type rst on rs.rst_id = rst.rst_id and rst.status_cd = '0'
+ left join resource_store_type rst1 on rs.parent_rst_id = rst1.rst_id and rst1.status_cd = '0'
left join resource_store_specification rss on rs.rss_id=rss.rss_id and rss.status_cd = '0'
left join t_dict td1 on rs.unit_code = td1.status_cd and td1.table_name = 'resource_store' and td1.table_columns = 'unit_code'
left join t_dict td2 on rs.mini_unit_code = td2.status_cd and td2.table_name = 'resource_store' and td2.table_columns = 'unit_code'
@@ -168,6 +169,9 @@
</if>
<if test="rstId !=null and rstId != ''">
and rs.rst_id= #{rstId}
+ </if>
+ <if test="parentRstId !=null and parentRstId != ''">
+ and rs.parent_rst_id= #{parentRstId}
</if>
<if test="rssId !=null and rssId != ''">
and rs.rss_id= #{rssId}
@@ -276,6 +280,9 @@
<if test="rstId !=null and rstId != ''">
and rs.rst_id= #{rstId}
</if>
+ <if test="parentRstId !=null and parentRstId != ''">
+ and rs.parent_rst_id= #{parentRstId}
+ </if>
<if test="rssId !=null and rssId != ''">
and rs.rss_id= #{rssId}
</if>
--
Gitblit v1.8.0