From d958afb7b90ec9fadd52cd64fbf59c6461b9369a Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Sun, 25 Jun 2023 15:21:28 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E3=80=81=E6=98=8E=E7=BB=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/dao/QlTestInspectionsheetdtl.java | 99 ++--------------- .../report/dao/QlTestInspectionsheetmst.java | 100 +++++++++++++++--- 2 files changed, 92 insertions(+), 107 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/QlTestInspectionsheetdtl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/QlTestInspectionsheetdtl.java index 79b692cd..74257cb4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/QlTestInspectionsheetdtl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/QlTestInspectionsheetdtl.java @@ -24,12 +24,12 @@ public class QlTestInspectionsheetdtl implements Serializable { /** * 质检单明细标识 */ - private String inspectiondtl_id; + private Long inspectiondtl_id; /** * 质检单标识 */ - private String inspection_id; + private Long inspection_id; /** * 明细序号 @@ -37,105 +37,20 @@ public class QlTestInspectionsheetdtl implements Serializable { private BigDecimal seq_no; /** - * 物料标识 + * 项点标识 */ - private Long material_id; + private Long inspection_item_id; /** - * 批次 + * 项点值 */ - private String pcsn; + private BigDecimal value; /** - * 明细状态 - */ - private String bill_status; - - /** - * 数量 - */ - private BigDecimal qty; - - /** - * 合格数量 - */ - private BigDecimal qty_ok; - - /** - * 不合格数量 - */ - private BigDecimal qty_no; - - /** - * 数量计量单位标识 - */ - private String qty_unit_id; - - /** - * 数量计量单位名称 - */ - private String qty_unit_name; - - /** - * 结果 + * 项点结果 */ private String result; - /** - * 等级 - */ - private String grade; - - /** - * 来源单据标识 - */ - private String source_bill_id; - - /** - * 来源单据类型 - */ - private String source_bill_type; - - /** - * 来源单据编号 - */ - private String source_bill_code; - - /** - * 来源单表 - */ - private String source_bill_table; - - /** - * 来源单表主键 - */ - private String source_bill_table_pk; - - /** - * 基础单据标识 - */ - private String base_bill_id; - - /** - * 基础单据类型 - */ - private String base_bill_type; - - /** - * 基础单编号 - */ - private String base_bill_code; - - /** - * 基础单表 - */ - private String base_bill_table; - - /** - * 基础单表主键 - */ - private String base_bill_table_pk; - /** * 备注 */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/QlTestInspectionsheetmst.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/QlTestInspectionsheetmst.java index 3e59f59a..24fb4f16 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/QlTestInspectionsheetmst.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/dao/QlTestInspectionsheetmst.java @@ -25,7 +25,7 @@ public class QlTestInspectionsheetmst implements Serializable { /** * 质检单标识 */ - private String inspection_id; + private Long inspection_id; /** * 质检单编号 @@ -40,23 +40,93 @@ public class QlTestInspectionsheetmst implements Serializable { /** * 业务日期 */ - private Date biz_date; + private String biz_date; /** - * 总数量 + * 物料标识 */ - private BigDecimal total_qty; + private Long material_id; + + /** + * 批次 + */ + private String pcsn; + + /** + * 数量 + */ + private BigDecimal qty; /** * 数量计量单位标识 */ - private String qty_unit_id; + private Long qty_unit_id; /** * 数量计量单位名称 */ private String qty_unit_name; + /** + * 结果 + */ + private String result; + + /** + * 等级 + */ + private String grade; + + /** + * 来源单据标识 + */ + private Long source_bill_id; + + /** + * 来源单据类型 + */ + private String source_bill_type; + + /** + * 来源单据编号 + */ + private String source_bill_code; + + /** + * 来源单表 + */ + private String source_bill_table; + + /** + * 来源单表主键 + */ + private String source_bill_table_pk; + + /** + * 基础单据标识 + */ + private Long base_bill_id; + + /** + * 基础单据类型 + */ + private String base_bill_type; + + /** + * 基础单编号 + */ + private String base_bill_code; + + /** + * 基础单表 + */ + private String base_bill_table; + + /** + * 基础单表主键 + */ + private String base_bill_table_pk; + /** * 单据状态 */ @@ -70,7 +140,7 @@ public class QlTestInspectionsheetmst implements Serializable { /** * 创建人 */ - private String create_id; + private Long create_id; /** * 创建人姓名 @@ -85,7 +155,7 @@ public class QlTestInspectionsheetmst implements Serializable { /** * 修改人 */ - private String update_optid; + private Long update_optid; /** * 修改人姓名 @@ -95,37 +165,37 @@ public class QlTestInspectionsheetmst implements Serializable { /** * 修改时间 */ - private Date update_time; + private String update_time; /** * 确认人 */ - private String confirm_id; + private Long confirm_optid; /** * 确认人姓名 */ - private String confirm_name; + private String confirm_optname; /** * 确认时间 */ - private Date confirm_time; + private String confirm_time; /** * 部门ID */ - private String sysdeptid; + private Long sysdeptid; /** * 公司ID */ - private String syscompanyid; + private Long syscompanyid; /** * 是否删除 */ - private Boolean is_delete; + private String is_delete; /** * 备注 @@ -135,7 +205,7 @@ public class QlTestInspectionsheetmst implements Serializable { /** * 车间标识 */ - private String product_area; + private Long workshop_id; }