Merge remote-tracking branch 'origin/dev' into dev

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/AccountController.java

@@ -1,35 +1,32 @@
 package com.zt.plat.module.base.controller.admin.base;
 
-import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import jakarta.validation.constraints.*;
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
-
-import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
-import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.zt.plat.module.base.controller.admin.base.vo.*;
+import com.zt.plat.module.base.controller.admin.base.vo.AccountPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.AccountRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.AccountSaveReqVO;
 import com.zt.plat.module.base.dal.dataobject.base.AccountDO;
 import com.zt.plat.module.base.service.base.AccountService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 账户条款")
 @RestController

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/BaseTestController.java

@@ -1,13 +1,12 @@
 package com.zt.plat.module.base.controller.admin.base;
 
+import com.zt.plat.framework.common.pojo.CommonResult;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.zt.plat.framework.common.pojo.CommonResult;
-
 import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 /**

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ContactController.java

@@ -1,35 +1,32 @@
 package com.zt.plat.module.base.controller.admin.base;
 
-import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import jakarta.validation.constraints.*;
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
-
-import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
-import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.zt.plat.module.base.controller.admin.base.vo.*;
+import com.zt.plat.module.base.controller.admin.base.vo.ContactPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.ContactRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.ContactSaveReqVO;
 import com.zt.plat.module.base.dal.dataobject.base.ContactDO;
 import com.zt.plat.module.base.service.base.ContactService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 联系人信息")
 @RestController

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/ElementController.java

@@ -1,35 +1,32 @@
 package com.zt.plat.module.base.controller.admin.base;
 
-import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import jakarta.validation.constraints.*;
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
-
-import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
-import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.zt.plat.module.base.controller.admin.base.vo.*;
+import com.zt.plat.module.base.controller.admin.base.vo.ElementPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.ElementRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.ElementSaveReqVO;
 import com.zt.plat.module.base.dal.dataobject.base.ElementDO;
 import com.zt.plat.module.base.service.base.ElementService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 金属元素")
 @RestController

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/FactoryController.java

@@ -1,35 +1,32 @@
 package com.zt.plat.module.base.controller.admin.base;
 
-import org.springframework.web.bind.annotation.*;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import jakarta.validation.constraints.*;
-import jakarta.validation.*;
-import jakarta.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
+import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
+import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-import static com.zt.plat.framework.common.pojo.CommonResult.success;
-
 import com.zt.plat.framework.excel.core.util.ExcelUtils;
-
-import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
-import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*;
-
-import com.zt.plat.module.base.controller.admin.base.vo.*;
+import com.zt.plat.module.base.controller.admin.base.vo.FactoryPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.FactoryRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.FactorySaveReqVO;
 import com.zt.plat.module.base.dal.dataobject.base.FactoryDO;
 import com.zt.plat.module.base.service.base.FactoryService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static com.zt.plat.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 工厂")
 @RestController

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountPageReqVO.java

@@ -1,10 +1,10 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.zt.plat.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountRespVO.java

@@ -1,11 +1,11 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 账户条款 Response VO")
 @Data

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/AccountSaveReqVO.java

@@ -1,9 +1,8 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 账户条款新增/修改 Request VO")
 @Data

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityPageReqVO.java

@@ -1,10 +1,10 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.zt.plat.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -23,4 +23,10 @@ public class CompanyRelativityPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "负责人")
+    private String manager;
+
+    @Schema(description = "部门来源")
+    private String departmentSource;
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativityRespVO.java

@@ -1,11 +1,11 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 公司关系 Response VO")
 @Data

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/CompanyRelativitySaveReqVO.java

@@ -1,9 +1,9 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 公司关系新增/修改 Request VO")
 @Data
@@ -20,4 +20,21 @@ public class CompanyRelativitySaveReqVO {
     @NotEmpty(message = "供应链公司编码不能为空")
     private String number;
 
+    @Schema(description = "供应链公司编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "供应链公司编号不能为空")
+    private Long companyId;
+
+    @Schema(description = "供应链公司名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "供应链公司名称不能为空")
+    private String companyName;
+
+    @Schema(description = "供应链部门编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "供应链部门名称不能为空")
+    private Long deptId;
+
+    @Schema(description = "供应链部门名称", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "供应链部门名称不能为空")
+    private String deptName;
+
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactPageReqVO.java

@@ -1,10 +1,10 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.zt.plat.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactRespVO.java

@@ -1,11 +1,11 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 联系人信息 Response VO")
 @Data

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactSaveReqVO.java

@@ -1,9 +1,8 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 联系人信息新增/修改 Request VO")
 @Data

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java

@@ -1,10 +1,10 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.zt.plat.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java

@@ -1,11 +1,11 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 金属元素 Response VO")
 @Data

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java

@@ -1,9 +1,8 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 金属元素新增/修改 Request VO")
 @Data
@@ -21,7 +20,7 @@ public class ElementSaveReqVO {
     private String name;
 
     @Schema(description = "金属元素编码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "金属元素编码不能为空")
+//    @NotEmpty(message = "金属元素编码不能为空")
     private String coding;
 
     @Schema(description = "品位单位", requiredMode = Schema.RequiredMode.REQUIRED)

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactoryPageReqVO.java

@@ -1,10 +1,10 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.zt.plat.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactoryRespVO.java

@@ -1,11 +1,11 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 工厂 Response VO")
 @Data

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/FactorySaveReqVO.java

@@ -1,9 +1,7 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 工厂新增/修改 Request VO")
 @Data

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyPageReqVO.java

@@ -1,11 +1,11 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.zt.plat.framework.common.pojo.PageParam;
-import java.math.BigDecimal;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroyRespVO.java

@@ -1,12 +1,12 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
+import lombok.Data;
+
 import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 物料回收率 Response VO")
 @Data

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialDestroySaveReqVO.java

@@ -1,9 +1,10 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
 import java.math.BigDecimal;
 
 @Schema(description = "管理后台 - 物料回收率新增/修改 Request VO")

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialInfomationPageReqVO.java

@@ -1,10 +1,10 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.zt.plat.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialInfomationRespVO.java

@@ -1,11 +1,11 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 物料信息 Response VO")
 @Data

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialInfomationSaveReqVO.java

@@ -1,9 +1,8 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 物料信息新增/修改 Request VO")
 @Data

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherPageReqVO.java

@@ -1,10 +1,10 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.zt.plat.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherRespVO.java

@@ -1,11 +1,11 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 物料拓展数据 Response VO")
 @Data

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/MaterialOtherSaveReqVO.java

@@ -1,9 +1,7 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 物料拓展数据新增/修改 Request VO")
 @Data

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehousePageReqVO.java

@@ -1,10 +1,10 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.zt.plat.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehouseRespVO.java

@@ -1,11 +1,11 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 仓库 Response VO")
 @Data

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/WarehouseSaveReqVO.java

@@ -1,9 +1,7 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import jakarta.validation.constraints.*;
+import lombok.Data;
 
 @Schema(description = "管理后台 - 仓库新增/修改 Request VO")
 @Data

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/AccountDO.java

@@ -1,11 +1,8 @@
 package com.zt.plat.module.base.dal.dataobject.base;
 
-import lombok.*;
-import java.util.*;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 /**
 * 账户条款 DO
 *

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/CompanyRelativityDO.java

@@ -1,11 +1,8 @@
 package com.zt.plat.module.base.dal.dataobject.base;
 
-import lombok.*;
-import java.util.*;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 /**
 * 公司关系 DO
 *
@@ -36,6 +33,10 @@ public class CompanyRelativityDO extends BaseDO {
     */
     @TableField("ERP_NUM")
     private String erpNumber;
+
+    // erp名称
+    private String erpName;
+
     /**
     * 供应链公司编码
     */
@@ -51,6 +52,21 @@ public class CompanyRelativityDO extends BaseDO {
     */
     @TableField("COMPANY_NAME")
     private String companyName;
+
+    // 负责人id
+    private String leaderUserId;
+    // 是否公司
+    private String isCompany;
+    //是否集团
+    private String isGroup;
+    //电话
+    private String phone;
+    //邮箱
+    private String email;
+    //部门状态
+    private String status;
+    //创建人
+    private String creator;
     /**
     * 部门编号
     */

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ContactDO.java

@@ -1,11 +1,8 @@
 package com.zt.plat.module.base.dal.dataobject.base;
 
-import lombok.*;
-import java.util.*;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 /**
 * 联系人信息 DO
 *

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java

@@ -1,11 +1,9 @@
 package com.zt.plat.module.base.dal.dataobject.base;
 
-import lombok.*;
-import java.util.*;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
+import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+import lombok.*;
 /**
 * 金属元素 DO
 *
@@ -22,7 +20,7 @@ import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
 /**
 * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
 */
-public class ElementDO extends BaseDO {
+public class ElementDO extends BusinessBaseDO {
 
 
 

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/FactoryDO.java

@@ -1,11 +1,8 @@
 package com.zt.plat.module.base.dal.dataobject.base;
 
-import lombok.*;
-import java.util.*;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 /**
 * 工厂 DO
 *

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialDestroyDO.java

@@ -1,12 +1,10 @@
 package com.zt.plat.module.base.dal.dataobject.base;
 
-import lombok.*;
-import java.util.*;
-    import java.math.BigDecimal;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
+
+import java.math.BigDecimal;
 /**
 * 物料回收率 DO
 *

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialInfomationDO.java

@@ -1,11 +1,8 @@
 package com.zt.plat.module.base.dal.dataobject.base;
 
-import lombok.*;
-import java.util.*;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 /**
 * 物料信息 DO
 *

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/MaterialOtherDO.java

@@ -1,11 +1,8 @@
 package com.zt.plat.module.base.dal.dataobject.base;
 
-import lombok.*;
-import java.util.*;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 /**
 * 物料拓展数据 DO
 *

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/WarehouseDO.java

@@ -1,11 +1,8 @@
 package com.zt.plat.module.base.dal.dataobject.base;
 
-import lombok.*;
-import java.util.*;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 /**
 * 仓库 DO
 *

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/DepartmentInstanceRelativityDO.java

@@ -1,9 +1,8 @@
 package com.zt.plat.module.base.dal.dataobject.tmpltp;
 
-import lombok.*;
-import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+import lombok.*;
 /**
 * 部门与实例关联 DO
 *

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceDO.java

@@ -1,12 +1,11 @@
 package com.zt.plat.module.base.dal.dataobject.tmpltp;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 import lombok.*;
-import java.util.*;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.zt.plat.framework.mybatis.core.dataobject.BaseDO;
 /**
 * 模板实例 DO
 *

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceDataDO.java

@@ -1,11 +1,8 @@
 package com.zt.plat.module.base.dal.dataobject.tmpltp;
 
-import lombok.*;
-import java.util.*;
-    import java.time.LocalDateTime;
-    import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+import lombok.*;
 /**
 * 实例字段值 DO
 *

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TemplateInstanceItemDO.java

@@ -1,9 +1,8 @@
 package com.zt.plat.module.base.dal.dataobject.tmpltp;
 
-import lombok.*;
-import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+import lombok.*;
 /**
 * 实例条款值 DO
 *

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplFldRelDO.java

@@ -1,17 +1,8 @@
 package com.zt.plat.module.base.dal.dataobject.tmpltp;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 @TableName("BSE_TMPL_FLD_REL")
 @KeySequence("BSE_TMPL_FLD_REL_SEQ")

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplItmDO.java

@@ -1,17 +1,8 @@
 package com.zt.plat.module.base.dal.dataobject.tmpltp;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 @TableName("BSE_TMPL_ITM")
 @KeySequence("BSE_TMPL_ITM_SEQ")

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplItmRelDO.java

@@ -1,17 +1,8 @@
 package com.zt.plat.module.base.dal.dataobject.tmpltp;
 
+import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
 
 @TableName("BSE_TMPL_ITM_REL")
 @KeySequence("BSE_TMPL_ITM_REL_SEQ")

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplTpDO.java

@@ -1,9 +1,8 @@
 package com.zt.plat.module.base.dal.dataobject.tmpltp;
 
-import lombok.*;
-import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
 import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
+import lombok.*;
 /**
 * 模板分类 DO
 *

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplTpFldDO.java

@@ -1,11 +1,9 @@
 package com.zt.plat.module.base.dal.dataobject.tmpltp;
 
-import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 import com.baomidou.mybatisplus.annotation.*;
+import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
 import lombok.*;
 
-import java.time.LocalDateTime;
-
 /**
  * 字段库 DO
  * 对应数据库表：BSE_TMPL_TP_FLD

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/AccountMapper.java

@@ -1,12 +1,11 @@
 package com.zt.plat.module.base.dal.mysql.base;
 
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.module.base.controller.admin.base.vo.AccountPageReqVO;
 import com.zt.plat.module.base.dal.dataobject.base.AccountDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
 
 /**
  * 账户条款 Mapper

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/CompanyRelativityMapper.java

@@ -1,13 +1,13 @@
 package com.zt.plat.module.base.dal.mysql.base;
 
-import java.util.*;
-
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativityPageReqVO;
 import com.zt.plat.module.base.dal.dataobject.base.CompanyRelativityDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
+
+import java.util.List;
 
 /**
  * 公司关系 Mapper
@@ -25,4 +25,5 @@ public interface CompanyRelativityMapper extends BaseMapperX<CompanyRelativityDO
                 .orderByDesc(CompanyRelativityDO::getId));
     }
 
+    List<CompanyRelativityDO> getPageByReq(CompanyRelativityPageReqVO pageReqVO);
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ContactMapper.java

@@ -1,13 +1,11 @@
 package com.zt.plat.module.base.dal.mysql.base;
 
-import java.util.*;
-
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.module.base.controller.admin.base.vo.ContactPageReqVO;
 import com.zt.plat.module.base.dal.dataobject.base.ContactDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
 
 /**
  * 联系人信息 Mapper

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java

@@ -1,13 +1,11 @@
 package com.zt.plat.module.base.dal.mysql.base;
 
-import java.util.*;
-
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.module.base.controller.admin.base.vo.ElementPageReqVO;
 import com.zt.plat.module.base.dal.dataobject.base.ElementDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
 
 /**
  * 金属元素 Mapper
@@ -27,4 +25,5 @@ public interface ElementMapper extends BaseMapperX<ElementDO> {
                 .orderByDesc(ElementDO::getId));
     }
 
+    String selectMaxCode();
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java

@@ -1,13 +1,11 @@
 package com.zt.plat.module.base.dal.mysql.base;
 
-import java.util.*;
-
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.module.base.controller.admin.base.vo.FactoryPageReqVO;
 import com.zt.plat.module.base.dal.dataobject.base.FactoryDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
 
 /**
  * 工厂 Mapper

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialDestroyMapper.java

@@ -1,13 +1,11 @@
 package com.zt.plat.module.base.dal.mysql.base;
 
-import java.util.*;
-
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialDestroyPageReqVO;
 import com.zt.plat.module.base.dal.dataobject.base.MaterialDestroyDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
 
 /**
  * 物料回收率 Mapper

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialInfomationMapper.java

@@ -1,13 +1,11 @@
 package com.zt.plat.module.base.dal.mysql.base;
 
-import java.util.*;
-
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationPageReqVO;
 import com.zt.plat.module.base.dal.dataobject.base.MaterialInfomationDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
 
 /**
  * 物料信息 Mapper

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/MaterialOtherMapper.java

@@ -1,13 +1,11 @@
 package com.zt.plat.module.base.dal.mysql.base;
 
-import java.util.*;
-
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherPageReqVO;
 import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
 
 /**
  * 物料拓展数据 Mapper

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/WarehouseMapper.java

@@ -1,13 +1,11 @@
 package com.zt.plat.module.base.dal.mysql.base;
 
-import java.util.*;
-
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.module.base.controller.admin.base.vo.WarehousePageReqVO;
 import com.zt.plat.module.base.dal.dataobject.base.WarehouseDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
 
 /**
  * 仓库 Mapper

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/DepartmentInstanceRelativityMapper.java

@@ -1,11 +1,8 @@
 package com.zt.plat.module.base.dal.mysql.tmpltp;
 
-import java.util.*;
-
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.module.base.controller.admin.templtp.vo.DepartmentInstanceRelativityPageReqVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.DepartmentInstanceRelativityDO;
 import org.apache.ibatis.annotations.Mapper;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceDataMapper.java

@@ -1,11 +1,8 @@
 package com.zt.plat.module.base.dal.mysql.tmpltp;
 
-import java.util.*;
-
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceDataPageReqVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TemplateInstanceDataDO;
 import org.apache.ibatis.annotations.Mapper;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceItemMapper.java

@@ -1,11 +1,8 @@
 package com.zt.plat.module.base.dal.mysql.tmpltp;
 
-import java.util.*;
-
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceItemPageReqVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TemplateInstanceItemDO;
 import org.apache.ibatis.annotations.Mapper;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceMapper.java

@@ -1,11 +1,8 @@
 package com.zt.plat.module.base.dal.mysql.tmpltp;
 
-import java.util.*;
-
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstancePageReqVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TemplateInstanceDO;
 import com.zt.plat.module.tmpltp.enums.TmplStsEnum;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplFldRelMapper.java

@@ -1,7 +1,6 @@
 package com.zt.plat.module.base.dal.mysql.tmpltp;
 
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplFldRelDO;
 import org.apache.ibatis.annotations.Mapper;
 

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmMapper.java

@@ -3,7 +3,6 @@ package com.zt.plat.module.base.dal.mysql.tmpltp;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
-
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmpItmPageReqVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplItmDO;
 import org.apache.ibatis.annotations.Mapper;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmRelMapper.java

@@ -1,7 +1,6 @@
 package com.zt.plat.module.base.dal.mysql.tmpltp;
 
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplItmRelDO;
 import org.apache.ibatis.annotations.Mapper;
 

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpFldMapper.java

@@ -3,7 +3,6 @@ package com.zt.plat.module.base.dal.mysql.tmpltp;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
-
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplFldPageReqVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplTpFldDO;
 import org.apache.ibatis.annotations.Mapper;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpMapper.java

@@ -1,10 +1,8 @@
 package com.zt.plat.module.base.dal.mysql.tmpltp;
 
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-
-
+import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplFldRespVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplItmRespVO;
 import com.zt.plat.module.base.controller.admin.templtp.vo.TmplTpPageReqVO;
@@ -12,10 +10,8 @@ import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplTpDO;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
-import java.util.Map;
 
 
 /**

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountService.java

@@ -1,11 +1,13 @@
 package com.zt.plat.module.base.service.base;
 
-import java.util.*;
-import jakarta.validation.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.AccountDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.module.base.controller.admin.base.vo.AccountPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.AccountRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.AccountSaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.AccountDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
 
 /**
  * 账户条款 Service 接口

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/AccountServiceImpl.java

@@ -1,24 +1,21 @@
 package com.zt.plat.module.base.service.base;
 
 import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.AccountDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-
+import com.zt.plat.module.base.controller.admin.base.vo.AccountPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.AccountRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.AccountSaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.AccountDO;
 import com.zt.plat.module.base.dal.mysql.base.AccountMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
-import static com.zt.plat.module.base.enums.ErrorCodeConstants.*;
+import static com.zt.plat.module.base.enums.ErrorCodeConstants.ACCOUNT_NOT_EXISTS;
 
 /**
  * 账户条款 Service 实现类

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/CompanyRelativityService.java

@@ -1,11 +1,13 @@
 package com.zt.plat.module.base.service.base;
 
-import java.util.*;
-import jakarta.validation.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.CompanyRelativityDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativityPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativityRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativitySaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.CompanyRelativityDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
 
 /**
  * 公司关系 Service 接口

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/CompanyRelativityServiceImpl.java

@@ -1,24 +1,21 @@
 package com.zt.plat.module.base.service.base;
 
 import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.CompanyRelativityDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-
+import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativityPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativityRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.CompanyRelativitySaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.CompanyRelativityDO;
 import com.zt.plat.module.base.dal.mysql.base.CompanyRelativityMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
-import static com.zt.plat.module.base.enums.ErrorCodeConstants.*;
+import static com.zt.plat.module.base.enums.ErrorCodeConstants.COMPANY_RELATIVITY_NOT_EXISTS;
 
 /**
  * 公司关系 Service 实现类
@@ -86,7 +83,11 @@ public class CompanyRelativityServiceImpl implements CompanyRelativityService {
 
     @Override
     public PageResult<CompanyRelativityDO> getCompanyRelativityPage(CompanyRelativityPageReqVO pageReqVO) {
-        return companyRelativityMapper.selectPage(pageReqVO);
+        List<CompanyRelativityDO> list = companyRelativityMapper.getPageByReq(pageReqVO);
+        if (list == null) {
+            list = CollUtil.newArrayList();
+        }
+        return new PageResult<>(list, (long) list.size());
     }
 
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ContactService.java

@@ -1,11 +1,13 @@
 package com.zt.plat.module.base.service.base;
 
-import java.util.*;
-import jakarta.validation.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.ContactDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.module.base.controller.admin.base.vo.ContactPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.ContactRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.ContactSaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.ContactDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
 
 /**
  * 联系人信息 Service 接口

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ContactServiceImpl.java

@@ -1,24 +1,21 @@
 package com.zt.plat.module.base.service.base;
 
 import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.ContactDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-
+import com.zt.plat.module.base.controller.admin.base.vo.ContactPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.ContactRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.ContactSaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.ContactDO;
 import com.zt.plat.module.base.dal.mysql.base.ContactMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
-import static com.zt.plat.module.base.enums.ErrorCodeConstants.*;
+import static com.zt.plat.module.base.enums.ErrorCodeConstants.CONTACT_NOT_EXISTS;
 
 /**
  * 联系人信息 Service 实现类

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java

@@ -1,11 +1,13 @@
 package com.zt.plat.module.base.service.base;
 
-import java.util.*;
-import jakarta.validation.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.ElementDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.module.base.controller.admin.base.vo.ElementPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.ElementRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.ElementSaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.ElementDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
 
 /**
  * 金属元素 Service 接口

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java

@@ -1,24 +1,21 @@
 package com.zt.plat.module.base.service.base;
 
 import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.ElementDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-
+import com.zt.plat.module.base.controller.admin.base.vo.ElementPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.ElementRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.ElementSaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.ElementDO;
 import com.zt.plat.module.base.dal.mysql.base.ElementMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
-import static com.zt.plat.module.base.enums.ErrorCodeConstants.*;
+import static com.zt.plat.module.base.enums.ErrorCodeConstants.ELEMENT_NOT_EXISTS;
 
 /**
  * 金属元素 Service 实现类
@@ -36,6 +33,17 @@ public class ElementServiceImpl implements ElementService {
     public ElementRespVO createElement(ElementSaveReqVO createReqVO) {
         // 插入
         ElementDO element = BeanUtils.toBean(createReqVO, ElementDO.class);
+        //金属编码自动生成，格式 JSYS-00001,依次新增
+        String maxCode = elementMapper.selectMaxCode();
+        if (maxCode == null) {
+            element.setCoding("JSYS-00001");
+        } else {
+            String prefix = "JSYS-";
+            String numberPart = maxCode.substring(prefix.length());
+            int nextNumber = Integer.parseInt(numberPart) + 1;
+            String nextCode = prefix + String.format("%05d", nextNumber);
+            element.setCoding(nextCode);
+        }
         elementMapper.insert(element);
         // 返回
         return BeanUtils.toBean(element, ElementRespVO.class);

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryService.java

@@ -1,11 +1,13 @@
 package com.zt.plat.module.base.service.base;
 
-import java.util.*;
-import jakarta.validation.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.FactoryDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.module.base.controller.admin.base.vo.FactoryPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.FactoryRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.FactorySaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.FactoryDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
 
 /**
  * 工厂 Service 接口

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/FactoryServiceImpl.java

@@ -1,24 +1,21 @@
 package com.zt.plat.module.base.service.base;
 
 import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.FactoryDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-
+import com.zt.plat.module.base.controller.admin.base.vo.FactoryPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.FactoryRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.FactorySaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.FactoryDO;
 import com.zt.plat.module.base.dal.mysql.base.FactoryMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
-import static com.zt.plat.module.base.enums.ErrorCodeConstants.*;
+import static com.zt.plat.module.base.enums.ErrorCodeConstants.FACTORY_NOT_EXISTS;
 
 /**
  * 工厂 Service 实现类

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyService.java

@@ -1,11 +1,13 @@
 package com.zt.plat.module.base.service.base;
 
-import java.util.*;
-import jakarta.validation.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.MaterialDestroyDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialDestroyPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialDestroyRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialDestroySaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.MaterialDestroyDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
 
 /**
  * 物料回收率 Service 接口

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialDestroyServiceImpl.java

@@ -1,24 +1,21 @@
 package com.zt.plat.module.base.service.base;
 
 import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.MaterialDestroyDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialDestroyPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialDestroyRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialDestroySaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.MaterialDestroyDO;
 import com.zt.plat.module.base.dal.mysql.base.MaterialDestroyMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
-import static com.zt.plat.module.base.enums.ErrorCodeConstants.*;
+import static com.zt.plat.module.base.enums.ErrorCodeConstants.MATERIAL_DESTROY_NOT_EXISTS;
 
 /**
  * 物料回收率 Service 实现类

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialInfomationService.java

@@ -1,11 +1,13 @@
 package com.zt.plat.module.base.service.base;
 
-import java.util.*;
-import jakarta.validation.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.MaterialInfomationDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationSaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.MaterialInfomationDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
 
 /**
  * 物料信息 Service 接口

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialInfomationServiceImpl.java

@@ -1,24 +1,21 @@
 package com.zt.plat.module.base.service.base;
 
 import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.MaterialInfomationDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialInfomationSaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.MaterialInfomationDO;
 import com.zt.plat.module.base.dal.mysql.base.MaterialInfomationMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
-import static com.zt.plat.module.base.enums.ErrorCodeConstants.*;
+import static com.zt.plat.module.base.enums.ErrorCodeConstants.MATERIAL_INFOMATION_NOT_EXISTS;
 
 /**
  * 物料信息 Service 实现类

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherService.java

@@ -1,11 +1,13 @@
 package com.zt.plat.module.base.service.base;
 
-import java.util.*;
-import jakarta.validation.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherSaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
 
 /**
  * 物料拓展数据 Service 接口

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/MaterialOtherServiceImpl.java

@@ -1,24 +1,21 @@
 package com.zt.plat.module.base.service.base;
 
 import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherPageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.MaterialOtherSaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.MaterialOtherDO;
 import com.zt.plat.module.base.dal.mysql.base.MaterialOtherMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
-import static com.zt.plat.module.base.enums.ErrorCodeConstants.*;
+import static com.zt.plat.module.base.enums.ErrorCodeConstants.MATERIAL_OTHER_NOT_EXISTS;
 
 /**
  * 物料拓展数据 Service 实现类

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/WarehouseService.java

@@ -1,11 +1,13 @@
 package com.zt.plat.module.base.service.base;
 
-import java.util.*;
-import jakarta.validation.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.WarehouseDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
+import com.zt.plat.module.base.controller.admin.base.vo.WarehousePageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.WarehouseRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.WarehouseSaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.WarehouseDO;
+import jakarta.validation.Valid;
+
+import java.util.List;
 
 /**
  * 仓库 Service 接口

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/WarehouseServiceImpl.java

@@ -1,24 +1,21 @@
 package com.zt.plat.module.base.service.base;
 
 import cn.hutool.core.collection.CollUtil;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import com.zt.plat.module.base.controller.admin.base.vo.*;
-import com.zt.plat.module.base.dal.dataobject.base.WarehouseDO;
 import com.zt.plat.framework.common.pojo.PageResult;
-import com.zt.plat.framework.common.pojo.PageParam;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-
+import com.zt.plat.module.base.controller.admin.base.vo.WarehousePageReqVO;
+import com.zt.plat.module.base.controller.admin.base.vo.WarehouseRespVO;
+import com.zt.plat.module.base.controller.admin.base.vo.WarehouseSaveReqVO;
+import com.zt.plat.module.base.dal.dataobject.base.WarehouseDO;
 import com.zt.plat.module.base.dal.mysql.base.WarehouseMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
 
 import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList;
-import static com.zt.plat.module.base.enums.ErrorCodeConstants.*;
+import static com.zt.plat.module.base.enums.ErrorCodeConstants.WAREHOUSE_NOT_EXISTS;
 
 /**
  * 仓库 Service 实现类

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
-import com.zt.plat.framework.security.core.LoginUser;
 import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
 import com.zt.plat.framework.tenant.core.context.CompanyContextHolder;
 import com.zt.plat.module.base.controller.admin.templtp.vo.*;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/util/ClassInfoScanner.java

@@ -2,12 +2,8 @@ package com.zt.plat.module.base.util;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ResourceUtils;
 
 import java.io.File;
-import java.io.FileFilter;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.net.JarURLConnection;

zt-module-base/zt-module-base-server/src/main/resources/mapper/base/CompanyRelativityMapper.xml

@@ -9,4 +9,23 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
+    <select id="getPageByReq" resultType="com.zt.plat.module.base.dal.dataobject.base.CompanyRelativityDO">
+        select
+            c.NUM as  erpNumber,
+            c.NAME as erpName,
+            d.NAME as companyName,
+            d.ID as deptId,
+            d.LEADER_USER_ID as leaderUserId,
+            d.IS_COMPANY,
+            d.IS_GROUP,
+            d.PHONE,
+            d.EMAIL,
+            d.STATUS,
+            d.CREATOR
+        from
+            SPLY_CPN_REL r
+                left join SYSTEM_DEPT d on r.COMPANY_ID = d.ID
+                left join SPLY_ERP_CPN c on r.ERP_NUM = c.NUM
+        where r.DELETED = 0
+    </select>
 </mapper>

zt-module-base/zt-module-base-server/src/main/resources/mapper/base/ElementMapper.xml

@@ -9,4 +9,7 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
 
+    <select id="selectMaxCode" resultType="java.lang.String">
+        SELECT MAX(CDG) FROM sply_elem
+    </select>
 </mapper>

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpExternalApi.java

@@ -1,13 +1,11 @@
 package com.zt.plat.module.erp.api;
 
-import com.alibaba.fastjson.JSONArray;
 import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO;
 import com.zt.plat.module.erp.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/ErpSubmitReqDTO.java

@@ -1,7 +1,6 @@
 package com.zt.plat.module.erp.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
 import java.util.Map;

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ErrorCodeConstants.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.erp.enums;
-import com.zt.plat.framework.common.exception.ErrorCode;// TODO 待办：请将下面的错误码复制到 zt-module-sply 模块的 ErrorCodeConstants 类中。注意，请给“TODO 补充编号”设置一个错误码编号！！！
+
+import com.zt.plat.framework.common.exception.ErrorCode;
 // ========== ERP客商主数据 TODO 补充编号 ==========
 
 public interface ErrorCodeConstants {

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java

@@ -3,7 +3,6 @@ package com.zt.plat.module.erp.api;
 import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO;
 import com.zt.plat.module.erp.common.conf.ErpConfig;
 import jakarta.annotation.Resource;
-import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpProcessDetailPageReqVO.java

@@ -4,8 +4,6 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 @Schema(description = "管理后台 - ERP工艺路线明细分页 Request VO")
 @Data
 public class ErpProcessDetailPageReqVO extends PageParam {

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpProcessDetailRespVO.java

@@ -5,8 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 @Schema(description = "管理后台 - ERP工艺路线明细 Response VO")
 @Data
 @ExcelIgnoreUnannotated

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpProcessDetailSaveReqVO.java

@@ -5,8 +5,6 @@ import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 @Schema(description = "管理后台 - ERP工艺路线明细新增/修改 Request VO")
 @Data
 public class ErpProcessDetailSaveReqVO {

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpProcessPageReqVO.java

@@ -4,8 +4,6 @@ import com.zt.plat.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 @Schema(description = "管理后台 - ERP工艺路线分页 Request VO")
 @Data
 public class ErpProcessPageReqVO extends PageParam {

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpProcessRespVO.java

@@ -5,8 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 @Schema(description = "管理后台 - ERP工艺路线 Response VO")
 @Data
 @ExcelIgnoreUnannotated

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpProcessSaveReqVO.java

@@ -5,8 +5,6 @@ import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 @Schema(description = "管理后台 - ERP工艺路线新增/修改 Request VO")
 @Data
 public class ErpProcessSaveReqVO {