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

.gitignore

@@ -73,3 +73,5 @@ functions/mock
 screenshot
 .firebase
 sessionStore
+/CLAUDE.md
+/nul

base-server/pom.xml

@@ -40,11 +40,6 @@
             <artifactId>zt-module-erp-server</artifactId>
             <version>${revision}</version>
         </dependency>
-        <dependency>
-            <groupId>com.zt.plat</groupId>
-            <artifactId>zt-module-unit-management-server</artifactId>
-            <version>${revision}</version>
-        </dependency>
         <!-- Web 相关 -->
         <dependency>
             <groupId>com.zt.plat</groupId>

pom.xml

@@ -12,7 +12,6 @@
         <module>zt-module-contract-order</module>
         <module>zt-module-erp</module>
         <module>base-server</module>
-        <module>zt-module-unit-management</module>
     </modules>
 
     <name>${project.artifactId}</name>
@@ -148,8 +147,13 @@
             <name>中铜 ZStack 私服</name>
             <url>http://172.16.46.63:30708/repository/test/</url>
             <releases>
-                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>warn</checksumPolicy>
             </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
         </repository>
     </repositories>
 

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

@@ -29,4 +29,32 @@ public interface ErrorCodeConstants {
     ErrorCode BUSINESS_DICTIONARY_TYPE_NOT_EXISTS = new ErrorCode(1_027_200_003, "业务字典类型不存在");
     ErrorCode BUSINESS_DEPARTMENT_INDICATOR_NOT_EXISTS = new ErrorCode(1_027_200_004, "部门持有指标不存在");
 
+    // ========== 模板文档管理系统 1-006-xxx-xxx ==========
+    // 模板分类 1-006-001-xxx
+    ErrorCode TEMPLATE_CATEGORY_NOT_EXISTS = new ErrorCode(1_006_001_001, "模板分类不存在");
+
+    // 标签库 1-006-002-xxx
+    ErrorCode TEMPLATE_TAG_NOT_EXISTS = new ErrorCode(1_006_002_001, "标签不存在");
+    ErrorCode TEMPLATE_TAG_CODE_DUPLICATE = new ErrorCode(1_006_002_002, "标签编码已存在");
+
+    // 模板 1-006-003-xxx
+    ErrorCode TEMPLATE_NOT_EXISTS = new ErrorCode(1_006_003_001, "模板不存在");
+    ErrorCode TEMPLATE_CODE_DUPLICATE = new ErrorCode(1_006_003_002, "模板编码已存在");
+
+    // 模板实例 1-006-004-xxx
+    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-api/src/main/java/com/zt/plat/module/unitmanagement/enums/UnitErrorCodeConstants.java

@@ -19,4 +19,13 @@ public interface UnitErrorCodeConstants {
     ErrorCode UNT_INFO_NOT_EXISTS =
             new ErrorCode(1_010_000_004, "单位信息记录不存在");
 
+    ErrorCode UNIT_NOT_FOUND =
+            new ErrorCode(1_010_000_005, "找不到单位: %s");
+
+    ErrorCode UNIT_CONVERSION_PATH_NOT_FOUND =
+            new ErrorCode(1_010_000_006, "无法找到从单位 [%s] 到单位 [%s] 的转换路径，请检查单位是否属于同一量纲或配置转换规则");
+
+    ErrorCode UNIT_DIFFERENT_QUANTITY =
+            new ErrorCode(1_010_000_007, "单位 [%s] 和单位 [%s] 不属于同一量纲，无法转换");
+
 }

zt-module-base/zt-module-base-server/pom.xml

@@ -122,6 +122,13 @@
             <artifactId>zt-spring-boot-starter-excel</artifactId>
         </dependency>
 
+        <!-- Velocity模板引擎 -->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.3</version>
+        </dependency>
+
         <!-- 监控相关 -->
         <dependency>
             <groupId>com.zt.plat</groupId>

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

@@ -28,6 +28,9 @@ public class ElementPageReqVO extends PageParam {
     @Schema(description = "小数位数")
     private Long decimalValue;
 
+    @Schema(description = "是否启用")
+    private String isEnable;
+
     @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/base/vo/ElementRespVO.java

@@ -36,6 +36,10 @@ public class ElementRespVO {
     @ExcelProperty("品位单位")
     private String gradeUnit;
 
+    @Schema(description = "是否启用")
+    @ExcelProperty("是否启用")
+    private String isEnable;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

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

@@ -1,7 +1,7 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
@@ -21,13 +21,15 @@ public class ElementSaveReqVO {
     private String name;
 
     @Schema(description = "金属元素编码", requiredMode = Schema.RequiredMode.REQUIRED)
-//    @NotEmpty(message = "金属元素编码不能为空")
     private String coding;
 
     @Schema(description = "小数位数")
-    @NotEmpty(message = "小数位数不能为空")
+    @Min(value = 1, message = "数值必须大于0")
     private Long decimalValue;
 
+    @Schema(description = "是否启用")
+    private String isEnable;
+
     @Schema(description = "品位单位", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "品位单位不能为空")
     private String gradeUnit;

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;