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

Merge remote-tracking branch 'origin/qms/develop' into qms/develop

This commit is contained in:
funny 2026-05-14 11:23:20 +08:00
parent 4dabc327aa 8fc926f7ff
commit 81bb321ce7
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoSearchQO.java
View File

@ -16,8 +16,7 @@ public class QmsIncomingInspectionTaskTodoSearchQO extends PageQO {
private String key; private String key;
/** /**
* 检验状态，不传则默认查 0 和 1 * 检验状态：0=待检，1=检验中，2=已检
* 0=待检，1=检验中，2=已检
*/ */
private Short inspectionStatus; private Short inspectionStatus;

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

@ -147,7 +147,7 @@ public class QmsIncomingInspectionTaskVO {
} }
/** /**
* 检验状态：0=待检，1=已检 * 检验状态：0=待检，1=检验中，2=已检
*/ */
private Short inspectionStatus; private Short inspectionStatus;

3
nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml
View File

@ -155,9 +155,6 @@
<when test="request.inspectionStatus != null"> <when test="request.inspectionStatus != null">
t.inspection_status = #{request.inspectionStatus} t.inspection_status = #{request.inspectionStatus}
</when> </when>
<otherwise>
t.inspection_status IN (0, 1)
</otherwise>
</choose> </choose>
AND (t.inspector_id = #{inspectorId} OR t.agent_id = #{inspectorId}) AND (t.inspector_id = #{inspectorId} OR t.agent_id = #{inspectorId})
<if test="request.key != null and request.key != ''"> <if test="request.key != null and request.key != ''">