1. 新增物料相关接口

2. 修复部分服务因为包名设置错误导致无法采集日志的错误

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/businessdictionarytype/BusinessDictionaryTypeApi.java

@@ -0,0 +1,60 @@
+package com.zt.plat.module.base.api.businessdictionarytype;
+
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.module.base.api.businessdictionarytype.dto.BusinessDictionaryDataDTO;
+import com.zt.plat.module.base.api.businessdictionarytype.dto.BusinessDictionaryTypePageReqDTO;
+import com.zt.plat.module.base.api.businessdictionarytype.dto.BusinessDictionaryTypeRespDTO;
+import com.zt.plat.module.base.api.businessdictionarytype.dto.BusinessDictionaryTypeSaveReqDTO;
+import com.zt.plat.module.base.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.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = ApiConstants.NAME)
+@Tag(name = "RPC 服务 - 业务字典类型")
+public interface BusinessDictionaryTypeApi {
+
+    String PREFIX = ApiConstants.PREFIX + "/business-dictionary-type";
+
+    @PostMapping(PREFIX + "/create")
+    @Operation(summary = "创建业务字典类型")
+    CommonResult<BusinessDictionaryTypeRespDTO> createBusinessDictionaryType(@Valid @RequestBody BusinessDictionaryTypeSaveReqDTO createReqDTO);
+
+    @PutMapping(PREFIX + "/update")
+    @Operation(summary = "更新业务字典类型")
+    CommonResult<Boolean> updateBusinessDictionaryType(@Valid @RequestBody BusinessDictionaryTypeSaveReqDTO updateReqDTO);
+
+    @DeleteMapping(PREFIX + "/delete")
+    @Operation(summary = "删除业务字典类型")
+    CommonResult<Boolean> deleteBusinessDictionaryType(@RequestParam("id") Long id);
+
+    @DeleteMapping(PREFIX + "/delete-list")
+    @Operation(summary = "批量删除业务字典类型")
+    CommonResult<Boolean> deleteBusinessDictionaryTypeList(@RequestBody List<Long> ids);
+
+    @GetMapping(PREFIX + "/get")
+    @Operation(summary = "获得业务字典类型")
+    CommonResult<BusinessDictionaryTypeRespDTO> getBusinessDictionaryType(@RequestParam("id") Long id);
+
+    @GetMapping(PREFIX + "/page")
+    @Operation(summary = "获得业务字典类型分页")
+    CommonResult<PageResult<BusinessDictionaryTypeRespDTO>> getBusinessDictionaryTypePage(@Valid BusinessDictionaryTypePageReqDTO pageReqDTO);
+
+    @GetMapping(PREFIX + "/business-dictionary-data/list-by-dictionary-type-id")
+    @Operation(summary = "获得业务字典数据列表")
+    CommonResult<List<BusinessDictionaryDataDTO>> getBusinessDictionaryDataListByDictionaryTypeId(@RequestParam("dictionaryTypeId") Long dictionaryTypeId);
+
+    @GetMapping(PREFIX + "/business-dictionary-data/list-by-type")
+    @Operation(summary = "根据字典类型编码获取业务字典数据列表")
+    CommonResult<List<BusinessDictionaryDataDTO>> getBusinessDictionaryDataListByType(@RequestParam("type") String type);
+}

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/businessdictionarytype/dto/BusinessDictionaryDataDTO.java

@@ -0,0 +1,35 @@
+package com.zt.plat.module.base.api.businessdictionarytype.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 业务字典数据 DTO
+ */
+@Data
+public class BusinessDictionaryDataDTO {
+
+    @Schema(description = "主键ID", example = "1001")
+    private Long id;
+
+    @Schema(description = "上级字典", example = "2001")
+    private Long parentId;
+
+    @Schema(description = "字典类型", example = "3001")
+    private Long dictionaryTypeId;
+
+    @Schema(description = "排序号", example = "10")
+    private Long sort;
+
+    @Schema(description = "字典标签", example = "状态")
+    private String label;
+
+    @Schema(description = "字典值", example = "ENABLE")
+    private String value;
+
+    @Schema(description = "状态(0正常 1停用)", example = "0")
+    private Long status;
+
+    @Schema(description = "备注", example = "同义词")
+    private String remark;
+}

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/businessdictionarytype/dto/BusinessDictionaryTypePageReqDTO.java

@@ -0,0 +1,21 @@
+package com.zt.plat.module.base.api.businessdictionarytype.dto;
+
+import com.zt.plat.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 业务字典类型分页 Request DTO
+ */
+@Data
+public class BusinessDictionaryTypePageReqDTO extends PageParam {
+
+    @Schema(description = "字典名称", example = "物料状态")
+    private String name;
+
+    @Schema(description = "字典类型", example = "base_material_status")
+    private String type;
+
+    @Schema(description = "状态(0正常 1停用)", example = "0")
+    private Long status;
+}

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/businessdictionarytype/dto/BusinessDictionaryTypeRespDTO.java

@@ -0,0 +1,31 @@
+package com.zt.plat.module.base.api.businessdictionarytype.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 业务字典类型 Response DTO
+ */
+@Data
+public class BusinessDictionaryTypeRespDTO {
+
+    @Schema(description = "主键ID", example = "11771")
+    private Long id;
+
+    @Schema(description = "字典名称", example = "物料状态")
+    private String name;
+
+    @Schema(description = "字典类型", example = "base_material_status")
+    private String type;
+
+    @Schema(description = "状态(0正常 1停用)", example = "0")
+    private Long status;
+
+    @Schema(description = "备注", example = "基础物料状态")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+}

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/businessdictionarytype/dto/BusinessDictionaryTypeSaveReqDTO.java

@@ -0,0 +1,38 @@
+package com.zt.plat.module.base.api.businessdictionarytype.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 业务字典类型新增/修改 Request DTO
+ */
+@Data
+public class BusinessDictionaryTypeSaveReqDTO {
+
+    @Schema(description = "主键ID", example = "11771")
+    private Long id;
+
+    @Schema(description = "字典名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "物料状态")
+    @NotEmpty(message = "字典名称不能为空")
+    private String name;
+
+    @Schema(description = "字典类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "base_material_status")
+    @NotEmpty(message = "字典类型不能为空")
+    private String type;
+
+    @Schema(description = "状态(0正常 1停用)", example = "0")
+    private Long status;
+
+    @Schema(description = "备注", example = "基础物料状态")
+    private String remark;
+
+    @Schema(description = "删除时间")
+    private LocalDateTime delTime;
+
+    @Schema(description = "业务字典数据列表")
+    private List<BusinessDictionaryDataDTO> businessDictionaryDatas;
+}

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/departmentmaterial/DepartmentMaterialApi.java

@@ -0,0 +1,51 @@
+package com.zt.plat.module.base.api.departmentmaterial;
+
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.module.base.api.departmentmaterial.dto.DepartmentMaterialPageReqDTO;
+import com.zt.plat.module.base.api.departmentmaterial.dto.DepartmentMaterialRespDTO;
+import com.zt.plat.module.base.api.departmentmaterial.dto.DepartmentMaterialSaveReqDTO;
+import com.zt.plat.module.base.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.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = ApiConstants.NAME)
+@Tag(name = "RPC 服务 - 组织架构物料")
+public interface DepartmentMaterialApi {
+
+    String PREFIX = ApiConstants.PREFIX + "/department-material";
+
+    @PostMapping(PREFIX + "/create")
+    @Operation(summary = "创建组织架构物料")
+    CommonResult<DepartmentMaterialRespDTO> createDepartmentMaterial(@Valid @RequestBody DepartmentMaterialSaveReqDTO createReqDTO);
+
+    @PutMapping(PREFIX + "/update")
+    @Operation(summary = "更新组织架构物料")
+    CommonResult<Boolean> updateDepartmentMaterial(@Valid @RequestBody DepartmentMaterialSaveReqDTO updateReqDTO);
+
+    @DeleteMapping(PREFIX + "/delete")
+    @Operation(summary = "删除组织架构物料")
+    CommonResult<Boolean> deleteDepartmentMaterial(@RequestParam("id") Long id);
+
+    @DeleteMapping(PREFIX + "/delete-list")
+    @Operation(summary = "批量删除组织架构物料")
+    CommonResult<Boolean> deleteDepartmentMaterialList(@RequestBody List<Long> ids);
+
+    @GetMapping(PREFIX + "/get")
+    @Operation(summary = "获得组织架构物料")
+    CommonResult<DepartmentMaterialRespDTO> getDepartmentMaterial(@RequestParam("id") Long id);
+
+    @GetMapping(PREFIX + "/page")
+    @Operation(summary = "获得组织架构物料分页")
+    CommonResult<PageResult<DepartmentMaterialRespDTO>> getDepartmentMaterialPage(@Valid DepartmentMaterialPageReqDTO pageReqDTO);
+}

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/departmentmaterial/dto/DepartmentMaterialPageReqDTO.java

@@ -0,0 +1,49 @@
+package com.zt.plat.module.base.api.departmentmaterial.dto;
+
+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 java.util.List;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+ * 组织架构物料分页 Request DTO
+ */
+@Data
+public class DepartmentMaterialPageReqDTO extends PageParam {
+
+    @Schema(description = "物料信息ID", example = "3923")
+    private Long infomationId;
+
+    @Schema(description = "物料信息ID集合(内部使用)")
+    private List<Long> infomationIds;
+
+    @Schema(description = "物料分类ID", example = "30114")
+    private Long classesId;
+
+    @Schema(description = "部门ID", example = "1001")
+    private Long deptId;
+
+    @Schema(description = "字典数据值-物料类型")
+    private String dictionaryDataValue;
+
+    @Schema(description = "状态编码", example = "1")
+    private String status;
+
+    @Schema(description = "物料编码")
+    private String materialNumber;
+
+    @Schema(description = "物料名称")
+    private String materialName;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+}

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/departmentmaterial/dto/DepartmentMaterialRespDTO.java

@@ -0,0 +1,61 @@
+package com.zt.plat.module.base.api.departmentmaterial.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 组织架构物料 Response DTO
+ */
+@Data
+public class DepartmentMaterialRespDTO {
+
+    @Schema(description = "主键ID", example = "5674")
+    private Long id;
+
+    @Schema(description = "物料信息ID", example = "3923")
+    private Long infomationId;
+
+    @Schema(description = "物料分类ID", example = "30114")
+    private Long classesId;
+
+    @Schema(description = "字典数据值-物料类型")
+    private String dictionaryDataValue;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "部门ID")
+    private Long deptId;
+
+    @Schema(description = "部门名称")
+    private String deptName;
+
+    @Schema(description = "物料编码")
+    private String materialNumber;
+
+    @Schema(description = "物料名称")
+    private String materialName;
+
+    @Schema(description = "物料大类名称")
+    private String categoryLargeName;
+
+    @Schema(description = "物料中类名称")
+    private String categoryMediumName;
+
+    @Schema(description = "物料小类名称")
+    private String categorySmallName;
+
+    @Schema(description = "物料分类路径")
+    private String categoryPath;
+
+    @Schema(description = "组织物料类型名称")
+    private String dictionaryDataLabel;
+
+    @Schema(description = "状态编码")
+    private String status;
+}

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/departmentmaterial/dto/DepartmentMaterialSaveReqDTO.java

@@ -0,0 +1,39 @@
+package com.zt.plat.module.base.api.departmentmaterial.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * 组织架构物料新增/修改 Request DTO
+ */
+@Data
+public class DepartmentMaterialSaveReqDTO {
+
+    @Schema(description = "主键ID", example = "5674")
+    private Long id;
+
+    @Schema(description = "部门ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1001")
+    @NotNull(message = "部门ID不能为空")
+    private Long deptId;
+
+    @Schema(description = "物料信息ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3923")
+    @NotNull(message = "物料信息ID不能为空")
+    private Long infomationId;
+
+    @Schema(description = "物料分类ID", example = "30114")
+    private Long classesId;
+
+    @Schema(description = "字典数据值-物料类型", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "字典数据值-物料类型不能为空")
+    private String dictionaryDataValue;
+
+    @Schema(description = "状态编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "状态不能为空")
+    private String status;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "备注不能为空")
+    private String remark;
+}

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/api/materialclasses/MaterialClassesApi.java

@@ -0,0 +1,56 @@
+package com.zt.plat.module.base.api.materialclasses;
+
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.module.base.api.materialclasses.dto.MaterialClassesPageReqDTO;
+import com.zt.plat.module.base.api.materialclasses.dto.MaterialClassesRespDTO;
+import com.zt.plat.module.base.api.materialclasses.dto.MaterialClassesSaveReqDTO;
+import com.zt.plat.module.base.api.materialclasses.dto.MaterialClassesTreeRespDTO;
+import com.zt.plat.module.base.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.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@FeignClient(name = ApiConstants.NAME)
+@Tag(name = "RPC 服务 - 物料分类")
+public interface MaterialClassesApi {
+
+    String PREFIX = ApiConstants.PREFIX + "/material-classes";
+
+    @PostMapping(PREFIX + "/create")
+    @Operation(summary = "创建物料分类")
+    CommonResult<MaterialClassesRespDTO> createMaterialClasses(@Valid @RequestBody MaterialClassesSaveReqDTO createReqDTO);
+
+    @PutMapping(PREFIX + "/update")
+    @Operation(summary = "更新物料分类")
+    CommonResult<Boolean> updateMaterialClasses(@Valid @RequestBody MaterialClassesSaveReqDTO updateReqDTO);
+
+    @DeleteMapping(PREFIX + "/delete")
+    @Operation(summary = "删除物料分类")
+    CommonResult<Boolean> deleteMaterialClasses(@RequestParam("id") Long id);
+
+    @DeleteMapping(PREFIX + "/delete-list")
+    @Operation(summary = "批量删除物料分类")
+    CommonResult<Boolean> deleteMaterialClassesList(@RequestBody List<Long> ids);
+
+    @GetMapping(PREFIX + "/get")
+    @Operation(summary = "获得物料分类")
+    CommonResult<MaterialClassesRespDTO> getMaterialClasses(@RequestParam("id") Long id);
+
+    @GetMapping(PREFIX + "/page")
+    @Operation(summary = "获得物料分类分页")
+    CommonResult<PageResult<MaterialClassesRespDTO>> getMaterialClassesPage(@Valid MaterialClassesPageReqDTO pageReqDTO);
+
+    @GetMapping(PREFIX + "/tree")
+    @Operation(summary = "获得物料分类树")
+    CommonResult<List<MaterialClassesTreeRespDTO>> getMaterialClassesTree();
+}