rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(repository): 修正QmsIncomingInspectionTaskNonconformance查询别名和VO注释 

- 修正QmsIncomingInspectionTaskNonconformanceMapper.xml中inspection_standard别名由is改为qis
- 更新SQL查询连接条件中的别名一致性
- 修改QmsInspectionStandardVO中publishStatus注释，添加已废弃状态说明 (2=已废弃)
This commit is contained in:
曹鹏飞 2026-05-09 10:48:14 +08:00
parent a8e6c1570a
commit 0535d0c9a3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionStandardVO.java
View File

@ -86,7 +86,7 @@ public class QmsInspectionStandardVO {
private Boolean isEnabled; private Boolean isEnabled;
/** /**
* 发布状态：0-未发布，1-已发布 * 发布状态：0-未发布，1-已发布，2=已废弃
*/ */
private Short publishStatus; private Short publishStatus;

4
nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskNonconformanceMapper.xml
View File

@ -13,7 +13,7 @@
m.material_no, m.material_no,
m.material_desc, m.material_desc,
m.drawing_no_ver, m.drawing_no_ver,
is.version, qis.version,
t.supplier_code, t.supplier_code,
t.supplier_name, t.supplier_name,
t.delivery_order_no, t.delivery_order_no,
@ -39,7 +39,7 @@
FROM qms_incoming_inspection_task t FROM qms_incoming_inspection_task t
LEFT JOIN qms_issue_ticket it ON it.source_id = t.id LEFT JOIN qms_issue_ticket it ON it.source_id = t.id
INNER JOIN qms_qc_material m ON t.material_id = m.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 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)) AND ((t.inspection_type=0 and t.purchase_group=#{request.purchaseGroup}) or (t.inspection_type=1 and #{request.isWarehouseManager}=true))
<if test="request.dataType != null"> <if test="request.dataType != null">