From 76a73d95f8a62d627cbe96e0c58c8f3fb2d6e61e Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 8 Mar 2023 17:39:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=BA=93=E5=AD=98=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E5=90=8D=E7=A7=B0=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inv/InvProductController.java  | 13 ++++++++++
 .../com/glxp/api/dao/inv/InvProductDao.java   |  8 +++++++
 .../api/service/inv/InvProductService.java    |  8 +++++++
 .../inv/impl/InvProductServiceImpl.java       | 11 +++++++++
 .../mybatis/mapper/inv/invProductDao.xml      | 24 +++++++++++++++++--
 5 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java
index 3595e4427..c628eb50c 100644
--- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java
+++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java
@@ -234,4 +234,17 @@ public class InvProductController {
         return ResultVOUtils.success(count);
     }
 
+    /**
+     * 查询库存产品名称列表
+     *
+     * @param filterInvProductRequest
+     * @return
+     */
+    @GetMapping("spms/inv/product/filterProductNames")
+    public BaseResponse filterProductNames(FilterInvProductRequest filterInvProductRequest) {
+        List<InvProductResponse> list = invProductService.filterProductNames(filterInvProductRequest);
+        PageInfo<InvProductResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
 }
diff --git a/src/main/java/com/glxp/api/dao/inv/InvProductDao.java b/src/main/java/com/glxp/api/dao/inv/InvProductDao.java
index 09609b79a..6fe55787f 100644
--- a/src/main/java/com/glxp/api/dao/inv/InvProductDao.java
+++ b/src/main/java/com/glxp/api/dao/inv/InvProductDao.java
@@ -65,4 +65,12 @@ public interface InvProductDao extends BaseMapperPlus<InvProductDao, InvProductE
      * @return
      */
     List<InvProductEntity> selectInvProductInfo(@Param("invCode") String invCode, @Param("invSpaceCode") String invSpaceCode, @Param("relId") String relId);
+
+    /**
+     * 查询库存产品名称列表
+     *
+     * @param filterProductNames
+     * @return
+     */
+    List<InvProductResponse> filterProductNames(FilterInvProductRequest filterInvProductRequest);
 }
diff --git a/src/main/java/com/glxp/api/service/inv/InvProductService.java b/src/main/java/com/glxp/api/service/inv/InvProductService.java
index 4fc3e6a95..3c650de25 100644
--- a/src/main/java/com/glxp/api/service/inv/InvProductService.java
+++ b/src/main/java/com/glxp/api/service/inv/InvProductService.java
@@ -65,4 +65,12 @@ public interface InvProductService {
      */
     List<InvProductResponse> getCountInvProduct(FilterInvProductRequest filterInvProductRequest);
 
+    /**
+     * 查询库存产品名称列表
+     *
+     * @param filterInvProductRequest
+     * @return
+     */
+    List<InvProductResponse> filterProductNames(FilterInvProductRequest filterInvProductRequest);
+
 }
diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java
index 3f304e95c..e37a75986 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java
@@ -98,4 +98,15 @@ public class InvProductServiceImpl implements InvProductService {
         return invProductDao.getCountInvProduct(filterInvProductRequest);
     }
 
+    @Override
+    public List<InvProductResponse> filterProductNames(FilterInvProductRequest filterInvProductRequest) {
+        if (null == filterInvProductRequest) {
+            return Collections.emptyList();
+        }
+        if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) {
+            PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit());
+        }
+        return invProductDao.filterProductNames(filterInvProductRequest);
+    }
+
 }
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index 5e14f5c5a..da5230b58 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -15,9 +15,9 @@
                ip.expireDate,
                bp.ylqxzcrbarmc,
                bp.zczbhhzbapzbh,
-               sum(ip.inCount) as inCount,
+               sum(ip.inCount)  as inCount,
                sum(ip.outCount) as outCount,
-               sum(ip.reCount)as reCount,
+               sum(ip.reCount)  as reCount,
                ip.customerId,
                basic_corp.name     supName,
                ip.supId,
@@ -264,4 +264,24 @@
         </where>
         group by ip.relIdFk, ip.batchNo, ip.invCode, ipd.invSpaceCode
     </select>
+
+    <select id="filterProductNames" resultType="com.glxp.api.res.inv.InvProductResponse">
+        select ip.relIdFk, bp.cpmctymc
+        from inv_product ip
+                 left join inv_product_detail ipd on ip.relIdFk = ipd.relId and ip.invCode = ipd.invCode and
+                                                     ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
+                 left join basic_udirel bu on bu.id = ip.relIdFk
+                 left join basic_products bp on bp.uuid = bu.uuid
+        <where>
+            <if test="cpmctymc != null and cpmctymc != ''">
+                AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND ip.invCode = #{invCode}
+            </if>
+            <if test="invSpaceCode != null and invSpaceCode != ''">
+                AND ipd.invSpaceCode = #{invSpaceCode}
+            </if>
+        </where>
+    </select>
 </mapper>