选品拍，库存查询

src/main/java/com/dk/mdm/controller/common/CommonController.java

@@ -447,6 +447,17 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<List<Map<String, Object>>> getGoodsCategoryNoPage(@RequestBody Map<String, Object> param) {
         return commonService.getGoodsCategoryNoPage(param);
     }
+
+    /**
+     * @desc :  获取商品品牌
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"get_goods_brand_no_page"})
+    public ResponseResultVO<List<Map<String, Object>>> goodsBrandListNoPage(@RequestBody Map<String, Object> param) {
+        return commonService.goodsBrandListNoPage(param);
+    }
     /**
      * @desc :  商品种类查询
      * @author : 王英杰

src/main/java/com/dk/mdm/mapper/ivt/InventoryMapper.xml

@@ -108,6 +108,9 @@
             <if test="categoryId != null and categoryId != ''">
                 AND tmgs.category_id = #{categoryId}::UUID
             </if>
+            <if test="brandId != null and brandId != ''">
+                AND tmgs.brand_id = #{brandId}::UUID
+            </if>
             <if  test="searchText != null">
                 AND (tmgs.sku_code  like concat('%', my_ex.likequery(#{searchText}) , '%')
                 OR  tmgs.sku_name like concat('%', my_ex.likequery(#{searchText}) , '%')

src/main/java/com/dk/mdm/model/query/ivt/InventoryQuery.java

@@ -53,6 +53,15 @@ public class InventoryQuery extends PageInfo<InventoryQuery>{
     private String categoryId;
 
     /**
+     * 商品品牌
+     */
+    @Excel(name = "商品品牌")
+    @ApiModelProperty(value = "商品品牌")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String brandId;
+
+
+    /**
      * 仓库ID
      */
     @ApiModelProperty(value = "仓库ID")

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -540,6 +540,17 @@ public class CommonService extends BaseService<Map<String, Object>> {
     }
 
     /**
+     * @desc : 获取商品品牌（不带分页分页）
+     * @author : 姜永辉
+     * @date : 2024/3/1 9:20
+     */
+    public ResponseResultVO<List<Map<String, Object>>> goodsBrandListNoPage(Map<String, Object> param) {
+        // 获取公司
+        List<Map<String, Object>> list = commonMapper.getGoodsBrand(param);
+        return ResponseResultUtil.success(list);
+    }
+
+    /**
      * @desc : 获取商品种类（分页）
      * @author : 王英杰
      * @date : 2024/3/1 9:20