From a5b125e2a4aeca7a585143a5d3b4a69975c71b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 9 Mar 2023 17:10:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/inv/InvProductController.java  | 32 +++++++++++++++++++
 .../api/service/inv/InvProductService.java    |  8 +++++
 .../inv/impl/InvProductServiceImpl.java       | 12 +++++++
 .../mybatis/mapper/inv/invProductDao.xml      |  1 +
 4 files changed, 53 insertions(+)

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 c628eb50c..3ce45f2e8 100644
--- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java
+++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java
@@ -50,6 +50,38 @@ public class InvProductController {
     @Resource
     private CustomerService customerService;
 
+
+
+    /**
+     * 库存列表查询接口
+     *
+     * @param filterInvProductRequest
+     * @return
+     */
+    @GetMapping("/spms/inv/product/filterProduct")
+    public BaseResponse filterProduct(FilterInvProductRequest filterInvProductRequest) {
+        boolean showSup = false;  //前端控制表格显示列字段
+        if (StrUtil.isNotBlank(filterInvProductRequest.getUdiCode())) {
+            filterInvProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode()));
+        }
+
+        if (StrUtil.isBlank(filterInvProductRequest.getInvCode())) {
+            List<String> invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr());
+            if (CollUtil.isNotEmpty(invCodes)) {
+                filterInvProductRequest.setInvCodes(invCodes);
+            }
+        }
+
+        List<InvProductResponse> list = invProductService.filterListProduct(filterInvProductRequest);
+        PageInfo<InvProductResponse> pageInfo = new PageInfo<>(list);
+        InvProductPageResponse<InvProductResponse> pageResponse = new InvProductPageResponse();
+        pageResponse.setList(pageInfo.getList());
+        pageResponse.setTotal(pageInfo.getTotal());
+        pageResponse.setShowSup(showSup);
+        return ResultVOUtils.success(pageResponse);
+    }
+
+
     /**
      * 库存列表查询接口
      *
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 3c650de25..809bd5284 100644
--- a/src/main/java/com/glxp/api/service/inv/InvProductService.java
+++ b/src/main/java/com/glxp/api/service/inv/InvProductService.java
@@ -25,6 +25,14 @@ public interface InvProductService {
      */
     List<InvProductResponse> filterList(FilterInvProductRequest filterInvProductRequest);
 
+    /**
+     * 库存查询
+     *
+     * @param filterInvProductRequest
+     * @return
+     */
+    List<InvProductResponse> filterListProduct(FilterInvProductRequest filterInvProductRequest);
+
     /**
      * 根据ID查询库存
      *
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 b9d3b1fec..8aebe0fdb 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
@@ -55,6 +55,18 @@ public class InvProductServiceImpl implements InvProductService {
         return invProductDao.filterProductList(filterInvProductRequest);
     }
 
+
+    @Override
+    public List<InvProductResponse> filterListProduct(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.filterList(filterInvProductRequest);
+    }
+
     @Override
     public InvProductEntity findById(String id) {
         return invProductDao.selectById(id);
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index 9822707c1..9e5d6341e 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -79,6 +79,7 @@
                 </foreach>
             </if>
         </where>
+        GROUP BY ip.relIdFk, ip.batchNo
         order by ip.updateTime desc
     </select>