From de7c40e6cee38fad928af7f1a9e1549f6c7e5ba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Sat, 7 Feb 2026 15:40:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2=E7=BB=B4=E5=BA=A6=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E6=8F=92=E5=8F=99;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/MaterialInventoryMapper.java       | 12 +++-
 .../persistence/MaterialInventoryImpl.java    | 17 +++++-
 .../repository/todo/MaterialInventoryDO.java  |  3 +
 .../MaterialInventoryDTO.java                 |  4 +-
 .../MaterialInventoryMapper.xml               | 59 ++++++++++++++++++-
 5 files changed, 87 insertions(+), 8 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/mapper/MaterialInventoryMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/mapper/MaterialInventoryMapper.java
index 36919cd3c..a333dd8a8 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/mapper/MaterialInventoryMapper.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/mapper/MaterialInventoryMapper.java
@@ -23,10 +23,16 @@ import java.util.List;
  */
 public interface MaterialInventoryMapper extends BaseMapper<MaterialInventory>
 {
-    /**
-     * 查询物料库存列表
-     */
+    //查全部
     public List<MaterialInventoryPO> queryList(MaterialInventoryDO materialInventoryDO);
+    //查物料库存列表-物料/库位
+    public List<MaterialInventoryPO> queryListByWlKw(MaterialInventoryDO materialInventoryDO);
+    //查物料库存列表-库位
+    public List<MaterialInventoryPO> queryListByKw(MaterialInventoryDO materialInventoryDO);
+    //查物料库存列表-物料
+    public List<MaterialInventoryPO> queryListByWl(MaterialInventoryDO materialInventoryDO);
+    //查物料库存列表-货主
+    public List<MaterialInventoryPO> queryListByHz(MaterialInventoryDO materialInventoryDO);
 
     /**
      * @description 批量增加库存
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
index 04fb79542..6578328e8 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
@@ -48,7 +48,20 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
     @Override
     public List<MaterialInventoryPO> queryList(MaterialInventoryDO materialInventoryDO)
     {
-        return materialInventoryMapper.queryList(materialInventoryDO);
+        String queryRule = materialInventoryDO.getQueryRule();
+        if ("hz".equals(queryRule)) {
+            return materialInventoryMapper.queryListByHz(materialInventoryDO);
+        } else if ("wl".equals(queryRule)) {
+            return materialInventoryMapper.queryListByWl(materialInventoryDO);
+        } else if ("kw".equals(queryRule)) {
+            return materialInventoryMapper.queryListByKw(materialInventoryDO);
+        } else if ("wlkw".equals(queryRule)) {
+            return materialInventoryMapper.queryListByWlKw(materialInventoryDO);
+        } else if ("all".equals(queryRule)) {
+            return materialInventoryMapper.queryList(materialInventoryDO);
+        } else {
+            throw new ServiceException("查询规则不存在");
+        }
     }
 
     /**
@@ -365,4 +378,4 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
     public MaterialInventoryPO selectOneByWhere(MaterialInventoryDO materialInventoryDO) {
         return materialInventoryMapper.selectOneByWhere(materialInventoryDO);
     }
-}
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
index e330069ba..55ae816b8 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
@@ -226,4 +226,7 @@ public class MaterialInventoryDO extends MaterialBaseDO {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date extAttr4;
+
+    //查询规则 hz:货主,wl:物料,kw:库位,wlkw:物料库位,all:全部
+    private String queryRule;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
index 70da48443..3505e386a 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
@@ -159,4 +159,6 @@ public class MaterialInventoryDTO extends MaterialBaseDTO {
     @ApiModelProperty("箱号/卡板号")
     @Excel(name = "箱号/卡板号")
     private String boxPalletNo;
-}
+    //查询规则 hz:货主,wl:物料,kw:库位,wlkw:物料库位,all:全部
+    private String queryRule;
+}
\ No newline at end of file
diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
index d25637f67..0e946a7f3 100644
--- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
@@ -69,8 +69,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.shipper_id, a.shipper_code, a.shipper_name,
         a.warehouse_id, a.warehouse_code, a.warehouse_name,
         a.storage_section_id, a.storage_code, a.storage_name, a.storage_location_id, a.storage_location_code, a.storage_location_name, a.material_base_info_id,a.material_detail_id,
-        a.batch_number,a.material_status_code,a.material_status_name,a.container_id,a.container_code,a.container_type,a.container_type_name,IFNULL(a.freeze_quantity,0) freeze_quantity,a.is_able,
-        IFNULL(a.inventory_quantity,0) inventory_quantity, IFNULL(a.allocation_quantity,0) allocation_quantity, a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name,
+        a.batch_number,a.material_status_code,a.material_status_name,a.container_id,a.container_code,a.container_type,a.container_type_name
+        ,IFNULL (sum(a.freeze_quantity), 0) freeze_quantity,a.is_able,
+        IFNULL (sum(a.inventory_quantity), 0) inventory_quantity,
+        IFNULL (sum(a.allocation_quantity), 0) allocation_quantity,
+        a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name,
         a.del_flag,a.unit,a.area,a.NET_WEIGHT,a.GROSS_WEIGHT,a.VOLUME,
         a.BATCH_REF_NO, a.SHEET_REF_NO, a.BOX_PALLET_NO,nvl(a.unit_name,b.unit_name) as unit_name
     </sql>
@@ -186,6 +189,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="selectMaterialInventoryPo1"/>
             <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
         </where>
+        group by a.MATERIAL_INVENTORY_ID
+    </select>
+
+    <select id="queryListByWlKw" parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO" resultMap="MaterialInventoryResult">
+        select
+        <include refid="selectMaterialInventoryPo"/>
+        <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPo"/>
+        from material_inventory a
+        left join material_base_info b on a.material_base_info_id = b.material_base_info_id
+        <where>
+            <include refid="selectMaterialInventoryPo1"/>
+            <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
+        </where>
+        GROUP BY a.MATERIAL_BASE_INFO_ID,a.WAREHOUSE_ID,a.STORAGE_SECTION_ID,a.STORAGE_LOCATION_ID
+    </select>
+
+    <select id="queryListByKw" parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO" resultMap="MaterialInventoryResult">
+        select
+        <include refid="selectMaterialInventoryPo"/>
+        <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPo"/>
+        from material_inventory a
+        left join material_base_info b on a.material_base_info_id = b.material_base_info_id
+        <where>
+            <include refid="selectMaterialInventoryPo1"/>
+            <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
+        </where>
+        GROUP BY a.WAREHOUSE_ID,a.STORAGE_SECTION_ID,a.STORAGE_LOCATION_ID
+    </select>
+
+    <select id="queryListByWl" parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO" resultMap="MaterialInventoryResult">
+        select
+        <include refid="selectMaterialInventoryPo"/>
+        <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPo"/>
+        from material_inventory a
+        left join material_base_info b on a.material_base_info_id = b.material_base_info_id
+        <where>
+            <include refid="selectMaterialInventoryPo1"/>
+            <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
+        </where>
+        GROUP BY a.MATERIAL_BASE_INFO_ID
+    </select>
+
+    <select id="queryListByHz" parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO" resultMap="MaterialInventoryResult">
+        select
+        <include refid="selectMaterialInventoryPo"/>
+        <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPo"/>
+        from material_inventory a
+        left join material_base_info b on a.material_base_info_id = b.material_base_info_id
+        <where>
+            <include refid="selectMaterialInventoryPo1"/>
+            <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
+        </where>
     </select>
 
     <resultMap type="com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryQueryListPO" id="MaterialQueryListResult">