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/PurchaseApplyDetailServiceDaoImplMapper.xml |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml
index 4924c73..02c655b 100755
--- a/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml
@@ -81,6 +81,7 @@
         td2.name stateName,
         td3.name warehousingWayName,
         rst.name rstName,
+        rst1.name parentRstName,
         rss.spec_name specName,
         rs.sh_id shId,
         td4.name unitCodeName,
@@ -100,6 +101,7 @@
         left join t_dict td3 on pa.warehousing_way = td3.status_cd and td3.table_name = 'purchase_apply' and
         td3.table_columns = 'warehousing_way'
         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'
         where 1 = 1
         <if test="applyOrderId !=null and applyOrderId != ''">
@@ -173,6 +175,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="supplierName !=null and supplierName != ''">
             and rsp.supplier_name= #{supplierName}
@@ -242,6 +247,7 @@
         left join t_dict td3 on pa.warehousing_way = td3.status_cd and td3.table_name = 'purchase_apply' and
         td3.table_columns = 'warehousing_way'
         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'
         where 1 = 1
         <if test="applyOrderId !=null and applyOrderId != ''">
@@ -319,6 +325,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="startTime !=null and startTime != ''">
             and pa.create_time &gt;= #{startTime}
         </if>

--
Gitblit v1.8.0