商品档案

src/main/java/com/dk/mdm/mapper/mst/GoodsSkuMapper.xml

@@ -122,7 +122,16 @@
             <if test="cpId != null">
                 AND tmgs.cp_id = #{cpId}
             </if>
-
+            <if test="brandIds != null">
+                AND   EXISTS (
+                SELECT 1
+                FROM unnest(string_to_array(#{brandIds}, ',')) AS brand_uuid
+                WHERE brand_uuid::uuid = tmgs.brand_id
+                )
+            </if>
+            <if test="searchText !=null">
+                AND ( tmgs.sku_name LIKE concat('%', #{searchText}, '%')
+            </if>
         </where>
     </sql>
 
@@ -138,11 +147,20 @@
     <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_JOIN"/>
-        ,tmgb.brand_name AS "brandName",tmgsr.series_name AS "seriesName"
+        ,tmgb.brand_name AS "brandName",tmgsr.series_name AS "seriesName",tpi.usable_qty AS "usableQty"
         FROM dkic_b.t_mst_goods_sku  tmgs
         LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
         LEFT JOIN dkic_b.t_mst_goods_series tmgsr ON tmgsr.series_id = tmgs.series_id
+        LEFT JOIN dkic_b.t_psi_inventory tpi ON tpi.sku_id = tmgs.sku_id
         <include refid="Condition"/>
+        ORDER BY CASE
+        WHEN #{sort}  = 2 THEN tpi.usable_qty
+        ELSE NULL
+        END ASC,
+        CASE
+        WHEN #{sort} != 2 THEN tpi.usable_qty
+        ELSE NULL
+        END DESC
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>

src/main/java/com/dk/mdm/model/query/mst/GoodsSkuQuery.java

@@ -91,7 +91,7 @@ public class GoodsSkuQuery extends PageInfo<GoodsSku> implements Serializable {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String categoryId;
 
-
+    private String searchText;
     /**
      * 计量单位
      */
@@ -263,6 +263,15 @@ public class GoodsSkuQuery extends PageInfo<GoodsSku> implements Serializable {
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "品牌")
+    private String brandIds;
+
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/response/mst/GoodsSkuResponse.java

@@ -279,6 +279,12 @@ public class GoodsSkuResponse implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "辅助单位")
     private String subUnitName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "可售量")
+    private Integer usableQty;
+
+
     /*
      * 相关属性
      * @TableField(exist = false)