商品耗材取消订单/退菜/退单红冲库存

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
      */

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>