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))