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

Merge remote-tracking branch '惠信/qms/develop' into qms/develop

This commit is contained in:
曹鹏飞 2026-05-14 11:28:05 +08:00
parent db1b7b3249 81bb321ce7
commit 4e32725dc7
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
View File

@ -300,9 +300,9 @@ public class QmsIssueTicketControllerService {
throw new NflgException(STATE.BusinessError, "PDI检测任务记录不存在"); throw new NflgException(STATE.BusinessError, "PDI检测任务记录不存在");
} }
// 2. 校验任务状态必须为3（待流转） // 2. 校验任务状态必须为3（待流转）或4（逾期）
if (!Objects.equals(taskRecord.getInspectionEnable(), 3)) { if (!Objects.equals(taskRecord.getInspectionEnable(), 3) && !Objects.equals(taskRecord.getInspectionEnable(), 4)) {
throw new NflgException(STATE.BusinessError, "只有待流转状态的任务才能创建工单，当前状态：" + taskRecord.getInspectionEnable()); throw new NflgException(STATE.BusinessError, "只有待流转或逾期状态的任务才能创建工单，当前状态：" + taskRecord.getInspectionEnable());
} }
// 3. 校验是否已存在工单 // 3. 校验是否已存在工单
@ -923,9 +923,9 @@ public class QmsIssueTicketControllerService {
throw new NflgException(STATE.BusinessError, "PDI检测任务记录不存在"); throw new NflgException(STATE.BusinessError, "PDI检测任务记录不存在");
} }
// 校验任务状态必须为3（待流转） // 校验任务状态必须为3（待流转）或4（逾期）
if (!Objects.equals(taskRecord.getInspectionEnable(), 3)) { if (!Objects.equals(taskRecord.getInspectionEnable(), 3) && !Objects.equals(taskRecord.getInspectionEnable(), 4)) {
throw new NflgException(STATE.BusinessError, "只有待流转状态的任务才能创建工单，当前状态：" + taskRecord.getInspectionEnable()); throw new NflgException(STATE.BusinessError, "只有待流转或逾期状态的任务才能创建工单，当前状态：" + taskRecord.getInspectionEnable());
} }
// 校验是否已存在工单（同一taskRecordId只能创建一次工单） // 校验是否已存在工单（同一taskRecordId只能创建一次工单）

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPdiInspectionResultsSearchQO.java
View File

@ -14,7 +14,7 @@ public class QmsPdiInspectionResultsSearchQO {
private String key; private String key;
/** /**
* 任务状态（可选）：0=待流转，1=质检中，2=已完成，3=待流转（逾期） * 任务状态（可选）：0=待流转，1=质检中，2=已完成，3=待流转，4=逾期（根据overdue字段动态判断）
*/ */
private Integer inspectionEnable; private Integer inspectionEnable;

5
nflg-wms-repository/src/main/resources/mapper/QmsPdiInspectionResultsMapper.xml
View File

@ -32,9 +32,12 @@
) )
</if> </if>
<!-- 任务状态筛选 --> <!-- 任务状态筛选 -->
<if test="request.inspectionEnable != null"> <if test="request.inspectionEnable != null and request.inspectionEnable != 4">
AND t.inspection_enable = #{request.inspectionEnable} AND t.inspection_enable = #{request.inspectionEnable}
</if> </if>
<if test="request.inspectionEnable != null and request.inspectionEnable == 4">
AND t.overdue = true
</if>
</where> </where>
ORDER BY t.id DESC ORDER BY t.id DESC
</select> </select>