From 72e08edccebc23b5630adc9bb262ed51df69bc80 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 09:31:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9Ebug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/PurOrderReceiveController.java   |  1 -
 .../com/glxp/api/dao/inv/InvProductDao.java   |  8 ++
 .../inv/impl/InvProductServiceImpl.java       |  2 +-
 .../mybatis/mapper/inv/invProductDao.xml      | 83 +++++++++++++++++++
 4 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java
index ea1cec297..bc6f349fe 100644
--- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java
@@ -142,7 +142,6 @@ public class PurOrderReceiveController extends BaseController {
             purReceiveEntity.setTargetDeptCode(targetWarehouseEntity.getParentId());
             receiveService.insertOrder(purReceiveEntity);
         }
-        System.out.println(addReceiveDetailRequest.getDatas()+"999");
         for (AddReceiveDetailRequest.DetaiData detaiData : addReceiveDetailRequest.getDatas()) {
 
             PurReceiveDetailEntity purReceiveDetailEntity = new PurReceiveDetailEntity();
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 6fe55787f..3269a95bb 100644
--- a/src/main/java/com/glxp/api/dao/inv/InvProductDao.java
+++ b/src/main/java/com/glxp/api/dao/inv/InvProductDao.java
@@ -20,6 +20,14 @@ public interface InvProductDao extends BaseMapperPlus<InvProductDao, InvProductE
      */
     List<InvProductResponse> filterList(FilterInvProductRequest filterInvProductRequest);
 
+    /**
+     * 查询库存列表
+     *
+     * @param filterInvProductRequest
+     * @return
+     */
+    List<InvProductResponse> filterProductList(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 e37a75986..b9d3b1fec 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
@@ -52,7 +52,7 @@ public class InvProductServiceImpl implements InvProductService {
         if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) {
             PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit());
         }
-        return invProductDao.filterList(filterInvProductRequest);
+        return invProductDao.filterProductList(filterInvProductRequest);
     }
 
     @Override
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index 5f70e6d86..9822707c1 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -283,4 +283,87 @@
             </if>
         </where>
     </select>
+
+
+
+    <select id="filterProductList" resultType="com.glxp.api.res.inv.InvProductResponse"
+            parameterType="com.glxp.api.req.inv.FilterInvProductRequest">
+        select ip.id,
+        ip.nameCode,
+        bp.cpmctymc,
+        ip.relIdFk,
+        bp.ggxh,
+        ip.batchNo,
+        ip.productionDate,
+        ip.expireDate,
+        bp.ylqxzcrbarmc,
+        bp.zczbhhzbapzbh,
+        sum(ip.inCount) as inCount,
+        sum(ip.outCount) as outCount,
+        sum(ip.reCount)as reCount,
+        ip.customerId,
+        basic_corp.name     supName,
+        ip.supId,
+        auth_dept.name      deptName,
+        auth_warehouse.name invName,
+        ip.deptCode,
+        ip.invCode
+        from inv_product ip
+        inner join basic_udirel on ip.relIdFk = basic_udirel.id
+        inner join basic_products bp on basic_udirel.uuid = bp.uuid
+        left join basic_corp on ip.supId = basic_corp.erpId
+        left join auth_dept on auth_dept.code = ip.deptCode
+        left join auth_warehouse on auth_warehouse.code = ip.invCode
+        <where>
+            bp.diType = 1
+            <if test="cpmctymc != null and cpmctymc != ''">
+                AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="nameCode != null and nameCode != ''">
+                AND ip.nameCode like concat('%', #{nameCode}, '%')
+            </if>
+            <if test="relIdFk != null and relIdFk != ''">
+                AND ip.relIdFk = #{relIdFk}
+            </if>
+            <if test="ggxh != null and ggxh != ''">
+                AND bp.ggxh like concat('%', #{ggxh}, '%')
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND ip.batchNo like concat('%', #{batchNo}, '%')
+            </if>
+            <if test="productionDate != null and productionDate != ''">
+                AND ip.productionDate = #{productionDate}
+            </if>
+            <if test="expireDate != null and expireDate != ''">
+                AND ip.expireDate = #{expireDate}
+            </if>
+            <if test="ylqxzcrbarmc != null and ylqxzcrbarmc != ''">
+                AND bp.ylqxzcrbarmc like concat('%', #{ylqxzcrbarmc}, '%')
+            </if>
+            <if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
+                AND bp.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
+            </if>
+            <if test="customerId != null and customerId != ''">
+                AND ip.customerId = #{customerId}
+            </if>
+            <if test="supId != null and supId != ''">
+                AND ip.supId = #{supId}
+            </if>
+            <if test="deptCode != null and deptCode != ''">
+                AND ip.deptCode = #{deptCode}
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND ip.invCode = #{invCode}
+            </if>
+            <if test="invCodes != null and invCodes.size() != 0">
+                AND ip.invCode in
+                <foreach collection="invCodes" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        group by ip.relIdFk
+        order by ip.updateTime desc
+    </select>
+
 </mapper>