商品属性

src/main/java/com/dk/mdm/mapper/mst/GoodsBrandMapper.java

@@ -34,5 +34,6 @@ public interface GoodsBrandMapper extends BaseMapper<GoodsBrand>{
      * @date : 2024/2/26 10:36
      */
     Integer selectDisplayNo(GoodsBrandQuery goodsBrandQuery);
+    Integer saveSupplierBrand(String supId,String brandId);
 }
 

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

@@ -43,6 +43,7 @@
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
         <result column="goodsBrand" property="goodsBrand"/>
+        <result column="supplierName" property="supplierName"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -88,7 +89,11 @@
     <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_Join"/>,
-        '商品品牌' AS "goodsBrand"
+        '商品品牌' AS "goodsBrand",
+        (SELECT  COALESCE(array_to_string(array_agg(tsm.sup_name), ','),'')
+        FROM dkic_b.t_mst_supplier_brand tsmb
+        left join dkic_b.t_mst_supplier tsm on tsm.sup_id = tsmb.sup_id
+        WHERE tsmb.brand_id  =  tmgb.brand_id) AS "supplierName"
         FROM dkic_b.t_mst_goods_brand tmgb
         <include refid="Condition"/>
         order by display_no asc
@@ -149,7 +154,7 @@
         <foreach collection="list" index="index" item="item" separator=",">
             (
             <trim suffixOverrides=",">
-                #{brandCode},
+                #{item.brandCode},
                 #{item.brandName},
                 #{item.shortName},
                 #{item.displayNo},
@@ -170,4 +175,10 @@
     </select>
 
 
+    <insert id="saveSupplierBrand">
+        insert into dkic_b.t_mst_supplier_brand
+            (sup_id, brand_id)
+        values (#{supId}::uuid,
+                #{brandId}::uuid)
+    </insert>
 </mapper>

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

@@ -227,51 +227,6 @@
     </select>
 
 
-
-
-
-<!--    <insert id="insert">-->
-<!--        insert into dkic_b.t_mst_goods_category-->
-<!--        (-->
-<!--        <trim suffixOverrides=",">-->
-<!--            cat_code,-->
-<!--            cat_name,-->
-<!--            parent_id,-->
-<!--            display_no,-->
-<!--            top_id,-->
-<!--            level_upper,-->
-<!--            level_lower,-->
-<!--            level_leaf,-->
-<!--            level_no,-->
-<!--            level_code,-->
-<!--            level_name,-->
-<!--            remarks,-->
-<!--            cp_id,-->
-<!--            op_app_code,-->
-<!--        </trim>-->
-<!--        )-->
-<!--        values-->
-
-<!--        (-->
-<!--        <trim suffixOverrides=",">-->
-<!--            #{catCode},-->
-<!--            #{catName},-->
-<!--            #{parentId}::uuid,-->
-<!--            #{displayNo},-->
-<!--            #{topId}::uuid,-->
-<!--            #{levelUpper},-->
-<!--            #{levelLower},-->
-<!--            #{levelLeaf},-->
-<!--            #{levelNo},-->
-<!--            #{levelCode},-->
-<!--            #{levelName},-->
-<!--            #{remarks},-->
-<!--            #{cpId},-->
-<!--            #{opAppCode},-->
-<!--        </trim>-->
-<!--        )-->
-
-<!--    </insert>-->
     <select id="resetLevelGoodsCategory" resultType="java.lang.Boolean">
         select dkic_b.f_reset_level_goods_category(#{cpId}, #{topId}::uuid)
     </select>

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

@@ -168,6 +168,8 @@ public class GoodsBrandResponse extends PageInfo<GoodsBrandResponse> implements
 
 
     private String goodsBrand;
+
+    private String supplierName;
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/vo/mst/GoodsBrandVO.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
+import com.dk.common.infrastructure.handler.UuidListTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -20,6 +21,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  商品品牌
@@ -113,7 +115,9 @@ public class GoodsBrandVO extends PageInfo<GoodsBrandVO> implements Serializable
     private LocalDateTime opCreateTime;
 
 
-
+    @ApiModelProperty(value = "供应商ids")
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    private List<String> supplierIds;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/service/mst/GoodsBrandService.java

@@ -26,6 +26,7 @@ import com.dk.mdm.model.query.mst.GoodsBrandQuery;
 import com.dk.mdm.model.response.mst.GoodsBrandResponse;
 import com.dk.mdm.model.vo.mst.GoodsBrandVO;
 
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -95,6 +96,12 @@ public class GoodsBrandService extends BaseService<GoodsBrand> {
 		goodsBrand.setBrandCode(uniqueNoteCode.get("outNote").toString());
 		//新建
 		goodsBrandMapper.insert(goodsBrand);
+
+		//保存供应商
+		List<String> supplierIds = goodsBrandVO.getSupplierIds();
+		for (String supplierId : supplierIds) {
+			goodsBrandMapper.saveSupplierBrand(supplierId,goodsBrand.getBrandId());
+		}
 		return ResponseResultUtil.success();
 	}