feat(wms): 增加版本管理功能和操作按钮
在规程主表的操作列中新增“版本与方案”按钮,点击后可跳转至版本管理页面。更新了操作列的宽度以适应新按钮。同时,在后端服务中添加了对规程版本存在性的校验,确保在删除规程时不会影响相关版本数据。
This commit is contained in:
59
klp-wms/src/main/java/com/klp/domain/WmsProcessPlan.java
Normal file
59
klp-wms/src/main/java/com/klp/domain/WmsProcessPlan.java
Normal file
@@ -0,0 +1,59 @@
|
||||
package com.klp.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* 方案点位对象 wms_process_plan
|
||||
*
|
||||
* @author klp
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("wms_process_plan")
|
||||
public class WmsProcessPlan extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "plan_id")
|
||||
private Long planId;
|
||||
|
||||
/**
|
||||
* 规程版本ID
|
||||
*/
|
||||
private Long versionId;
|
||||
|
||||
/**
|
||||
* 段类型(INLET/PROCESS/OUTLET)
|
||||
*/
|
||||
private String segmentType;
|
||||
|
||||
/**
|
||||
* 段名称
|
||||
*/
|
||||
private String segmentName;
|
||||
|
||||
/**
|
||||
* 点位名称
|
||||
*/
|
||||
private String pointName;
|
||||
|
||||
/**
|
||||
* 点位编码
|
||||
*/
|
||||
private String pointCode;
|
||||
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
private Integer sortOrder;
|
||||
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
|
||||
private String remark;
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.klp.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* 规程版本对象 wms_process_spec_version
|
||||
*
|
||||
* @author klp
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("wms_process_spec_version")
|
||||
public class WmsProcessSpecVersion extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(value = "version_id")
|
||||
private Long versionId;
|
||||
|
||||
/**
|
||||
* 规程主表ID
|
||||
*/
|
||||
private Long specId;
|
||||
|
||||
/**
|
||||
* 版本号
|
||||
*/
|
||||
private String versionCode;
|
||||
|
||||
/**
|
||||
* 是否当前生效(0=否,1=是)
|
||||
*/
|
||||
private Integer isActive;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private String status;
|
||||
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
|
||||
private String remark;
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
package com.klp.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* 方案点位业务对象 wms_process_plan
|
||||
*
|
||||
* @author klp
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class WmsProcessPlanBo extends BaseEntity {
|
||||
|
||||
@NotNull(message = "主键不能为空", groups = {EditGroup.class})
|
||||
private Long planId;
|
||||
|
||||
@NotNull(message = "版本不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private Long versionId;
|
||||
|
||||
@NotBlank(message = "段类型不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private String segmentType;
|
||||
|
||||
private String segmentName;
|
||||
|
||||
@NotBlank(message = "点位名称不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private String pointName;
|
||||
|
||||
@NotBlank(message = "点位编码不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private String pointCode;
|
||||
|
||||
@NotNull(message = "排序不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private Integer sortOrder;
|
||||
|
||||
private String remark;
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package com.klp.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* 规程版本业务对象 wms_process_spec_version
|
||||
*
|
||||
* @author klp
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class WmsProcessSpecVersionBo extends BaseEntity {
|
||||
|
||||
@NotNull(message = "主键不能为空", groups = {EditGroup.class})
|
||||
private Long versionId;
|
||||
|
||||
@NotNull(message = "规程不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private Long specId;
|
||||
|
||||
@NotBlank(message = "版本号不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private String versionCode;
|
||||
|
||||
/**
|
||||
* 是否当前生效(0=否,1=是)
|
||||
*/
|
||||
private Integer isActive;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private String status;
|
||||
|
||||
private String remark;
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 方案点位视图对象 wms_process_plan
|
||||
*
|
||||
* @author klp
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsProcessPlanVo {
|
||||
|
||||
@ExcelProperty(value = "方案点位ID")
|
||||
private Long planId;
|
||||
|
||||
@ExcelProperty(value = "版本ID")
|
||||
private Long versionId;
|
||||
|
||||
@ExcelProperty(value = "段类型")
|
||||
private String segmentType;
|
||||
|
||||
@ExcelProperty(value = "段名称")
|
||||
private String segmentName;
|
||||
|
||||
@ExcelProperty(value = "点位名称")
|
||||
private String pointName;
|
||||
|
||||
@ExcelProperty(value = "点位编码")
|
||||
private String pointCode;
|
||||
|
||||
@ExcelProperty(value = "排序")
|
||||
private Integer sortOrder;
|
||||
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
@ExcelProperty(value = "创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
|
||||
@ExcelProperty(value = "更新时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 规程版本视图对象 wms_process_spec_version
|
||||
*
|
||||
* @author klp
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsProcessSpecVersionVo {
|
||||
|
||||
@ExcelProperty(value = "版本ID")
|
||||
private Long versionId;
|
||||
|
||||
@ExcelProperty(value = "规程ID")
|
||||
private Long specId;
|
||||
|
||||
@ExcelProperty(value = "版本号")
|
||||
private String versionCode;
|
||||
|
||||
@ExcelProperty(value = "是否生效")
|
||||
private Integer isActive;
|
||||
|
||||
@ExcelProperty(value = "状态")
|
||||
private String status;
|
||||
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
@ExcelProperty(value = "创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
|
||||
@ExcelProperty(value = "更新时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
}
|
||||
Reference in New Issue
Block a user