From 6f54e12048ef2e03b63c7c770641d0a78aabc874 Mon Sep 17 00:00:00 2001 From: yangzz <9704.yyds@163.com> Date: Tue, 26 May 2026 15:04:53 +0800 Subject: [PATCH] =?UTF-8?q?QC=E5=AD=90=E4=BB=B6=E4=BF=A1=E6=81=AF=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E4=B8=8E=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcsubpart/dao/impl/QcSubPartReportDaoImpl.java | 9 +++++---- .../report/qcsubpart/data/QcSubPartDetailData.java | 9 +++++++++ .../service/impl/QcSubPartReportServiceImpl.java | 3 +++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/report/qcsubpart/dao/impl/QcSubPartReportDaoImpl.java b/src/main/java/com/xujie/sys/modules/report/qcsubpart/dao/impl/QcSubPartReportDaoImpl.java index f3e8ac0d..16d621b4 100644 --- a/src/main/java/com/xujie/sys/modules/report/qcsubpart/dao/impl/QcSubPartReportDaoImpl.java +++ b/src/main/java/com/xujie/sys/modules/report/qcsubpart/dao/impl/QcSubPartReportDaoImpl.java @@ -80,7 +80,7 @@ public class QcSubPartReportDaoImpl implements QcSubPartReportDao { StringBuilder sql = new StringBuilder(); sql.append("SELECT id, site, header_id AS headerId, record_no AS recordNo, "); sql.append("sub_part_no AS partNo, sub_part_desc AS partDesc, supplier_id AS supplierId, "); - sql.append("supplier_name AS supplierName, model_no AS modelNo, manufacture_date AS manufactureDate, sort_no AS sortNo "); + sql.append("supplier_name AS supplierName, model_no AS modelNo, manufacture_date AS manufactureDate, remark AS remark, sort_no AS sortNo "); sql.append("FROM qc_subpart_record_detail "); sql.append("WHERE site = :site AND record_no = :recordNo AND del_flag = 'N' "); sql.append("ORDER BY sort_no ASC "); @@ -152,7 +152,7 @@ public class QcSubPartReportDaoImpl implements QcSubPartReportDao { StringBuilder sql = new StringBuilder(); sql.append("SELECT DISTINCT a.part_no AS partNo, d.part_desc AS partDesc, c.supplier_id AS supplierId, "); - sql.append("vs.supplierName AS supplierName, c.manufacture_date AS manufactureDate, c.model_no AS modelNo "); + sql.append("vs.supplierName AS supplierName, c.manufacture_date AS manufactureDate, c.model_no AS modelNo, '' AS remark "); sql.append("FROM sfdc_material_hist a WITH (NOLOCK) "); sql.append("LEFT JOIN c_roll_info c WITH (NOLOCK) ON a.site = c.site and a.rmroll_no = c.roll_no "); sql.append("LEFT JOIN view_Supplier vs WITH (NOLOCK) ON c.site = vs.site and c.supplier_id = vs.supplierid "); @@ -276,10 +276,10 @@ public class QcSubPartReportDaoImpl implements QcSubPartReportDao { StringBuilder sql = new StringBuilder(); sql.append("INSERT INTO qc_subpart_record_detail("); sql.append("site, header_id, record_no, sub_part_no, sub_part_desc, supplier_id, supplier_name, "); - sql.append("model_no, manufacture_date, sort_no, create_by, create_date, del_flag"); + sql.append("model_no, manufacture_date, remark, sort_no, create_by, create_date, del_flag"); sql.append(") VALUES ("); sql.append(":site, :headerId, :recordNo, :partNo, :partDesc, :supplierId, :supplierName, "); - sql.append(":modelNo, :manufactureDate, :sortNo, :username, GETDATE(), 'N'"); + sql.append(":modelNo, :manufactureDate, :remark, :sortNo, :username, GETDATE(), 'N'"); sql.append(")"); List batch = new ArrayList<>(); @@ -295,6 +295,7 @@ public class QcSubPartReportDaoImpl implements QcSubPartReportDao { params.addValue("supplierName", emptyToBlank(row.getSupplierName())); params.addValue("modelNo", emptyToBlank(row.getModelNo())); params.addValue("manufactureDate", emptyToBlank(row.getManufactureDate())); + params.addValue("remark", emptyToBlank(row.getRemark())); params.addValue("sortNo", idx++); params.addValue("username", username); batch.add(params); diff --git a/src/main/java/com/xujie/sys/modules/report/qcsubpart/data/QcSubPartDetailData.java b/src/main/java/com/xujie/sys/modules/report/qcsubpart/data/QcSubPartDetailData.java index e7150b31..284b1f49 100644 --- a/src/main/java/com/xujie/sys/modules/report/qcsubpart/data/QcSubPartDetailData.java +++ b/src/main/java/com/xujie/sys/modules/report/qcsubpart/data/QcSubPartDetailData.java @@ -7,6 +7,7 @@ public class QcSubPartDetailData { private String supplierName; private String modelNo; private String manufactureDate; + private String remark; private Integer sortNo; public String getPartNo() { @@ -57,6 +58,14 @@ public class QcSubPartDetailData { this.manufactureDate = manufactureDate; } + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + public Integer getSortNo() { return sortNo; } diff --git a/src/main/java/com/xujie/sys/modules/report/qcsubpart/service/impl/QcSubPartReportServiceImpl.java b/src/main/java/com/xujie/sys/modules/report/qcsubpart/service/impl/QcSubPartReportServiceImpl.java index 2cc70e9b..4a799a43 100644 --- a/src/main/java/com/xujie/sys/modules/report/qcsubpart/service/impl/QcSubPartReportServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/report/qcsubpart/service/impl/QcSubPartReportServiceImpl.java @@ -108,6 +108,9 @@ public class QcSubPartReportServiceImpl implements QcSubPartReportService { if (emptyToBlank(data.getMainData().getSeqNo()).isEmpty()) { throw new XJException("mainData.seqNo不能为空"); } + if (data.getDetailList() == null || data.getDetailList().isEmpty()) { + throw new XJException("明细不能为空，请至少保留一条明细数据"); + } if (requireRecordNo && emptyToBlank(data.getRecordNo()).isEmpty()) { throw new XJException("recordNo不能为空"); }