dongke 1 năm trước cách đây
mục cha
commit
7bcc593ce0

+ 1 - 0
src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -498,6 +498,7 @@
         tmgs.remarks,
         tmgs.remarks,
         tmgs.pack_box AS "packBox"
         tmgs.pack_box AS "packBox"
         ,tmgu.decimal_places    as "decimalPlaces"
         ,tmgu.decimal_places    as "decimalPlaces"
+        ,tmgs.flg_price as "flgPrice"
         from dkic_b.t_mst_goods_sku as tmgs
         from dkic_b.t_mst_goods_sku as tmgs
         left join dkic_b.t_mst_goods_brand as tmgb on tmgs.brand_id = tmgb.brand_id
         left join dkic_b.t_mst_goods_brand as tmgb on tmgs.brand_id = tmgb.brand_id
         left join dkic_b.t_mst_goods_category as tmgc on tmgs.category_id = tmgc.cat_id
         left join dkic_b.t_mst_goods_category as tmgc on tmgs.category_id = tmgc.cat_id

+ 2 - 0
src/main/java/com/dk/mdm/mapper/ivt/InventoryMapper.xml

@@ -79,6 +79,7 @@
         <result column="warning_lower_limit" property="warningLowerLimit"/>
         <result column="warning_lower_limit" property="warningLowerLimit"/>
         <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
         <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
         <result column="decimalPlaces" property="decimalPlaces"/>
         <result column="decimalPlaces" property="decimalPlaces"/>
+        <result column="flg_price" property="flgPrice"/>
     </resultMap>
     </resultMap>
 
 
     <!-- 通用条件列 -->
     <!-- 通用条件列 -->
@@ -179,6 +180,7 @@
         ,tmgc.cat_name as "catName"
         ,tmgc.cat_name as "catName"
         ,tmgseries.series_name as "seriesName"
         ,tmgseries.series_name as "seriesName"
         ,tmu.decimal_places    as "decimalPlaces"
         ,tmu.decimal_places    as "decimalPlaces"
+        ,tmgs.flg_price
         FROM dkic_b.t_psi_inventory tpi
         FROM dkic_b.t_psi_inventory tpi
         <include refid="Join_Table"/>
         <include refid="Join_Table"/>
         <include refid="Condition"/>
         <include refid="Condition"/>

+ 6 - 0
src/main/java/com/dk/mdm/model/response/ivt/InventoryResponse.java

@@ -285,6 +285,12 @@ public class InventoryResponse {
     @TableField(exist = false)
     @TableField(exist = false)
     private Integer decimalPlaces;
     private Integer decimalPlaces;
 
 
+    /**
+     * 价格体系标识
+     */
+    @ApiModelProperty(value = "价格体系标识")
+    private Boolean flgPrice;
+
     // 警戒上限
     // 警戒上限
     private Long warningUpperLimit;
     private Long warningUpperLimit;
     // 警戒下限
     // 警戒下限