From e425b82627d2d321df1bf42f7b0fa0f7a71bc532 Mon Sep 17 00:00:00 2001 From: hshansha Date: Wed, 28 May 2025 08:29:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E3=80=81=E6=AF=9B=E6=96=99?= =?UTF-8?q?=E3=80=81=E5=8C=85=E6=B4=BB=E9=9D=9E=E7=A9=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/pay/domain/bo/PayMaterialBo.java | 10 +++--- .../ruoyi/pay/domain/bo/PayProductsBo.java | 24 +++++++------- .../pay/domain/bo/PayWorkOrderBaohuoBo.java | 31 ++++++++++++------- 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayMaterialBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayMaterialBo.java index 6414d61..f295acc 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayMaterialBo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayMaterialBo.java @@ -24,7 +24,7 @@ public class PayMaterialBo extends BaseEntity { /** * 主键ID */ - @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + //@NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) 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; /** * 尺寸 */ - @NotBlank(message = "尺寸不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "尺寸不能为空", groups = { AddGroup.class, EditGroup.class }) private String size; /** * 单位 */ - @NotBlank(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class }) private String unit; /** * 备注 */ - @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) private String remark; diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayProductsBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayProductsBo.java index 099a8e9..bdd96e0 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayProductsBo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayProductsBo.java @@ -27,7 +27,7 @@ public class PayProductsBo extends BaseEntity { /** * 主键 */ - @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + //@NotNull(message = "主键不能为空", groups = { EditGroup.class }) 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; /** * 图纸编号 */ - @NotBlank(message = "图纸编号不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "图纸编号不能为空", groups = { AddGroup.class, EditGroup.class }) private String drawingNum; /** * 工序 */ - @NotBlank(message = "工序不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "工序不能为空", groups = { AddGroup.class, EditGroup.class }) private String process; /** * 规格型号 */ - @NotBlank(message = "规格型号不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "规格型号不能为空", groups = { AddGroup.class, EditGroup.class }) private String model; /** * 产品单位 */ - @NotBlank(message = "产品单位不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "产品单位不能为空", groups = { AddGroup.class, EditGroup.class }) 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; /** * 毛料尺寸 */ - @NotBlank(message = "毛料尺寸不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotBlank(message = "毛料尺寸不能为空", groups = { AddGroup.class, EditGroup.class }) private String originSize; /** * 毛料单位 */ - @NotBlank(message = "毛料单位不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "毛料单位不能为空", groups = { AddGroup.class, EditGroup.class }) private String originDanwei; /** * 入库时间 */ - @NotNull(message = "入库时间不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "入库时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date storageTime; /** @@ -123,13 +123,13 @@ public class PayProductsBo extends BaseEntity { /** * 删除标志（1:删除 0:未删除） */ - @NotNull(message = "删除标志（1:删除 0:未删除）不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotNull(message = "删除标志（1:删除 0:未删除）不能为空", groups = { AddGroup.class, EditGroup.class }) private Integer deleted; /** * 备注 */ - @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) private String remark; diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java index 6141bdc..0ef77ab 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayWorkOrderBaohuoBo.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.*; +import java.util.ArrayList; import java.util.Date; import java.math.BigDecimal; @@ -32,7 +33,7 @@ public class PayWorkOrderBaohuoBo extends BaseEntity { /** * 主键ID */ - @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + //@NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) private Long id; /** @@ -44,7 +45,7 @@ public class PayWorkOrderBaohuoBo extends BaseEntity { /** * 归档ID */ - @NotBlank(message = "归档ID不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotBlank(message = "归档ID不能为空", groups = { AddGroup.class, EditGroup.class }) 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; /** @@ -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; /** @@ -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; /** @@ -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; /** * 检验说明 */ - @NotBlank(message = "检验说明不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "检验说明不能为空", groups = { AddGroup.class, EditGroup.class }) 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; /** * 实际入库数量 */ - @NotNull(message = "实际入库数量不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "实际入库数量不能为空", groups = { AddGroup.class, EditGroup.class }) private Long instorageNum; /** * 项目经理 */ - @NotBlank(message = "项目经理不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotBlank(message = "项目经理不能为空", groups = { AddGroup.class, EditGroup.class }) private String managerName; /** * 删除标志（0-可用 1-删除） */ - @NotNull(message = "删除标志（0-可用 1-删除）不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotNull(message = "删除标志（0-可用 1-删除）不能为空", groups = { AddGroup.class, EditGroup.class }) private Integer deleted; /** * 备注 */ - @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) private String remark; // 产品列表 @@ -171,9 +172,15 @@ public class PayWorkOrderBaohuoBo extends BaseEntity { // 工时列表 private List worktimeList; + // 选择员工ID + private Long empId; + // 工作日期 + private String workDate; // 导出日期 private Date exportDate; + private ArrayList woids; // 待查询的工单ID集合 + }