zgty/zt-dsc
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并 mes 代码

Browse Source
This commit is contained in:
Administrator
2025-09-04 00:51:13 +00:00
committed by chenbowen
parent d1d5b2c0c5
commit 81f651388f
138 changed files with 5675 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-product/pom.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>yudao</artifactId>
<artifactId>dsc-mes</artifactId>
<groupId>cn.iocoder.cloud</groupId>
<version>${revision}</version>
</parent>

81
yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/ErrorCodeConstants.java
View File

@@ -4,14 +4,87 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
/**
* product 错误码枚举类
*
* product 系统，使用 1-xxx-xxx-xxx 段
* <p>
* 1-030-400-000 ~ 1-030-599-999
* <p>
* 1-030-400(公共)-xxx
* --------------------plan-----------------------
* 1-030-411(plan-template)-xxx
* 1-030-412(plan-template-column)-xxx
* 1-030-413(plan-template-column-data)-xxx
* 1-030-414(plan-template-item)-xxx
* 1-030-415(factory_plan)-xxx
* 1-030-416(factory_plan-column)-xxx
* 1-030-417(factory_plan-column-data)-xxx
* 1-030-418(factory_plan-item)-xxx
* 1-030-419(factory_plan-item-data)-xxx
* 1-030-420(company_plan)-xxx
* 1-030-421(company_plan-column)-xxx
* 1-030-422(company_plan-column-data)-xxx
* 1-030-423(company_plan-item)-xxx
* 1-030-424(company_plan-item-data)-xxx
* -------------------------------------------
* -----------------factory-------------------
* 1-030-424 工厂模型(factory-model)
* -------------------------------------------
* -----------------schedule------------------
* 1-030-425 排班配置(schedule-config)
* 1-030-426 排班班组(schedule-team)
* 1-030-427 排班班次(schedule-shift)
* 1-030-428 排班规则(schedule-rule)
* 1-030-429 排班数据(schedule-data)
* -------------------------------------------
*
* @author ZT
*/
public interface ErrorCodeConstants {
//通用
ErrorCode CODE_GENERATION_SERVICE_CALL_FAILED = new ErrorCode(1_030_400_001, "编码生成服务调用失败");
//计划模板(plan-template)
ErrorCode PLAN_TEMPLATE_NOT_EXISTS = new ErrorCode(1_030_411_001, "计划模板不存在");
ErrorCode PLAN_TEMPLATE_PLAN_TYPE_IS_NULL = new ErrorCode(1_030_411_002, "计划模板类型为空");
ErrorCode PLAN_TEMPLATE_PLAN_TYPE_NOT_EXISTS = new ErrorCode(1_030_411_003, "计划模板类型不存在");
ErrorCode PLAN_TEMPLATE_PLAN_FAILED_TO_RETRIEVE_ENCODING = new ErrorCode(1_030_411_004, "计划模板编号获取失败");
//计划模板动态列(plan-template-column)
ErrorCode PLAN_TEMPLATE_COLUMN_NOT_EXISTS = new ErrorCode(1_030_412_001, "计划模板动态列不存在");
ErrorCode PLAN_TEMPLATE_COLUMN_OPERATION_ID_IS_NULL = new ErrorCode(1_030_412_002, "计划模板动态列操作标识为空");
ErrorCode PLAN_TEMPLATE_COLUMN_ENCODING_INFORMATION_ALREADY_EXISTS = new ErrorCode(1_030_412_003, "计划模板动态列编码不能重复");
//计划模板动态列数据（plan-template-column-data）
ErrorCode PLAN_TEMPLATE_COLUMN_DATA_NOT_EXISTS = new ErrorCode(1_030_413_001, "计划模板动态列结果不存在");
//计划模板项目(plan-template-item)
ErrorCode PLAN_TEMPLATE_ITEM_NOT_EXISTS = new ErrorCode(1_030_414_001, "计划模板项目不存在");
ErrorCode PLAN_TEMPLATE_ITEM_OPERATION_ID_IS_NULL = new ErrorCode(1_030_414_002, "计划模板动态列操作标识为空");
//1_030_424 工厂模型(factory-model)
ErrorCode FACTORY_MODEL_NOT_EXISTS = new ErrorCode(1_030_424_001, "工厂模型不存在");
ErrorCode FACTORY_MODEL_NODE_CODE_EXISTS = new ErrorCode(1_030_424_002, "节点编码已存在");
ErrorCode FACTORY_MODEL_NODE_NAME_EXISTS = new ErrorCode(1_030_424_003, "节点名称已存在");
//1_030_425 排班配置(schedule-config)
ErrorCode SCHEDULE_CONFIG_NOT_EXISTS = new ErrorCode(1_030_425_001, "排班配置不存在");
ErrorCode SCHEDULE_CONFIG_CODE_EXISTS = new ErrorCode(1_030_425_002, "排班编码已存在");
ErrorCode SCHEDULE_CONFIG_NAME_EXISTS = new ErrorCode(1_030_425_003, "排班名称已存在");
//1_030_426 排班班组(schedule-team)
ErrorCode SCHEDULE_TEAM_NOT_EXISTS = new ErrorCode(1_030_426_001, "排班班组不存在");
ErrorCode SCHEDULE_TEAM_NAME_EXISTS = new ErrorCode(1_030_426_002, "排班班组名称重复");
ErrorCode SCHEDULE_TEAM_NOT_CREATE = new ErrorCode(1_030_426_003, "排班班组信息未创建");
//1_030_427 排班班次(schedule-shift)
ErrorCode SCHEDULE_SHIFT_NOT_EXISTS = new ErrorCode(1_030_427_001, "排班班次不存在");
ErrorCode SCHEDULE_SHIFT_NAME_EXISTS = new ErrorCode(1_030_427_002, "排班班次名称重复");
ErrorCode SCHEDULE_SHIFT_NOT_CREATE = new ErrorCode(1_030_427_003, "排班班次信息未创建");
//1_030_428 排班规则(schedule-rule)
ErrorCode SCHEDULE_RULE_NOT_EXISTS = new ErrorCode(1_030_428_001, "排班规则不存在");
ErrorCode SCHEDULE_RULE_DATE_EXISTS = new ErrorCode(1_030_428_002, "排班日期重复");
//1_030_429 排班数据(schedule-data)
ErrorCode SCHEDULE_DATA_NOT_EXISTS = new ErrorCode(1_030_429_001, "排班数据不存在");
// ========== 示例模块 1-001-000-000 ==========
ErrorCode EXAMPLE_NOT_EXISTS = new ErrorCode(1_001_000_001, "示例不存在");
}

37
yudao-module-product/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/enums/PlanTemplateTypeEnums.java Normal file
View File

@@ -0,0 +1,37 @@
package cn.iocoder.yudao.module.product.enums;
import lombok.Getter;
import java.util.Objects;
/**
* 计划模板状态
*
* @author ZT
*/
@Getter
public enum PlanTemplateTypeEnums {
Month("M", "月计划", "PLN_TMPL_M"),
Day("D", "日计划", "PLN_TMPL_D");
private final String type;
private final String name;
private final String codeRule;
PlanTemplateTypeEnums(String type, String name, String codeRule) {
this.type = type;
this.name = name;
this.codeRule = codeRule;
}
// 根据code获取枚举
public static String getCodeRuleByType(String type) {
for (PlanTemplateTypeEnums templateTypeEnums : values()) {
if (templateTypeEnums.type.equals(type)) {
return templateTypeEnums.codeRule;
}
}
return null;
}
}

30
yudao-module-product/yudao-module-product-server/pom.xml
View File

@@ -131,21 +131,21 @@
<build>
<!-- 设置构建的 jar 包名 -->
<finalName>${project.artifactId}</finalName>
<plugins>
<!-- 打包 -->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.boot.version}</version>
<executions>
<execution>
<goals>
<goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
</goals>
</execution>
</executions>
</plugin>
</plugins>
<!-- <plugins>-->
<!-- &lt;!&ndash; 打包 &ndash;&gt;-->
<!-- <plugin>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
<!-- <version>${spring.boot.version}</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <goals>-->
<!-- <goal>repackage</goal> &lt;!&ndash; 将引入的 jar 打入其中 &ndash;&gt;-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- </plugins>-->
</build>
</project>

2
yudao-module-product/yudao-module-product-server/src/main/java/cn/iocoder/yudao/module/product/ProductServerApplication.java
View File

@@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
*
* @author ZT
*/
@SpringBootApplication
//@SpringBootApplication
public class ProductServerApplication {
public static void main(String[] args) {

116
yudao-module-product/yudao-module-product-server/src/main/java/cn/iocoder/yudao/module/product/controller/admin/factory/model/FactoryModelController.java Normal file
View File

File diff suppressed because it is too large Load Diff

21
yudao-module-product/yudao-module-product-server/src/main/java/cn/iocoder/yudao/module/product/controller/admin/factory/model/vo/FactoryModeTreeRespVO.java Normal file
View File

@@ -0,0 +1,21 @@
package cn.iocoder.yudao.module.product.controller.admin.factory.model.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Schema(description = "管理后台 - 工厂模型 Tree Response VO")
@Data
public class FactoryModeTreeRespVO {
@Schema(description = "节点id")
private Long id;
@Schema(description = "节点编码")
private String nodeCoding;
@Schema(description = "节点名称")
private String nodeName;
@Schema(description = "节点类型")
private String nodeType;
@Schema(description = "父级id")
private Long parentId;
@Schema(description = "父级编码")
private String parentCoding;
}

45
yudao-module-product/yudao-module-product-server/src/main/java/cn/iocoder/yudao/module/product/controller/admin/factory/model/vo/FactoryModelBaseVO.java Normal file
View File

@@ -0,0 +1,45 @@
package cn.iocoder.yudao.module.product.controller.admin.factory.model.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@Schema(description = "管理后台 - 工厂模型Base VO")
@Data
public class FactoryModelBaseVO {
@Schema(description = "父级id", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "父级id不能为空")
private Long parentId;
@Schema(description = "父级编码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "父级编码不能为空")
private String parentCoding;
@Schema(description = "节点编码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "节点编码不能为空")
private String nodeCoding;
@Schema(description = "节点名称", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "节点名称不能为空")
private String nodeName;
@Schema(description = "节点类型", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "节点类型不能为空")
private String nodeType;
@Schema(description = "排序")
private Integer sort;
@Schema(description = "ERP工艺路线编码")
private String erpProcessRouteCoding;
@Schema(description = "ERP工序编码")
private String erpProcessCoding;
@Schema(description = "ERP工序名称")
private String erpProcessName;
@Schema(description = "状态")
private String nodeStatus;
}

18
yudao-module-product/yudao-module-product-server/src/main/java/cn/iocoder/yudao/module/product/controller/admin/factory/model/vo/FactoryModelChangeStatusReqVO.java Normal file
View File

@@ -0,0 +1,18 @@
package cn.iocoder.yudao.module.product.controller.admin.factory.model.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@Schema(description = "管理后台 - 工厂模型修改 Request VO")
@Data
public class FactoryModelChangeStatusReqVO {
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "工厂模型主键不能为空")
private Long id;
@Schema(description = "状态",requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "状态不能为空")
private String nodeStatus;
}

14
yudao-module-product/yudao-module-product-server/src/main/java/cn/iocoder/yudao/module/product/controller/admin/factory/model/vo/FactoryModelCreateReqVO.java Normal file
View File

@@ -0,0 +1,14 @@
package cn.iocoder.yudao.module.product.controller.admin.factory.model.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@Schema(description = "管理后台 - 工厂模型新增 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class FactoryModelCreateReqVO extends FactoryModelBaseVO{
}

Some files were not shown because too many files have changed in this diff Show More