From c4666d22de03262599ec229581cb6b18f9d8d9d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 14 May 2026 10:57:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(qms):=20=E4=BF=AE=E6=94=B9=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E7=8A=B6=E6=80=81=E8=AF=B4=E6=98=8E=E5=B9=B6=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E9=BB=98=E8=AE=A4=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新QmsIncomingInspectionTaskMapper中默认检验状态过滤条件，移除0和1的默认范围限制 - 统一调整QmsIncomingInspectionTaskTodoSearchQO中检验状态的注释说明，明确状态含义为0=待检，1=检验中，2=已检 - 修正QmsIncomingInspectionTaskVO中检验状态注释，补充状态2=已检的说明 --- .../common/pojo/qo/QmsIncomingInspectionTaskTodoSearchQO.java | 3 +-- .../nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java | 2 +- .../main/resources/mapper/QmsIncomingInspectionTaskMapper.xml | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoSearchQO.java index 23f90edc..18742cfb 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoSearchQO.java @@ -16,8 +16,7 @@ public class QmsIncomingInspectionTaskTodoSearchQO extends PageQO { private String key; /** - * 检验状态，不传则默认查 0 和 1 - * 0=待检，1=检验中，2=已检 + * 检验状态：0=待检，1=检验中，2=已检 */ private Short inspectionStatus; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java index 603d2e75..74197046 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java @@ -147,7 +147,7 @@ public class QmsIncomingInspectionTaskVO { } /** - * 检验状态：0=待检，1=已检 + * 检验状态：0=待检，1=检验中，2=已检 */ private Short inspectionStatus; diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml index 0ce5d5d1..2bfe3b2e 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml @@ -155,9 +155,6 @@ t.inspection_status = #{request.inspectionStatus} - - t.inspection_status IN (0, 1) - AND (t.inspector_id = #{inspectorId} OR t.agent_id = #{inspectorId})