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

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

@@ -45,4 +45,16 @@ public interface ErrorCodeConstants {
     ErrorCode TEMPLATE_INSTANCE_NOT_EXISTS = new ErrorCode(1_006_004_001, "模板实例不存在");
     ErrorCode TEMPLATE_INSTANCE_CODE_DUPLICATE = new ErrorCode(1_006_004_002, "实例编码已存在");
 
+    // ========== 物料属性  ==========
+    ErrorCode MATERIAL_PROPERTIES_NOT_EXISTS = new ErrorCode(1_027_101_001, "物料属性不存在");
+    ErrorCode MATERIAL_HAS_PROPERTIES_NOT_EXISTS = new ErrorCode(1_027_101_002, "物料持有属性不存在");
+    ErrorCode MATERIAL_CLASSES_NOT_EXISTS = new ErrorCode(1_027_101_003, "物料分类不存在");
+    ErrorCode DEPARTMENT_MATERIAL_NOT_EXISTS = new ErrorCode(1_027_101_004, "组织物料不存在");
+    ErrorCode MATERIAL_HAS_CLASSES_NOT_EXISTS = new ErrorCode(1_027_101_004, "物料持有属性不存在");
+
+    // ========== 工艺信息属性  ==========
+    ErrorCode PROCESSING_INFOMATION_NOT_EXISTS = new ErrorCode(1_027_101_005, "工艺信息不存在");
+    ErrorCode PROCESSING_INFOMATION_OPERATION_NOT_EXISTS = new ErrorCode(1_027_101_006, "工艺工序不存在");
+    ErrorCode PROCESSING_OPERATION_NOT_EXISTS = new ErrorCode(1_027_101_007, "工序不存在");
+    ErrorCode PROCESSING_OPERATION_MATERIAL_NOT_EXISTS = new ErrorCode(1_027_101_008, "工艺工序物料不存在");
 }

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

@@ -19,6 +19,9 @@ public class MaterialInfomationPageReqVO extends PageParam {
     @Schema(description = "物料名称", example = "张三")
     private String name;
 
+    @Schema(description = "分类ID", example = "1024")
+    private Long classesId;
+
     @Schema(description = "备注")
     private String remark;
 

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

@@ -24,6 +24,10 @@ public class MaterialInfomationRespVO {
     @ExcelProperty("物料名称")
     private String name;
 
+    @Schema(description = "分类ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @ExcelProperty("分类ID")
+    private Long classesId;
+
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("备注")
     private String remark;

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

@@ -2,6 +2,7 @@ package com.zt.plat.module.base.controller.admin.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "管理后台 - 物料信息新增/修改 Request VO")
@@ -19,6 +20,10 @@ public class MaterialInfomationSaveReqVO {
     @NotEmpty(message = "物料名称不能为空")
     private String name;
 
+    @Schema(description = "分类ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @NotNull(message = "所属分类不能为空")
+    private Long classesId;
+
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "备注不能为空")
     private String remark;

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

@@ -0,0 +1,47 @@
+package com.zt.plat.module.base.controller.admin.departmentmaterial.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+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;
+
+@Schema(description = "管理后台 - 组织架构物料分页 Request VO")
+@Data
+public class DepartmentMaterialPageReqVO 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 isEnable;
+
+    @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-server/src/main/java/com/zt/plat/module/base/controller/admin/departmentmaterial/vo/DepartmentMaterialRespVO.java

@@ -0,0 +1,83 @@
+package com.zt.plat.module.base.controller.admin.departmentmaterial.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 组织架构物料 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class DepartmentMaterialRespVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5674")
+    @ExcelProperty("主键ID")
+    private Long id;
+
+    @Schema(description = "物料信息ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3923")
+    @ExcelProperty("物料信息ID")
+    private Long infomationId;
+
+    @Schema(description = "物料分类ID", example = "30114")
+    @ExcelProperty("物料分类ID")
+    private Long classesId;
+
+    @Schema(description = "字典数据值-物料类型", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("字典数据值-物料类型")
+    private String dictionaryDataValue;
+
+    @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "部门ID")
+    @ExcelIgnore
+    private Long deptId;
+
+    @Schema(description = "部门名称")
+    @ExcelProperty("部门名称")
+    private String deptName;
+
+    @Schema(description = "物料编码")
+    @ExcelProperty("物料编码")
+    private String materialNumber;
+
+    @Schema(description = "物料名称")
+    @ExcelProperty("物料名称")
+    private String materialName;
+
+    @Schema(description = "物料大类名称")
+    @ExcelProperty("物料大类")
+    private String categoryLargeName;
+
+    @Schema(description = "物料中类名称")
+    @ExcelProperty("物料中类")
+    private String categoryMediumName;
+
+    @Schema(description = "物料小类名称")
+    @ExcelProperty("物料小类")
+    private String categorySmallName;
+
+    @Schema(description = "物料分类路径")
+    @ExcelProperty("物料分类路径")
+    private String categoryPath;
+
+    @Schema(description = "组织物料类型名称")
+    @ExcelProperty("组织物料类型")
+    private String dictionaryDataLabel;
+
+    @Schema(description = "状态编码")
+    @ExcelProperty("状态编码")
+    private String isEnable;
+
+    @Schema(description = "状态名称")
+    @ExcelProperty("状态")
+    private String statusLabel;
+
+}

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

@@ -0,0 +1,30 @@
+package com.zt.plat.module.base.controller.admin.departmentmaterial.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 组织架构物料新增/修改 Request VO")
+@Data
+public class DepartmentMaterialSaveReqVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5674")
+    private Long id;
+
+    @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)
+    @NotEmpty(message = "备注不能为空")
+    private String remark;
+
+}

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

@@ -0,0 +1,35 @@
+package com.zt.plat.module.base.controller.admin.materialclasses.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+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;
+
+@Schema(description = "管理后台 - 物料分类分页 Request VO")
+@Data
+public class MaterialClassesPageReqVO extends PageParam {
+
+    @Schema(description = "父级ID", example = "20706")
+    private Long parentId;
+
+    @Schema(description = "分类编码")
+    private String code;
+
+    @Schema(description = "分类名称", example = "赵六")
+    private String name;
+
+    @Schema(description = "分类级别-用于类别层级(大/中/小类)")
+    private Long level;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}