Merge branch 'refs/heads/dev-ty1.2' into dev

# Conflicts: # mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java # mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java # mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java # mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java # mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java # mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java # mhd_oms/src/main/java/com/mhd/oms/infrastructure/feign/ThirdPartyServiceFeign.java # mhd_oms/src/main/resources/bootstrap.yml
2026-09-01 23:49:08 +08:00
parent 19e897cae0 da3c58a366
commit 471b515a45
111 changed files with 4773 additions and 320 deletions
@@ -102,4 +102,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <include refid="selectStorageSectionPo1"/>
        order by a.storage_name asc, a.create_time desc
    </select>
+
+    <!-- 库区面积合计：与 queryList 相同筛选条件，SUM(库区面积)，无数据时返回 0 -->
+    <select id="sumStorageRegion" parameterType="com.mhd.basic.domain.storageSection.repository.todo.StorageSectionDO" resultType="java.math.BigDecimal">
+        select IFNULL(SUM(a.storage_region), 0)
+        from storage_section a
+        LEFT JOIN warehouse w ON a.warehouse_id = w.warehouse_id AND w.del_flag = 1
+        <include refid="selectStorageSectionPo1"/>
+    </select>
 </mapper>