Merge branch 'dev' into 'test'

Dev

See merge request jygk/dsc-base!15

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>

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/MaterialOtherSaveReqVO.java

@@ -1,6 +1,7 @@
 package com.zt.plat.module.base.controller.admin.base.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Min;
 import lombok.Data;
 
 @Schema(description = "管理后台 - 物料拓展数据新增/修改 Request VO")
@@ -38,6 +39,7 @@ public class MaterialOtherSaveReqVO {
     private String gradeUnit;
 
     @Schema(description = "小数位数")
+    @Min(value = 1, message = "数值必须大于0")
     private Long decimalValue;
 
     @Schema(description = "是否启用")

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation;
+package com.zt.plat.module.base.controller.admin.quantityUnitRelation;
 
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
@@ -10,7 +10,6 @@ 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.*;
@@ -28,9 +27,9 @@ 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.unitmanagement.controller.admin.QuantityUnitRelation.vo.*;
-import com.zt.plat.module.unitmanagement.dal.dataobject.QuantityUnitRelation.QuantityUnitRelationDO;
-import com.zt.plat.module.unitmanagement.service.QuantityUnitRelation.QuantityUnitRelationService;
+import com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo.*;
+import com.zt.plat.module.base.dal.dataobject.quantityUnitRelation.QuantityUnitRelationDO;
+import com.zt.plat.module.base.service.quantityUnitRelation.QuantityUnitRelationService;
 
 @Tag(name = "管理后台 - 计量单位量与单位关联")
 @RestController

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo;
+package com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zt.plat.module.unitmanagement.controller.admin.QuantityUnitRelation.vo;
+package com.zt.plat.module.base.controller.admin.quantityUnitRelation.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;