合并 mes 代码
This commit is contained in:
@@ -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>-->
|
||||
<!-- <!– 打包 –>-->
|
||||
<!-- <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>-->
|
||||
</build>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
*
|
||||
* @author ZT
|
||||
*/
|
||||
@SpringBootApplication
|
||||
//@SpringBootApplication
|
||||
public class ProductServerApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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{
|
||||
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package cn.iocoder.yudao.module.product.controller.admin.factory.model.vo;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
@Schema(description = "管理后台 - 工厂模型分页 Request VO")
|
||||
@Data
|
||||
public class FactoryModelPageReqVO extends PageParam {
|
||||
|
||||
@Schema(description = "父级id")
|
||||
private Long parentId;
|
||||
|
||||
@Schema(description = "节点编码")
|
||||
private String nodeCoding;
|
||||
|
||||
@Schema(description = "节点名称")
|
||||
private String nodeName;
|
||||
|
||||
@Schema(description = "节点类型")
|
||||
private String nodeType;
|
||||
|
||||
@Schema(description = "ERP工序编码")
|
||||
private String erpProcessCoding;
|
||||
|
||||
@Schema(description = "ERP工序名称")
|
||||
private String erpProcessName;
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
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 FactoryModelProcessBindReqVO {
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotNull(message = "工厂模型主键不能为空")
|
||||
private Long id;
|
||||
|
||||
@Schema(description = "ERP工艺路线编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotBlank(message = "ERP工艺路线编码不能为空")
|
||||
private String erpProcessRouteCoding;
|
||||
|
||||
@Schema(description = "ERP工序编码", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotBlank(message = "ERP工序编码不能为空")
|
||||
private String erpProcessCoding;
|
||||
|
||||
@Schema(description = "ERP工序名称", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotBlank(message = "ERP工序名称不能为空")
|
||||
private String erpProcessName;
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package cn.iocoder.yudao.module.product.controller.admin.factory.model.vo;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
|
||||
@Schema(description = "管理后台 - 工厂模型修改 Request VO")
|
||||
@Data
|
||||
public class FactoryModelProcessUnbindReqVO {
|
||||
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@NotNull(message = "工厂模型主键不能为空")
|
||||
private Long id;
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user