kcsw 添加多货位累加功能

src/main/java/com/chinaitop/depot/intelligent/basicdata/mapper/WareHouseBasicInfoMapper.xml

@@ -3,50 +3,90 @@
 <mapper namespace="com.chinaitop.depot.intelligent.basicdata.mapper.WareHouseBasicInfoMapper" >
     <select id="getStorehouseInfo" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT
-          t.*
+        tt.storehouse_type,
+        tt.storehouse_code,
+        tt.storehouse_name,
+        tt.design_capacity,
+        tt.house_doot_position,
+        tt.storehouse_state,
+        tt.dutyStoreman,
+        tt.lkmc,
+        tt.pz,
+        tt.hwxz,
+        tt.dj,
+        FORMAT(SUM(tt.kcsl) / 1000, 4) kcsl,
+        tt.rq,
+        tt.rcrq,
+        tt.cjsj,
+        tt.UnitID,
+        tt.hwh
         FROM
         (
-            SELECT
-                t2.storehouse_type,
-                t2.storehouse_code,
-                t2.storehouse_name,
-                t2.design_capacity,
-                t2.house_doot_position,
-                t2.storehouse_state,
-                t2.dutyStoreman,
-                t1.lkmc,
-                t1.pz,
-                t1.hwxz,
-                t1.dj,
-                FORMAT(t1.kcsl/1000,4) kcsl,
-                t4.EnumItemName rq,
-                DATE_FORMAT(t1.rq, '%Y-%m-%d') AS rcrq,
-                DATE_FORMAT(t1.cjsj, '%Y-%m-%d') AS cjsj,
-                t1.UnitID
-            FROM
-              `lsreport_ts`.data_kcgl_kcsw_default AS t1
-            LEFT JOIN `depot`.`basic_storehouse` t2 ON t1.UnitID = t2.org_id
-            AND t1.ch = t2.storehouse_id
-            LEFT JOIN `lsreport_ts`.`data_kcgl_fcbgz_default` t3 ON t2.org_id = t3.UnitID
-            AND t2.storehouse_id = t3.ch
-            LEFT JOIN `lsreport_ts`.`enumitem` t4 ON t3.scnf = t4.EnumItemId
-            <where>
-                  t2.del_flag = 1
-                <if test="org_id != null">
-                  AND t2.org_id = #{org_id}
-                </if>
-                <if test="library_type != null">
-                  AND t2.library_type = #{library_type}
-                </if>
-                <if test="cfCdoe != null">
-                  AND t2.storehouse_code = #{cfCdoe}
-                </if>
-            </where>
-            ORDER BY
-              t3.ModifyDate DESC
+        SELECT
+        t.storehouse_type,
+        t.storehouse_code,
+        t.storehouse_name,
+        t.design_capacity,
+        t.house_doot_position,
+        t.storehouse_state,
+        t.dutyStoreman,
+        t.lkmc,
+        t.pz,
+        t.hwxz,
+        t.dj,
+        t.kcsl,
+        t.rq,
+        t.rcrq,
+        t.cjsj,
+        t.UnitID,
+        t.hwh
+        FROM
+        (
+        SELECT
+        t2.storehouse_type,
+        t2.storehouse_code,
+        t2.storehouse_name,
+        t2.design_capacity,
+        t2.house_doot_position,
+        t2.storehouse_state,
+        t2.dutyStoreman,
+        t1.lkmc,
+        t1.pz,
+        t1.hwxz,
+        t1.dj,
+        t1.kcsl kcsl,
+        t4.EnumItemName rq,
+        DATE_FORMAT(t1.rq, '%Y-%m-%d') AS rcrq,
+        DATE_FORMAT(t1.cjsj, '%Y-%m-%d') AS cjsj,
+        t1.UnitID,
+        t1.hwh
+        FROM
+        `lsreport_ts`.data_kcgl_kcsw_default AS t1
+        INNER JOIN `depot`.`basic_storehouse` t2 ON t1.UnitID = t2.org_id
+        AND t1.ch = t2.storehouse_id
+        LEFT JOIN `lsreport_ts`.`data_kcgl_fcbgz_default` t3 ON t2.org_id = t3.UnitID
+        AND t2.storehouse_id = t3.ch
+        LEFT JOIN `lsreport_ts`.`enumitem` t4 ON t3.scnf = t4.EnumItemId
+        <where>
+            t2.del_flag = 1
+            <if test="org_id != null">
+                AND t2.org_id = #{org_id}
+            </if>
+            <if test="library_type != null">
+                AND t2.library_type = #{library_type}
+            </if>
+            <if test="cfCdoe != null">
+                AND t2.storehouse_code = #{cfCdoe}
+            </if>
+        </where>
+        ORDER BY
+        t3.ModifyDate DESC
         ) t
         GROUP BY
-          t.storehouse_code
+        t.hwh
+        ) tt
+        GROUP BY
+        tt.storehouse_code
     </select>
     <select id="getYGInfo" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT