From 0535d0c9a3c0476818372fec1cd60ec3b8b8270f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 9 May 2026 10:48:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(repository):=20=E4=BF=AE=E6=AD=A3QmsIncomin?= =?UTF-8?q?gInspectionTaskNonconformance=E6=9F=A5=E8=AF=A2=E5=88=AB?= =?UTF-8?q?=E5=90=8D=E5=92=8CVO=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修正QmsIncomingInspectionTaskNonconformanceMapper.xml中inspection_standard别名由is改为qis - 更新SQL查询连接条件中的别名一致性 - 修改QmsInspectionStandardVO中publishStatus注释，添加已废弃状态说明 (2=已废弃) --- .../com/nflg/wms/common/pojo/vo/QmsInspectionStandardVO.java | 2 +- .../mapper/QmsIncomingInspectionTaskNonconformanceMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardVO.java index bceee965..3a05584b 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardVO.java @@ -86,7 +86,7 @@ public class QmsInspectionStandardVO { private Boolean isEnabled; /** - * 发布状态：0-未发布，1-已发布 + * 发布状态：0-未发布，1-已发布，2=已废弃 */ private Short publishStatus; diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskNonconformanceMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskNonconformanceMapper.xml index 8829781b..43097323 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskNonconformanceMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskNonconformanceMapper.xml @@ -13,7 +13,7 @@ m.material_no, m.material_desc, m.drawing_no_ver, - is.version, + qis.version, t.supplier_code, t.supplier_name, t.delivery_order_no, @@ -39,7 +39,7 @@ FROM qms_incoming_inspection_task t LEFT JOIN qms_issue_ticket it ON it.source_id = t.id INNER JOIN qms_qc_material m ON t.material_id = m.id - LEFT JOIN qms_inspection_standard is ON t.inspection_standard_id = is.id + LEFT JOIN qms_inspection_standard qis ON t.inspection_standard_id = qis.id WHERE t.inspection_status=2 and t.inspection_result=false AND ((t.inspection_type=0 and t.purchase_group=#{request.purchaseGroup}) or (t.inspection_type=1 and #{request.isWarehouseManager}=true))