Merge branch 'dev_lzh_wms_20260120' into wms_dev

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java

@@ -165,4 +165,7 @@ public class MaterialInventoryDO extends MaterialBaseDO {
     @ApiModelProperty("面积")
     @Excel(name = "面积")
     private BigDecimal area;
+
+    @ApiModelProperty("货主id")
+    private Long shipperId;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java

@@ -144,4 +144,7 @@ public class MaterialInventoryDTO extends MaterialBaseDTO {
     @ApiModelProperty("物料/库位信息")
     @Excel(name = "物料/库位信息")
     private String storageInfo;
+
+    @ApiModelProperty("货主id")
+    private Long shipperId;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java

@@ -47,6 +47,16 @@ public class MaterialInventoryApi extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("查询物料库存列表不分页")
+    @GetMapping("/listAll")
+    public TableDataInfo listAll(MaterialInventoryDTO materialInventoryDTO)
+    {
+        //转换实体
+        MaterialInventoryDO materialInventoryDO = materialInventoryAssembler.toDO(materialInventoryDTO);
+        List<MaterialInventoryPO> list = materialInventoryApplicationService.queryList(materialInventoryDO);
+        return getDataTable(list);
+    }
+
     /**
      * 编辑物料库存
      */

mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml

@@ -70,6 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="warehouseId != null ">
             and a.warehouse_id = #{warehouseId}
         </if>
+        <if test="shipperId != null ">
+            and a.shipper_id = #{shipperId}
+        </if>
         <if test="warehouseCode != null  and warehouseCode != ''">
             and a.warehouse_code = #{warehouseCode}
         </if>