Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -1252,6 +1252,7 @@
         from dkic_b.t_mst_supplier tms
         <where >
              tms.sup_type = '供应商类别-采购'
+            and tms.cp_id = #{cpId}
             <if test="flgValid">
                 AND tms.flg_valid
             </if>
@@ -1281,6 +1282,7 @@
         cus.address_full as "addressFull"
         from dkic_b.t_mst_customer cus
         <where>
+              cus.cp_id = #{cpId}
             <if test="flgValid">
                 AND cus.flg_valid
             </if>
@@ -1321,6 +1323,7 @@
         from dkic_b.t_mst_supplier tms
         <where>
             tms.sup_type = '供应商类别-采购'
+            and tms.cp_id = #{cpId}
             <if test="flgValid">
                 AND tms.flg_valid
             </if>
@@ -1349,6 +1352,7 @@
         cus.address_full as "addressFull"
         from dkic_b.t_mst_customer cus
         <where>
+            and cus.cp_id = #{cpId}
             <if test="flgValid">
                 AND cus.flg_valid
             </if>

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

@@ -67,6 +67,9 @@
         <result column="subUnitName" property="subUnitName"/>
         <result column="unitName" property="unitName"/>
         <result column="flg_sub_unit" property="flgSubUnit"/>
+        <result column="seriesName" property="seriesName"/>
+        <result column="catName" property="catName"/>
+
         <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
 
     </resultMap>
@@ -156,6 +159,8 @@
         ,tmgb.brand_name
         ,tmgb.short_name
         ,tmw.wh_name
+        ,tmgc.cat_name as "catName"
+        ,tmgseries.series_name as "seriesName"
         FROM dkic_b.t_psi_inventory tpi
         <include refid="Join_Table"/>
         <include refid="Condition"/>
@@ -185,6 +190,9 @@
         LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
         LEFT JOIN dkic_b.t_mst_unit tmu ON tmu.unit_id = tmgs.unit_id
         LEFT JOIN dkic_b.t_mst_unit subtmu ON subtmu.unit_id = tmgs.sub_unit_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_series as tmgseries on tmgs.series_id = tmgseries.series_id
+
     </sql>
 
 

src/main/java/com/dk/mdm/model/response/ivt/InventoryResponse.java

@@ -197,6 +197,14 @@ public class InventoryResponse {
     @ApiModelProperty(value = "仓库名称")
     private String whName;
 
+    @Excel(name = "种类名称")
+    @ApiModelProperty(value = "种类名称")
+    private String catName;
+
+    @Excel(name = "商品系列")
+    @ApiModelProperty(value = "商品系列")
+    private String seriesName;
+
 
     /**
      * 采购价