供应商

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

@@ -3,8 +3,10 @@ package com.dk.mdm.mapper.mst;
 import com.dk.mdm.model.pojo.mst.Org;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.core.OrganizationQuery;
+import com.dk.mdm.model.query.mst.GoodsCategoryQuery;
 import com.dk.mdm.model.query.mst.OrgQuery;
 import com.dk.mdm.model.response.core.OrganizationResponse;
+import com.dk.mdm.model.vo.mst.OrgVO;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -36,6 +38,12 @@ public interface OrgMapper extends BaseMapper<Org>{
      * @date   : 2023/1/28 10:23
      */
     int insertBatch(Org org);
+    /**
+     * @desc : 调用函数生成层级
+     * @author : 王英杰
+     * @date : 2024/2/26 10:36
+     */
+    Boolean resetLevelOrg(Org org);
 
 
     Integer maxDisplayNo(String  parentID);

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

@@ -143,7 +143,9 @@
             AND ( parent.org_name LIKE concat('%', #{searchText}, '%')
         </if>
     </select>
-
+    <select id="resetLevelOrg" resultType="java.lang.Boolean">
+        select dkic_b.f_reset_level_org(#{cpId}, #{topId}::uuid)
+    </select>
     <!-- 查询表t_mst_org，（条件查询）个数 -->
     <select id="countByCond" resultType="Long">
         SELECT

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

@@ -35,13 +35,13 @@ public interface SupplierMapper extends BaseMapper<Supplier>{
         * @author : 王英杰
         * @date   : 2024/2/29 17:49
         */
-    int insertSupplierBrand(SupplierVo supplierVo);
+    int insertSupplierBrand(Supplier supplierVo);
     /**
      * @desc   : 批量删除 供应商iD对应的品牌
      * @author : 王英杰
      * @date   : 2024/2/29 17:49
      */
-    int   batchDelete (SupplierVo supplierVo);
+    int   batchDelete (Supplier supplierVo);
     /**
      * @desc   : 自动生id
      * @author : 王英杰

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

@@ -40,7 +40,7 @@ public class Org extends PageInfo<Org> implements Serializable {
     /**
      * 组织ID
      */
-    @TableId(value = "org_id", type = IdType.AUTO)
+//    @TableId(value = "org_id", type = IdType.AUTO)
     @ApiModelProperty(value = "组织ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String orgId;

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

@@ -43,7 +43,7 @@ public class Supplier extends PageInfo<Supplier> implements Serializable {
     /**
      * 供应商ID
      */
-    @TableId(value = "sup_id", type = IdType.AUTO)
+//    @TableId(value = "sup_id", type = IdType.AUTO)
     @ApiModelProperty(value = "供应商ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String supId;

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

@@ -82,7 +82,13 @@ public class OrgVO extends PageInfo<OrgVO> implements Serializable {
     @ApiModelProperty(value = "显示顺序")
     private Integer displayNo;
 
-
+    /**
+     * 顶层ID
+     */
+    @Excel(name = "顶层ID")
+    @ApiModelProperty(value = "顶层ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String topId;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/service/mst/OrgService.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.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
@@ -13,14 +14,18 @@ import com.dk.mdm.mapper.mst.OrgMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.core.OrganizationQuery;
+import com.dk.mdm.model.query.mst.GoodsCategoryQuery;
 import com.dk.mdm.model.query.mst.OrgQuery;
 import com.dk.mdm.model.response.core.OrganizationResponse;
 import com.dk.mdm.model.vo.core.OrganizationVO;
 import com.dk.mdm.model.vo.mst.OrgVO;
+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 OrgService extends BaseService<Org> {
@@ -43,7 +48,8 @@ public class OrgService extends BaseService<Org> {
 
     @Autowired
     private OrgConvert orgConvert;
-
+    @Autowired
+    private CommonService commonService;
     /**
      * @desc : 条件查询
      * @author : 王英杰
@@ -66,6 +72,10 @@ public class OrgService extends BaseService<Org> {
     public ResponseResultVO<?> insert(OrgVO orgVO) {
         // 转化实体
         Org organization = orgConvert.convertToPo(orgVO);
+        Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.STAFF.getName(), false);
+
+        organization.setOrgId(codeMap.get("outId").toString());
+//        organization.setOrgCode(codeMap.get("outNote").toString());
 
         //查询 本次要加的 部门的 父级下 最大的DisplayNo  然后加1  就是现在要加的DisplayNo
         String parentId = organization.getParentId();
@@ -74,8 +84,11 @@ public class OrgService extends BaseService<Org> {
 
         organization.setDisplayNo(maxDisplayNo);
         // 插入组织部门数据
-        return   super.insert(organization);
-//        return result == 1 ? ResponseResultUtil.success(organization) :
+        super.insert(organization);
+        //执行函数
+        orgMapper.resetLevelOrg(new Org().setTopId(organization.getParentId()).setCpId(organization.getCpId()));
+        return ResponseResultUtil.success();
+        //        return result == 1 ? ResponseResultUtil.success(organization) :
 //                ResponseResultUtil.error(ResponseCodeEnum.INSERT_FAIL);
     }
 }

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

@@ -2,6 +2,7 @@ package com.dk.mdm.service.mst;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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;
@@ -18,6 +19,7 @@ import com.dk.mdm.model.query.mst.SupplierQuery;
 import com.dk.mdm.model.vo.mst.OrgVO;
 import com.dk.mdm.model.vo.mst.StaffVO;
 import com.dk.mdm.model.vo.mst.SupplierVo;
+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;
@@ -27,6 +29,7 @@ import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
+import java.util.Map;
 import java.util.UUID;
 
 @Service
@@ -51,7 +54,8 @@ public class SupplierService extends BaseService<Supplier> {
 
     @Autowired
     private SupplierConvert supplierConvert;
-
+    @Autowired
+    private CommonService commonService;
     /**
      * @desc : 条件查询
      * @author : 王英杰
@@ -81,18 +85,14 @@ public class SupplierService extends BaseService<Supplier> {
         Supplier supplier = supplierConvert.convertToPo(supplierVo);
 
         try {
+            Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.STAFF.getName(), true);
 
-            // 获取第一个插入操作生成的id
-            String supID = supplierMapper.selectUuid(); // 先生成id
-            supplierVo.setSupId(supID);
-            String supCode = supplierMapper.selectSupCode(supplierVo); //拿着生成的id 传过来的cpid 去生成code
-            supplierVo.setSupCode(supCode); //插入供应商品牌的实体
-            supplier.setSupCode(supCode);  //插入供应商表的实体
-            super.insert(supplier);// 先插入自己的供应商表
-            if (supplierVo.getBrandId() != null) {  //如果有 商品品牌
-                // 设置supplierVo的supplierId
+            supplier.setSupId(codeMap.get("outId").toString());
+            supplier.setSupCode(codeMap.get("outNote").toString());  //插入供应商表的实体
 
-                supplierMapper.insertSupplierBrand(supplierVo); // 向供应商品牌表插入数据
+            super.insert(supplier);// 先插入自己的供应商表
+            if (supplier.getBrandId() != null) {  //如果有 商品品牌
+                supplierMapper.insertSupplierBrand(supplier); // 向供应商品牌表插入数据
             }
             return ResponseResultUtil.success();
         } catch (Exception e) {
@@ -115,10 +115,10 @@ public class SupplierService extends BaseService<Supplier> {
         Supplier supplier = supplierConvert.convertToPo(supplierVo);
         try {
           super.updateByUuid(supplier);// 先更新的供应商表
-            supplierMapper.batchDelete(supplierVo);//批量删除供应商对应的供应商品牌
+            supplierMapper.batchDelete(supplier);//批量删除供应商对应的供应商品牌
             if (supplierVo.getBrandId() != null) {  //如果有 商品品牌
                 // 设置supplierVo的supplierId
-                supplierMapper.insertSupplierBrand(supplierVo); // 向供应商品牌表插入数据
+                supplierMapper.insertSupplierBrand(supplier); // 向供应商品牌表插入数据
             }
           return ResponseResultUtil.success();
         } catch (Exception e) {