hansha
/
pay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

产品、毛料、包活非空字段设置

Browse Source
master 16
hshansha 7 months ago
parent 0903ad5345
commit e425b82627
3 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File

10
ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayMaterialBo.java
Unescape View File

@ -24,7 +24,7 @@ public class PayMaterialBo extends BaseEntity {
/** /**
* 主键ID * 主键ID
*/ */
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) //@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id; private Long id;
/** /**
@ -48,25 +48,25 @@ public class PayMaterialBo extends BaseEntity {
/** /**
* 规格 * 规格
*/ */
@NotBlank(message = "规格不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "规格不能为空", groups = { AddGroup.class, EditGroup.class })
private String specification; private String specification;
/** /**
* 尺寸 * 尺寸
*/ */
@NotBlank(message = "尺寸不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "尺寸不能为空", groups = { AddGroup.class, EditGroup.class })
private String size; private String size;
/** /**
* 单位 * 单位
*/ */
@NotBlank(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class })
private String unit; private String unit;
/** /**
* 备注 * 备注
*/ */
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark; private String remark;

24
ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayProductsBo.java
Unescape View File

@ -27,7 +27,7 @@ public class PayProductsBo extends BaseEntity {
/** /**
* 主键 * 主键
*/ */
@NotNull(message = "主键不能为空", groups = { EditGroup.class }) //@NotNull(message = "主键不能为空", groups = { EditGroup.class })
private Long id; private Long id;
/** /**
@ -51,31 +51,31 @@ public class PayProductsBo extends BaseEntity {
/** /**
* 网机编号 * 网机编号
*/ */
@NotBlank(message = "网机编号不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "网机编号不能为空", groups = { AddGroup.class, EditGroup.class })
private String netMachineNo; private String netMachineNo;
/** /**
* 图纸编号 * 图纸编号
*/ */
@NotBlank(message = "图纸编号不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "图纸编号不能为空", groups = { AddGroup.class, EditGroup.class })
private String drawingNum; private String drawingNum;
/** /**
* 工序 * 工序
*/ */
@NotBlank(message = "工序不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "工序不能为空", groups = { AddGroup.class, EditGroup.class })
private String process; private String process;
/** /**
* 规格型号 * 规格型号
*/ */
@NotBlank(message = "规格型号不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "规格型号不能为空", groups = { AddGroup.class, EditGroup.class })
private String model; private String model;
/** /**
* 产品单位 * 产品单位
*/ */
@NotBlank(message = "产品单位不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "产品单位不能为空", groups = { AddGroup.class, EditGroup.class })
private String danwei; private String danwei;
/** /**
@ -87,25 +87,25 @@ public class PayProductsBo extends BaseEntity {
/** /**
* 毛料规格 * 毛料规格
*/ */
@NotBlank(message = "毛料规格不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "毛料规格不能为空", groups = { AddGroup.class, EditGroup.class })
private String originModel; private String originModel;
/** /**
* 毛料尺寸 * 毛料尺寸
*/ */
@NotBlank(message = "毛料尺寸不能为空", groups = { AddGroup.class, EditGroup.class }) //@NotBlank(message = "毛料尺寸不能为空", groups = { AddGroup.class, EditGroup.class })
private String originSize; private String originSize;
/** /**
* 毛料单位 * 毛料单位
*/ */
@NotBlank(message = "毛料单位不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "毛料单位不能为空", groups = { AddGroup.class, EditGroup.class })
private String originDanwei; private String originDanwei;
/** /**
* 入库时间 * 入库时间
*/ */
@NotNull(message = "入库时间不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotNull(message = "入库时间不能为空", groups = { AddGroup.class, EditGroup.class })
private Date storageTime; private Date storageTime;
/** /**
@ -123,13 +123,13 @@ public class PayProductsBo extends BaseEntity {
/** /**
* 删除标志（1:删除 0:未删除） * 删除标志（1:删除 0:未删除）
*/ */
@NotNull(message = "删除标志（1:删除 0:未删除）不能为空", groups = { AddGroup.class, EditGroup.class }) //@NotNull(message = "删除标志（1:删除 0:未删除）不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer deleted; private Integer deleted;
/** /**
* 备注 * 备注
*/ */
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark; private String remark;

31
ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java
Unescape View File

@ -9,6 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.validation.constraints.*; import javax.validation.constraints.*;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -32,7 +33,7 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
/** /**
* 主键ID * 主键ID
*/ */
@NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) //@NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
private Long id; private Long id;
/** /**
@ -44,7 +45,7 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
/** /**
* 归档ID * 归档ID
*/ */
@NotBlank(message = "归档ID不能为空", groups = { AddGroup.class, EditGroup.class }) //@NotBlank(message = "归档ID不能为空", groups = { AddGroup.class, EditGroup.class })
private String archiveId; private String archiveId;
/** /**
@ -62,7 +63,7 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
/** /**
* 车间 * 车间
*/ */
@NotBlank(message = "车间不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "车间不能为空", groups = { AddGroup.class, EditGroup.class })
private String workshop; private String workshop;
/** /**
@ -74,7 +75,7 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
/** /**
* 工作内容 * 工作内容
*/ */
@NotBlank(message = "工作内容不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "工作内容不能为空", groups = { AddGroup.class, EditGroup.class })
private String content; private String content;
/** /**
@ -92,7 +93,7 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
/** /**
* 单位 * 单位
*/ */
@NotBlank(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class })
private String unit; private String unit;
/** /**
@ -116,13 +117,13 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
/** /**
* 质检人员 * 质检人员
*/ */
@NotBlank(message = "质检人员不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "质检人员不能为空", groups = { AddGroup.class, EditGroup.class })
private String qualityName; private String qualityName;
/** /**
* 检验说明 * 检验说明
*/ */
@NotBlank(message = "检验说明不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "检验说明不能为空", groups = { AddGroup.class, EditGroup.class })
private String qualityRemark; private String qualityRemark;
/** /**
@ -134,31 +135,31 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
/** /**
* 入库人员 * 入库人员
*/ */
@NotBlank(message = "入库人员不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "入库人员不能为空", groups = { AddGroup.class, EditGroup.class })
private String instorageName; private String instorageName;
/** /**
* 实际入库数量 * 实际入库数量
*/ */
@NotNull(message = "实际入库数量不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotNull(message = "实际入库数量不能为空", groups = { AddGroup.class, EditGroup.class })
private Long instorageNum; private Long instorageNum;
/** /**
* 项目经理 * 项目经理
*/ */
@NotBlank(message = "项目经理不能为空", groups = { AddGroup.class, EditGroup.class }) //@NotBlank(message = "项目经理不能为空", groups = { AddGroup.class, EditGroup.class })
private String managerName; private String managerName;
/** /**
* 删除标志（0-可用 1-删除） * 删除标志（0-可用 1-删除）
*/ */
@NotNull(message = "删除标志（0-可用 1-删除）不能为空", groups = { AddGroup.class, EditGroup.class }) //@NotNull(message = "删除标志（0-可用 1-删除）不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer deleted; private Integer deleted;
/** /**
* 备注 * 备注
*/ */
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark; private String remark;
// 产品列表 // 产品列表
@ -171,9 +172,15 @@ public class PayWorkOrderBaohuoBo extends BaseEntity {
// 工时列表 // 工时列表
private List<PayBaohuoWorktime> worktimeList; private List<PayBaohuoWorktime> worktimeList;
// 选择员工ID
private Long empId;
// 工作日期
private String workDate;
// 导出日期 // 导出日期
private Date exportDate; private Date exportDate;
private ArrayList<Long> woids; // 待查询的工单ID集合
} }

Write Preview
Loading…
Cancel
Save