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

src/main/java/com/dk/mdm/controller/mst/GoodsCategoryController.java

@@ -75,6 +75,8 @@ public class GoodsCategoryController{
      */
     @PostMapping("disable/{id}")
     public ResponseResultVO<Boolean> disable(@PathVariable String id) {
+        //批量停用
+        goodsCategoryService.disableBachByParentId(id);
         return this.getService().disable(id);
     }
 
@@ -85,6 +87,8 @@ public class GoodsCategoryController{
      */
     @PostMapping("enable/{id}")
     public ResponseResultVO<Boolean> enable(@PathVariable String id) {
+        //批量启用
+        goodsCategoryService.enableBachByParentId(id);
         return this.getService().enable(id);
     }
 

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

@@ -34,11 +34,5 @@ public interface GoodsBrandMapper extends BaseMapper<GoodsBrand>{
      * @date : 2024/2/26 10:36
      */
     Integer selectDisplayNo(GoodsBrandQuery goodsBrandQuery);
-    /**
-     * @desc   : 生成编码
-     * @author : 于继渤
-     * @date : 2024/2/26 10:36
-     */
-    String setBrandCode(GoodsBrand goodsBrand);
 }
 

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

@@ -97,9 +97,7 @@
         </if>
     </select>
 
-    <select id="setBrandCode"  resultType="String">
-        select dkic_b.f_create_code(1,#{brandId}::uuid,'品牌');
-    </select>
+
 
     <!-- 查询表t_mst_goods_brand，（条件查询）个数 -->
     <select id="countByCond" resultType="Long">
@@ -139,7 +137,6 @@
         insert into dkic_b.t_mst_goods_brand
         (
         <trim suffixOverrides=",">
-            barand_id,
             brand_code,
             brand_name,
             short_name,
@@ -152,8 +149,7 @@
         <foreach collection="list" index="index" item="item" separator=",">
             (
             <trim suffixOverrides=",">
-                (SELECT sys.f_uuid_seq()),
-                dkic_b.f_create_code(1, (SELECT sys.f_uuid_seq()), '品牌'),
+                #{brandCode},
                 #{item.brandName},
                 #{item.shortName},
                 #{item.displayNo},
@@ -164,34 +160,6 @@
         </foreach>
     </insert>
 
-<!--    <insert id="insert">-->
-<!--        &lt;!&ndash; 使用 selectKey 来生成 brand_id &ndash;&gt;-->
-<!--        <selectKey keyProperty="brandId" resultType="java.lang.String" order="BEFORE">-->
-<!--            SELECT sys.f_uuid_seq() AS brandId-->
-<!--        </selectKey>-->
-<!--        &lt;!&ndash; 构建插入语句 &ndash;&gt;-->
-<!--        insert into dkic_b.t_mst_goods_brand-->
-<!--        (-->
-<!--        brand_id,-->
-<!--        brand_code,-->
-<!--        brand_name,-->
-<!--        short_name,-->
-<!--        display_no,-->
-<!--        remarks,-->
-<!--        cp_id-->
-<!--        )-->
-<!--        values-->
-<!--        (-->
-<!--        #{brandId}::uuid,-->
-<!--        dkic_b.f_create_code(1, #{brandId}::uuid, '品牌'),-->
-<!--        #{brandName},-->
-<!--        #{shortName},-->
-<!--        #{displayNo},-->
-<!--        #{remarks},-->
-<!--        #{cpId}-->
-<!--        )-->
-<!--    </insert>-->
-
 
 
 
@@ -202,34 +170,4 @@
     </select>
 
 
-
-    <update id="updateById" parameterType="com.dk.mdm.model.pojo.mst.GoodsBrand">
-        update
-        dkic_b.t_mst_goods_brand
-        <set>
-            <if test="et.brandCode != null">
-                brand_code = #{et.brandCode},
-            </if>
-            <if test="et.brandName != null">
-                brand_name = #{et.brandName},
-            </if>
-            <if test="et.shortName != null">
-                short_name = #{et.shortName},
-            </if>
-            <if test="et.displayNo != null">
-                display_no = #{et.displayNo},
-            </if>
-            <if test="et.remarks != null">
-                remarks = #{et.remarks},
-            </if>
-            <if test="et.cpId != null">
-                cp_id = #{et.cpId},
-            </if>
-            <if test="et.flgValid != null">
-                flg_valid = #{et.flgValid},
-            </if>
-
-        </set>
-        where brand_id = #{et.brandId}::uuid
-    </update>
 </mapper>

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

@@ -13,19 +13,19 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 /**
-*  商品种类 Mapper
-*/
+ * 商品种类 Mapper
+ */
 @Repository
-public interface GoodsCategoryMapper extends BaseMapper<GoodsCategory>{
+public interface GoodsCategoryMapper extends BaseMapper<GoodsCategory> {
     /**
-     * @desc   : 根据条件进行查询
+     * @desc : 根据条件进行查询
      * @author : 于继渤
      * @date : 2024/2/26 10:36
      */
     List<GoodsCategoryResponse> selectByCond(GoodsCategoryQuery goodsCategoryQuery);
 
     /**
-     * @desc   : 根据条件进行查询（数量）
+     * @desc : 根据条件进行查询（数量）
      * @author : 于继渤
      * @date : 2024/2/26 10:36
      */
@@ -33,19 +33,34 @@ public interface GoodsCategoryMapper extends BaseMapper<GoodsCategory>{
 
 
     /**
-     * @desc   : 查询排序
+     * @desc : 查询排序
      * @author : 于继渤
      * @date : 2024/2/26 10:36
      */
     Integer selectDisplayNo(GoodsCategoryQuery goodsCategoryQuery);
 
+
     /**
-     * @desc   : 生成编码
+     * @desc : 调用函数生成层级
      * @author : 于继渤
      * @date : 2024/2/26 10:36
      */
-    String setCategoryCode(GoodsCategory goodsCategory);
-
     Boolean resetLevelGoodsCategory(GoodsCategoryQuery goodsCategoryQuery);
+
+    /**
+     * @desc : 批量启用 根据父级id
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    Integer enableBachByParentId(String id);
+
+    /**
+     * @desc : 批量停用 根据父级id
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    Integer disableBachByParentId(String id);
+
+
 }
 

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

@@ -5,37 +5,37 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        cat_id, cat_code, cat_name, parent_id, display_no, top_id, level_upper, level_lower, level_leaf, level_no, level_code, level_name, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        cat_id
+        , cat_code, cat_name, parent_id, display_no, top_id, level_upper, level_lower, level_leaf, level_no, level_code, level_name, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.mst.GoodsCategory">
         <id column="cat_id" property="catId"/>
-                <result column="cat_code" property="catCode"/>
-                <result column="cat_name" property="catName"/>
-                <result column="parent_id" property="parentId" typeHandler="UuidTypeHandler"/>
-                <result column="display_no" property="displayNo"/>
-                <result column="top_id" property="topId" typeHandler="UuidTypeHandler"/>
-                <result column="level_upper" property="levelUpper" typeHandler="UuidTypeHandler"/>
-                <result column="level_lower" property="levelLower" typeHandler="UuidTypeHandler"/>
-                <result column="level_leaf" property="levelLeaf"/>
-                <result column="level_no" property="levelNo"/>
-                <result column="level_code" property="levelCode"/>
-                <result column="level_name" property="levelName"/>
-                <result column="remarks" property="remarks"/>
-                <result column="flg_valid" property="flgValid"/>
-                <result column="cp_id" property="cpId"/>
-            <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
-                <result column="op_create_user_id" property="opCreateUserId" typeHandler="UuidTypeHandler"/>
-            <result column="op_update_time" property="opUpdateTime" typeHandler="TimestampTypeHandler"/>
-                <result column="op_update_user_id" property="opUpdateUserId" typeHandler="UuidTypeHandler"/>
-                <result column="op_app_code" property="opAppCode"/>
-            <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
-                <result column="op_db_user" property="opDbUser"/>
+        <result column="cat_code" property="catCode"/>
+        <result column="cat_name" property="catName"/>
+        <result column="parent_id" property="parentId" typeHandler="UuidTypeHandler"/>
+        <result column="display_no" property="displayNo"/>
+        <result column="top_id" property="topId" typeHandler="UuidTypeHandler"/>
+        <result column="level_upper" property="levelUpper" typeHandler="UuidTypeHandler"/>
+        <result column="level_lower" property="levelLower" typeHandler="UuidTypeHandler"/>
+        <result column="level_leaf" property="levelLeaf"/>
+        <result column="level_no" property="levelNo"/>
+        <result column="level_code" property="levelCode"/>
+        <result column="level_name" property="levelName"/>
+        <result column="remarks" property="remarks"/>
+        <result column="flg_valid" property="flgValid"/>
+        <result column="cp_id" property="cpId"/>
+        <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
+        <result column="op_create_user_id" property="opCreateUserId" typeHandler="UuidTypeHandler"/>
+        <result column="op_update_time" property="opUpdateTime" typeHandler="TimestampTypeHandler"/>
+        <result column="op_update_user_id" property="opUpdateUserId" typeHandler="UuidTypeHandler"/>
+        <result column="op_app_code" property="opAppCode"/>
+        <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
+        <result column="op_db_user" property="opDbUser"/>
     </resultMap>
 
 
-
     <resultMap id="BaseResultMapResponse" type="com.dk.mdm.model.response.mst.GoodsCategoryResponse">
         <id column="cat_id" property="catId"/>
         <result column="cat_code" property="catCode"/>
@@ -137,6 +137,7 @@
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_mst_goods_category
         <include refid="Condition"/>
+        ORDER BY display_no
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>
@@ -221,94 +222,68 @@
 
 
     <select id="selectDisplayNo" resultType="Integer">
-        SELECT MAX(display_no) + 1  FROM dkic_b.t_mst_goods_category
+        SELECT MAX(display_no) + 1 FROM dkic_b.t_mst_goods_category
         <include refid="Condition"/>
     </select>
 
 
-    <select id="setCategoryCode"  resultType="String">
-        select dkic_b.f_create_code(1,#{catId}::uuid,'种类');
-    </select>
 
 
-<!--    <update id="updateById"  parameterType="com.dk.mdm.model.pojo.mst.GoodsCategory">-->
-<!--        update-->
-<!--        dkic_b.t_mst_goods_category-->
-<!--        <set>-->
-<!--            <if test="et.catCode != null">-->
-<!--                cat_code = #{et.catCode},-->
-<!--            </if>-->
-<!--            <if test="et.catName != null">-->
-<!--                cat_name = #{et.catName},-->
-<!--            </if>-->
-<!--            <if test="et.parentId != null">-->
-<!--                parent_id = #{et.parentId}::uuid,-->
-<!--            </if>-->
-<!--            <if test="et.displayNo != null">-->
-<!--                display_no = #{et.displayNo},-->
-<!--            </if>-->
-<!--            <if test="et.topId != null">-->
-<!--                top_id = #{et.topId}::uuid,-->
-<!--            </if>-->
-<!--            <if test="et.remarks != null">-->
-<!--                remarks = #{et.remarks},-->
-<!--            </if>-->
-<!--            <if test="et.cpId != null">-->
-<!--                cp_id = #{et.cpId},-->
-<!--            </if>-->
-<!--            <if test="et.flgValid != null">-->
-<!--                flg_valid = #{et.flgValid},-->
-<!--            </if>-->
 
-<!--        </set>-->
-<!--        where cat_id = #{et.catId}::uuid-->
-<!--    </update>-->
+<!--    <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>
 
-    <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>
-            )
+    <!--    批量启用 根据父级id-->
+    <update id="enableBachByParentId">
+        update dkic_b.t_mst_goods_category set  flg_valid = true  where parent_id = #{id}::uuid
+    </update>
 
-    </insert>
-    <select id="resetLevelGoodsCategory" resultType="java.lang.Boolean">
-       select dkic_b.f_reset_level_goods_category(#{cpId},#{topId}::uuid)
-    </select>
+    <!--    批量停用 根据父级id-->
+    <update id="disableBachByParentId">
+        update dkic_b.t_mst_goods_category set  flg_valid = false  where parent_id = #{id}::uuid
+    </update>
 </mapper>

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

@@ -35,11 +35,6 @@ public interface GoodsSeriesMapper extends BaseMapper<GoodsSeries>{
      * @date : 2024/2/26 10:36
      */
     Integer selectDisplayNo(GoodsSeriesQuery goodsSeriesQuery);
-    /**
-     * @desc   : 生成编码
-     * @author : 于继渤
-     * @date : 2024/2/26 10:36
-     */
-    String setSeriesCode(GoodsSeries goodsSeries);
+
 }
 

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

@@ -154,9 +154,6 @@
     </insert>
 
 
-    <select id="setSeriesCode" resultType="String">
-        select dkic_b.f_create_code(1, #{seriesId}::uuid, '系列');
-    </select>
 
     <select id="selectDisplayNo" resultType="Integer">
         SELECT MAX(display_no) + 1 FROM dkic_b.t_mst_goods_series
@@ -164,32 +161,4 @@
     </select>
 
 
-    <update id="updateById" parameterType="com.dk.mdm.model.pojo.mst.GoodsSeries">
-        update
-        dkic_b.t_mst_goods_series
-        <set>
-
-            <if test="et.seriesCode != null">
-                series_code = #{et.seriesCode},
-            </if>
-            <if test="et.seriesName != null">
-                series_name = #{et.seriesName},
-            </if>
-
-            <if test="et.displayNo != null">
-                display_no = #{et.displayNo},
-            </if>
-            <if test="et.remarks != null">
-                remarks = #{et.remarks},
-            </if>
-            <if test="et.cpId != null">
-                cp_id = #{et.cpId},
-            </if>
-            <if test="et.flgValid != null">
-                flg_valid = #{et.flgValid},
-            </if>
-
-        </set>
-        where series_id = #{et.seriesId}::uuid
-    </update>
 </mapper>

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

@@ -35,7 +35,6 @@ public interface RoleMapper extends BaseMapper<Role>{
      * @date : 2024/2/26 10:36
      */
     Integer selectDisplayNo(RoleQuery roleQuery);
-    String setRoleCode(Role role);
 
 }
 

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

@@ -140,9 +140,7 @@
         <include refid="Condition"/>
     </select>
 
-    <select id="setRoleCode"  resultType="String">
-        select dkic_b.f_create_code(1,#{roleId}::uuid,'角色');
-    </select>
+
 
     <!-- 根据主键查询表t_mst_role的一行数据 -->
     <select id="selectById" resultMap="BaseResultMap">
@@ -216,36 +214,5 @@
     </insert>
 
 
-    <update id="updateById" parameterType="com.dk.mdm.model.pojo.mst.Role">
-        update
-        dkic_b.t_mst_role
-        <set>
-            <if test="et.roleName != null">
-                role_name = #{et.roleName},
-            </if>
-            <if test="et.roleCode != null">
-                role_code = #{et.roleCode},
-            </if>
-            <if test="et.displayNo != null">
-                display_no = #{et.displayNo},
-            </if>
-            <if test="et.flgValid != null">
-                flg_valid = #{et.flgValid},
-            </if>
-            <if test="et.remarks != null">
-                remarks = #{et.remarks},
-            </if>
-            <if test="et.flgNolimitFun != null">
-                flg_nolimit_fun = #{et.flgNolimitFun},
-            </if>
-            <if test="et.flgNolimitPvw != null">
-                flg_nolimit_pvw = #{et.flgNolimitPvw},
-            </if>
-            <if test="et.flgNolimitSen != null">
-                flg_nolimit_sen = #{et.flgNolimitSen},
-            </if>
-        </set>
-        where role_id = #{et.roleId}::uuid
-    </update>
 
 </mapper>

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

@@ -33,11 +33,6 @@ public interface UnitMapper extends BaseMapper<Unit>{
      * @date : 2024/2/26 10:36
      */
     Integer selectDisplayNo(UnitQuery UnitQuery);
-    /**
-     * @desc   : 生成编码
-     * @author : 于继渤
-     * @date : 2024/2/26 10:36
-     */
-    String setUnitCode(Unit unit);
+
 }
 

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

@@ -159,44 +159,10 @@
     </insert>
 
 
-    <select id="setUnitCode" resultType="String">
-        select dkic_b.f_create_code(1, #{unitId}::uuid, '单位');
-    </select>
 
     <select id="selectDisplayNo" resultType="Integer">
         SELECT MAX(display_no) + 1 FROM dkic_b.t_mst_unit
         <include refid="Condition"/>
     </select>
 
-
-    <update id="updateById" parameterType="com.dk.mdm.model.pojo.mst.Unit">
-        update
-        dkic_b.t_mst_unit
-        <set>
-            <if test="et.unitCode != null">
-                unit_code = #{et.unitCode},
-            </if>
-            <if test="et.unitName != null">
-                unit_name = #{et.unitName},
-            </if>
-            <if test="et.decimalPlaces != null">
-                decimal_places = #{et.decimalPlaces},
-            </if>
-
-            <if test="et.displayNo != null">
-                display_no = #{et.displayNo},
-            </if>
-            <if test="et.remarks != null">
-                remarks = #{et.remarks},
-            </if>
-            <if test="et.cpId != null">
-                cp_id = #{et.cpId},
-            </if>
-            <if test="et.flgValid != null">
-                flg_valid = #{et.flgValid},
-            </if>
-
-        </set>
-        where unit_id = #{et.unitId}::uuid
-    </update>
 </mapper>

src/main/java/com/dk/mdm/model/pojo/mst/GoodsBrand.java

@@ -40,7 +40,6 @@ public class GoodsBrand extends PageInfo<GoodsBrand> implements Serializable {
     /**
      * 品牌ID
      */
-    @TableId(value = "brand_id", type = IdType.AUTO)
     @ApiModelProperty(value = "品牌ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String brandId;

src/main/java/com/dk/mdm/model/pojo/mst/GoodsCategory.java

@@ -40,7 +40,6 @@ public class GoodsCategory extends PageInfo<GoodsCategory> implements Serializab
     /**
      * 种类ID
      */
-    @TableId(value = "cat_id", type = IdType.AUTO)
     @ApiModelProperty(value = "种类ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String catId;

src/main/java/com/dk/mdm/model/pojo/mst/GoodsSeries.java

@@ -40,7 +40,6 @@ public class GoodsSeries extends PageInfo<GoodsSeries> implements Serializable {
     /**
      * 系列ID
      */
-    @TableId(value = "series_id", type = IdType.AUTO)
     @ApiModelProperty(value = "系列ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String seriesId;

src/main/java/com/dk/mdm/model/pojo/mst/Role.java

@@ -40,7 +40,6 @@ public class Role extends PageInfo<Role> implements Serializable {
     /**
      * 角色ID
      */
-    @TableId(value = "role_id", type = IdType.AUTO)
     @ApiModelProperty(value = "角色ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String roleId;

src/main/java/com/dk/mdm/model/pojo/mst/Unit.java

@@ -40,7 +40,6 @@ public class Unit extends PageInfo<Unit> implements Serializable {
     /**
      * 单位ID
      */
-    @TableId(value = "unit_id", type = IdType.AUTO)
     @ApiModelProperty(value = "单位ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String unitId;

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

@@ -1,6 +1,7 @@
 package com.dk.mdm.service.mst;
 
 import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
@@ -17,6 +18,7 @@ import com.dk.mdm.model.query.mst.RoleQuery;
 import com.dk.mdm.model.response.mst.GoodsSkuResponse;
 import com.dk.mdm.model.vo.mst.GoodsSkuVO;
 import com.dk.mdm.model.vo.mst.RoleVo;
+import com.dk.mdm.service.common.CommonService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +26,8 @@ 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.Map;
+
 @Service
 @Transactional
 public class GoodsBrandService extends BaseService<GoodsBrand> {
@@ -41,6 +45,9 @@ public class GoodsBrandService extends BaseService<GoodsBrand> {
 	@Autowired
 	private GoodsBrandConvert goodsBrandConvert;
 
+	@Autowired
+	private CommonService commonService;
+
 	/**
 	 * @desc : 重写主键
 	 * @author : 于继渤
@@ -76,13 +83,18 @@ public class GoodsBrandService extends BaseService<GoodsBrand> {
 		GoodsBrand goodsBrand = goodsBrandConvert.convertToPo(goodsBrandVO);
 		goodsBrand.setShortName(goodsBrand.getBrandName());
 		Integer displayNo = goodsBrandMapper.selectDisplayNo(new GoodsBrandQuery());
-		//设置序号
-		goodsBrand.setDisplayNo(displayNo);
+		if (displayNo != null) {
+			//插入序号
+			goodsBrand.setDisplayNo(displayNo);
+		} else {
+			goodsBrand.setDisplayNo(0);
+		}
+		//设置编码
+		Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.BRAND.getName(), true);
+		goodsBrand.setBrandId(uniqueNoteCode.get("outId").toString());
+		goodsBrand.setBrandCode(uniqueNoteCode.get("outNote").toString());
 		//新建
 		goodsBrandMapper.insert(goodsBrand);
-		//设置编码
-		goodsBrand.setBrandCode(goodsBrandMapper.setBrandCode(goodsBrand));
-		super.updateByUuid(goodsBrand);
 		return ResponseResultUtil.success();
 	}
 

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

@@ -1,6 +1,7 @@
 package com.dk.mdm.service.mst;
 
 import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
@@ -17,6 +18,7 @@ import com.dk.mdm.model.response.mst.GoodsCategoryResponse;
 import com.dk.mdm.model.response.mst.GoodsSeriesResponse;
 import com.dk.mdm.model.vo.mst.GoodsBrandVO;
 import com.dk.mdm.model.vo.mst.GoodsCategoryVO;
+import com.dk.mdm.service.common.CommonService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.Map;
+
 @Service
 @Transactional
 public class GoodsCategoryService extends BaseService<GoodsCategory> {
@@ -40,6 +44,9 @@ public class GoodsCategoryService extends BaseService<GoodsCategory> {
     @Autowired
     private GoodsCategoryConvert goodsCategoryConvert;
 
+    @Autowired
+    private CommonService commonService;
+
     /**
      * @desc : 重写主键
      * @author : 于继渤
@@ -84,11 +91,12 @@ public class GoodsCategoryService extends BaseService<GoodsCategory> {
             //插入TOPid
             goodsCategory.setTopId(goodsCategory.getParentId());
         }
+        //设置编码
+        Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.CATEGORY.getName(), true);
+        goodsCategory.setCatId(uniqueNoteCode.get("outId").toString());
+        goodsCategory.setCatCode(uniqueNoteCode.get("outNote").toString());
         //新建
         goodsCategoryMapper.insert(goodsCategory);
-        //设置编码
-        goodsCategory.setCatCode(goodsCategoryMapper.setCategoryCode(goodsCategory));
-        super.updateByUuid(goodsCategory);
         //执行函数
         goodsCategoryMapper.resetLevelGoodsCategory(new GoodsCategoryQuery().setTopId(goodsCategory.getParentId()).setCpId(goodsCategory.getCpId()));
         return ResponseResultUtil.success();
@@ -108,4 +116,29 @@ public class GoodsCategoryService extends BaseService<GoodsCategory> {
         super.updateByUuid(goodsCategory);
         return ResponseResultUtil.success();
     }
+
+
+    /**
+     * @desc : 批量启用 根据父级id
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
+    public ResponseResultVO<?> enableBachByParentId(String id) {
+        return ResponseResultUtil.success(goodsCategoryMapper.enableBachByParentId(id));
+    }
+
+    /**
+     * @desc : 批量停用 根据父级id
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
+    public ResponseResultVO<?> disableBachByParentId(String id) {
+        return ResponseResultUtil.success(goodsCategoryMapper.disableBachByParentId(id));
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.dk.mdm.service.mst;
 
 import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
@@ -17,10 +18,13 @@ import com.dk.mdm.model.response.mst.GoodsBrandResponse;
 import com.dk.mdm.model.response.mst.GoodsSeriesResponse;
 import com.dk.mdm.model.vo.mst.GoodsBrandVO;
 import com.dk.mdm.model.vo.mst.GoodsSeriesVO;
+import com.dk.mdm.service.common.CommonService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Map;
+
 @Service
 @Transactional
 public class GoodsSeriesService extends BaseService<GoodsSeries> {
@@ -37,6 +41,9 @@ public class GoodsSeriesService extends BaseService<GoodsSeries> {
 	@Autowired
 	private GoodsSeriesConvert goodsSeriesConvert;
 
+	@Autowired
+	private CommonService commonService;
+
 	/**
 	 * @desc : 重写主键
 	 * @author : 于继渤
@@ -75,12 +82,18 @@ public class GoodsSeriesService extends BaseService<GoodsSeries> {
 		GoodsSeries goodsSeries = goodsSeriesConvert.convertToPo(goodsSeriesVO);
 		//查询序号
 		Integer displayNo = goodsSeriesMapper.selectDisplayNo(new GoodsSeriesQuery());
-		goodsSeries.setDisplayNo(displayNo);
+		if (displayNo != null) {
+			//插入序号
+			goodsSeries.setDisplayNo(displayNo);
+		} else {
+			goodsSeries.setDisplayNo(0);
+		}
+		//设置编码
+		Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.SERIES.getName(), true);
+		goodsSeries.setSeriesId(uniqueNoteCode.get("outId").toString());
+		goodsSeries.setSeriesCode(uniqueNoteCode.get("outNote").toString());
 		//新建
 		goodsSeriesMapper.insert(goodsSeries);
-		//设置编码
-		goodsSeries.setSeriesCode(goodsSeriesMapper.setSeriesCode(goodsSeries));
-		super.updateByUuid(goodsSeries);
 		return ResponseResultUtil.success();
 	}
 

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

@@ -1,6 +1,7 @@
 package com.dk.mdm.service.mst;
 
 import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
@@ -14,10 +15,13 @@ import com.dk.mdm.model.pojo.mst.RoleSensitive;
 import com.dk.mdm.model.query.mst.RoleQuery;
 import com.dk.mdm.model.response.mst.RoleResponse;
 import com.dk.mdm.model.vo.mst.RoleVo;
+import com.dk.mdm.service.common.CommonService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Map;
+
 
 @Service
 @Transactional
@@ -40,6 +44,8 @@ public class RoleService extends BaseService<Role> {
     @Autowired
     private RoleConvert roleConvert;
 
+    @Autowired
+    private CommonService commonService;
     /**
      * @desc : 重写主键
      * @author : 周兴
@@ -73,12 +79,12 @@ public class RoleService extends BaseService<Role> {
         Role role = roleConvert.convertToPo(roleVO);
         Integer displayNo = roleMapper.selectDisplayNo(new RoleQuery());
         role.setDisplayNo(displayNo);
+        //设置编码
+        Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.ROLE.getName(), true);
+        role.setRoleId(uniqueNoteCode.get("outId").toString());
+        role.setRoleCode(uniqueNoteCode.get("outNote").toString());
         //新建
         roleMapper.insert(role);
-        String setRoleCode = roleMapper.setRoleCode(role);
-        //设置编码
-        role.setRoleCode(setRoleCode);
-        roleMapper.updateById(role);
         //设置角色权限明细
         setRoleItem(roleVO, role);
 

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

@@ -1,6 +1,7 @@
 package com.dk.mdm.service.mst;
 
 import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
@@ -13,10 +14,13 @@ import com.dk.mdm.model.query.mst.UnitQuery;
 import com.dk.mdm.model.response.mst.GoodsBrandResponse;
 import com.dk.mdm.model.response.mst.UnitResponse;
 import com.dk.mdm.model.vo.mst.UnitVO;
+import com.dk.mdm.service.common.CommonService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Map;
+
 @Service
 @Transactional
 public class UnitService extends BaseService<Unit> {
@@ -32,6 +36,8 @@ public class UnitService extends BaseService<Unit> {
 	@Autowired
 	private UnitConvert unitConvert;
 
+	@Autowired
+	private CommonService commonService;
 	/**
 	 * @desc : 重写主键
 	 * @author : 于继渤
@@ -71,11 +77,13 @@ public class UnitService extends BaseService<Unit> {
 		Integer displayNo = unitMapper.selectDisplayNo(new UnitQuery());
 		//设置序号
 		unit.setDisplayNo(displayNo);
+		//设置编码
+		Map<String, Object> uniqueNoteCode = commonService.getUniqueNoteCode(Constant.docNameConstant.UNIT.getName(), true);
+		unit.setUnitId(uniqueNoteCode.get("outId").toString());
+		unit.setUnitCode(uniqueNoteCode.get("outNote").toString());
 		//新建
 		unitMapper.insert(unit);
-		//设置编码
-		unit.setUnitCode(unitMapper.setUnitCode(unit));
-		super.updateByUuid(unit);
+
 		return ResponseResultUtil.success();
 	}