From b0b5476d75af471113106837080c1cef782df09f Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Sat, 18 Feb 2023 15:26:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E7=9B=98=E7=82=B9=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2=E5=BA=93=E5=AD=98=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=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  | 19 ++++++++++
 .../com/glxp/api/dao/inv/InvProductDao.java   |  8 ++++
 .../api/service/inv/InvProductService.java    |  8 ++++
 .../inv/impl/InvProductServiceImpl.java       | 11 ++++++
 .../mybatis/mapper/inv/invProductDao.xml      | 38 +++++++++++++++++++
 5 files changed, 84 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 bafa27412..deaa77e41 100644
--- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java
+++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
@@ -191,4 +192,22 @@ public class InvProductController {
         PageInfo<InvProductResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
     }
+
+    /**
+     * 盘点单据查询库存产品接口
+     *
+     * @param filterInvProductRequest
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/products/getCountInvProduct")
+    public BaseResponse getCountInvProduct(FilterInvProductRequest filterInvProductRequest) {
+        if (null == filterInvProductRequest || StrUtil.isBlank(filterInvProductRequest.getInvCode())) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        List<InvProductResponse> list = invProductService.getCountInvProduct(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 ca5b250eb..8c1a430ea 100644
--- a/src/main/java/com/glxp/api/dao/inv/InvProductDao.java
+++ b/src/main/java/com/glxp/api/dao/inv/InvProductDao.java
@@ -47,4 +47,12 @@ public interface InvProductDao extends BaseMapperPlus<InvProductDao, InvProductE
      * @return
      */
     InvProductEntity selectProductInfo(@Param("relId") Long relId, @Param("batchNo") String batchNo, @Param("deptCode") String deptCode, @Param("invCode") String invCode, @Param("invSpaceCode") String invSpaceCode);
+
+    /**
+     * 盘点单据查询库存产品
+     *
+     * @param filterInvProductRequest
+     * @return
+     */
+    List<InvProductResponse> getCountInvProduct(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 d123b473a..4fc3e6a95 100644
--- a/src/main/java/com/glxp/api/service/inv/InvProductService.java
+++ b/src/main/java/com/glxp/api/service/inv/InvProductService.java
@@ -57,4 +57,12 @@ public interface InvProductService {
      */
     List<InvProductResponse> getInvMAProducts(FilterInvProductRequest filterInvProductRequest);
 
+    /**
+     * 盘点单据查询库存产品信息列表
+     *
+     * @param filterInvProductRequest
+     * @return
+     */
+    List<InvProductResponse> getCountInvProduct(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 5483f9fe3..c627de719 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
@@ -85,4 +85,15 @@ public class InvProductServiceImpl implements InvProductService {
         return invProductDao.getMAInvProducts(filterInvProductRequest);
     }
 
+    @Override
+    public List<InvProductResponse> getCountInvProduct(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.getCountInvProduct(filterInvProductRequest);
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index 9c2247af1..1b0dc4b68 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -196,4 +196,42 @@
             </if>
         </where>
     </select>
+
+    <select id="getCountInvProduct" resultType="com.glxp.api.res.inv.InvProductResponse">
+        select inv_product_detail.id,
+               inv_product.relIdFk,
+               inv_product.nameCode,
+               inv_product.batchNo,
+               inv_product.productionDate,
+               inv_product.expireDate,
+               basic_products.ggxh,
+               inv_product.inCount,
+               inv_product.outCount,
+               sum(inv_product.inCount - inv_product.outCount) reCount,
+               basic_products.cpmctymc
+        from inv_product_detail
+                 left join inv_product on inv_product_detail.relId = inv_product.relIdFk
+            and inv_product.invCode = inv_product_detail.invCode
+            AND IFNULL(inv_product.batchNo, 'empty') = IFNULL(inv_product_detail.batchNo, 'empty')
+                 left join basic_udirel on inv_product_detail.relId = basic_udirel.id
+                 left join basic_products on basic_products.uuid = basic_udirel.uuid
+        <where>
+            <if test="invCode != null and invCode != ''">
+                AND inv_product_detail.invCode = #{invCode}
+            </if>
+            <if test="invSpaceCode != null and invSpaceCode != ''">
+                AND inv_product_detail.invSpaceCode = #{invSpaceCode}
+            </if>
+            <if test="nameCode != null and nameCode != ''">
+                AND inv_product.nameCode like concat('%', #{nameCode}, '%')
+            </if>
+            <if test="cpmctymc != null and cpmctymc != ''">
+                AND basic_products.cpmctymc like concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND inv_product.batchNo like concat('%', #{batchNo}, '%')
+            </if>
+            group by inv_product_detail.relId, inv_product_detail.batchNo
+        </where>
+    </select>
 </mapper>