From ec38383f3a98397770ad50ea58d1b12f3e529e3e Mon Sep 17 00:00:00 2001
From: mzr <1562242162@qq.com>
Date: Fri, 1 Nov 2024 16:12:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BA=93=E5=AD=98=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E6=98=8E=E7=BB=86=E4=BC=98=E5=8C=96sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/mapper_oracle/stock/ClientStockReportMapper.xml  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml
index cacbcb4..b503e99 100644
--- a/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml
+++ b/crm-common/src/main/resources/mapper/mapper_oracle/stock/ClientStockReportMapper.xml
@@ -212,12 +212,13 @@
                  GROUP BY goods_no
              ) a
                  LEFT JOIN crm_goods_info b ON a.goods_no = b.goods_no and b.company_id = #{companyId}
+            ORDER BY b.goods_no
     </select>
 
     <!-- 查询日期区间内的产品库存明细 -->
     <select id="findClientGoodsStockDetail" resultType="map" parameterType="map">
         SELECT
-        nvl(t0.bill_date,'') AS "billDate",
+        t0.bill_date AS "billDate",
         nvl(t1.bill_no,'--') AS "billNo",
         nvl(t1.count_num, 0) AS "countNum",
         nvl(t1.prod_date,'') AS "prodDate"
@@ -228,7 +229,7 @@
         CONNECT BY ROWNUM &lt;= trunc(to_date( #{endDate}, 'yyyy-MM-dd') - to_date(#{startDate}, 'yyyy-MM-dd')) + 1
         ) t0 LEFT JOIN (
         SELECT
-        a.bill_no, a.bill_date, a.count_num, a.prod_date
+        a.bill_date, wm_concat(a.bill_no) bill_no, sum(a.count_num) count_num, max(a.prod_date) prod_date
         FROM crm_inventory_detail a
         WHERE confirm_status = '1'
         <include refid="dateSel_a" />
@@ -241,6 +242,7 @@
         <if test="companyId != null and companyId != ''">
             AND a.company_id = #{companyId}
         </if>
+        GROUP BY a.bill_date
         ) t1 ON t0.bill_date = t1.bill_date
         ORDER BY t0.bill_date
     </select>