From 092c85673d113e1ffab012527e75c3eb08a7aaf2 Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Thu, 20 Mar 2025 18:06:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=80=97=E6=9D=90=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E8=AE=A2=E5=8D=95/=E9=80=80=E8=8F=9C/=E9=80=80?=
 =?UTF-8?q?=E5=8D=95=E7=BA=A2=E5=86=B2=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/product/param/ProductStockFlowParam.java    |  8 ++++++++
 .../resources/mapper/ProductStockFlowMapper.xml     | 13 ++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/param/ProductStockFlowParam.java b/cash-common/cash-common-service/src/main/java/com/czg/product/param/ProductStockFlowParam.java
index 0abbc2153..a948a733c 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/param/ProductStockFlowParam.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/param/ProductStockFlowParam.java
@@ -28,6 +28,14 @@ public class ProductStockFlowParam implements Serializable {
      * 出入库名目 win-in:手动增加 order-in:退货 loss-out:手动减少 order-out:销售量 damage-out:报损
      */
     private String inOutItem;
+    /**
+     * 开始日期 yyyy-MM-dd HH:mm:ss
+     */
+    private String beginDate;
+    /**
+     * 开始日期 yyyy-MM-dd HH:mm:ss
+     */
+    private String endDate;
     /**
      * 门店id
      */
diff --git a/cash-service/product-service/src/main/resources/mapper/ProductStockFlowMapper.xml b/cash-service/product-service/src/main/resources/mapper/ProductStockFlowMapper.xml
index 2aae30349..50054da75 100644
--- a/cash-service/product-service/src/main/resources/mapper/ProductStockFlowMapper.xml
+++ b/cash-service/product-service/src/main/resources/mapper/ProductStockFlowMapper.xml
@@ -32,9 +32,12 @@
     <select id="getProductStockFlowList" resultType="com.czg.product.entity.ProductStockFlow">
         select
             t1.*,
-            t2.order_no
+            t2.order_no,
+            t4.name as unit_name
         from tb_product_stock_flow t1
         left join tb_order_info t2 on t1.order_id = t2.id
+        left join tb_product t3 on t1.product_id = t3.id
+        left join tb_shop_prod_unit t4 on t3.unit_id = t4.id
         where t1.shop_id = #{shopId}
         <if test="inOutType != null and inOutType != ''">
             and t1.in_out_type = #{inOutType}
@@ -45,6 +48,14 @@
         <if test="productId != null">
             and t1.product_id = #{productId}
         </if>
+        <if test="beginDate != null and beginDate != ''">
+            and t1.create_time >= str_to_date(#{beginDate}, '%Y-%m-%d %H:%i:%s')
+        </if>
+        <if test="endDate != null and endDate != ''">
+            <![CDATA[
+            and t1.create_time <= str_to_date(#{endDate}, '%Y-%m-%d %H:%i:%s')
+            ]]>
+        </if>
         order by t1.id desc
     </select>
 </mapper>
\ No newline at end of file