From d4372fae2aece2193e7843cf2838d600c9dbd503 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 25 Dec 2023 16:48:03 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=BA=93=E5=AD=98=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/base/BaseSpaceInfoMapper.xml       | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/aucma-base/src/main/resources/mapper/base/BaseSpaceInfoMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseSpaceInfoMapper.xml
index 7eef94e..9320e9c 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseSpaceInfoMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseSpaceInfoMapper.xml
@@ -71,18 +71,17 @@
     </select>
 
     <select id="getInventoryStatistics" parameterType="BaseSpaceInfo" resultType="java.util.LinkedHashMap">
-        select si.store_code       MATERIALCODE,
-               si.STORE_NAME       MATERIALNAME,
-               sp.material_type    STORECODE,
-               ml.MATERIAL_NAME    STORENAME,
-               sum(sp.space_stock) SPACESTOCK
-        from base_spaceinfo sp
-                 left join base_storeinfo si on si.STORE_CODE = sp.STORE_CODE
-                 left join BASE_MATERIALINFO ml on ml.MATERIAL_CODE = sp.MATERIAL_TYPE
-        where sp.MATERIAL_TYPE is not null
-        <if test="storeCode != null  and storeCode != ''">and sp.store_code = #{storeCode}</if>
-        group by si.store_code, si.STORE_NAME, sp.material_type, ml.MATERIAL_NAME
-        order by si.store_code, sp.material_type
+        SELECT si.STORE_CODE              MATERIALCODE,
+        si.STORE_NAME              MATERIALNAME,
+        ml.MATERIAL_SPECIFICATIONS STORENAME,
+        SUM(MATERIAL_AMOUNT)       SPACESTOCK
+        FROM BASE_SPACEDETAIL sd
+        left join base_storeinfo si on si.STORE_CODE = si.STORE_CODE
+        left join BASE_MATERIALINFO ml on ml.MATERIAL_CODE = sd.MATERIAL_TYPE
+        WHERE ml.MATERIAL_SPECIFICATIONS is not null
+        <if test="storeCode != null  and storeCode != ''">and si.store_code = #{storeCode}</if>
+        GROUP BY si.STORE_CODE, si.STORE_NAME, ml.MATERIAL_SPECIFICATIONS
+        ORDER BY si.STORE_CODE, si.STORE_NAME
     </select>
 
     <insert id="insertBaseSpaceInfo" parameterType="BaseSpaceInfo">