From ff58e03f9309af23da735129ae076717edcbdf72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 8 Jun 2026 14:19:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(task):=20=E6=B7=BB=E5=8A=A0=E6=9D=A5?= =?UTF-8?q?=E6=96=99=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E5=BC=BA=E5=88=B6=E4=BD=BF=E7=94=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在ApiResult中添加时间格式化注解 - 新增mustUseQrCode字段到QmsIncomingInspectionTaskVO - 实现QmsIncomingInspectionTaskQrService的existsByTaskId方法 - 在任务详情中设置mustUseQrCode属性 --- .../service/IncomingInspectionTaskControllerService.java | 1 + .../src/main/java/com/nflg/wms/common/pojo/ApiResult.java | 8 ++++++++ .../wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java | 5 +++++ .../service/IQmsIncomingInspectionTaskQrService.java | 1 + .../impl/QmsIncomingInspectionTaskQrServiceImpl.java | 6 ++++++ 5 files changed, 21 insertions(+) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java index 44761c9e..d917b544 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java @@ -726,6 +726,7 @@ public class IncomingInspectionTaskControllerService { QmsIncomingInspectionTaskVO detail = incomingInspectionTaskService.getDetail(id); VUtil.trueThrowBusinessError(Objects.isNull(detail)).throwMessage("任务不存在"); detail.setInspectedQty(incomingInspectionTaskService.getInspectedQty(id)); + detail.setMustUseQrCode(incomingInspectionTaskQrService.existsByTaskId(id)); return detail; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/ApiResult.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/ApiResult.java index b36564cb..24e4c631 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/ApiResult.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/ApiResult.java @@ -2,6 +2,7 @@ package com.nflg.wms.common.pojo; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.fasterxml.jackson.annotation.JsonFormat; import com.nflg.wms.common.constant.Constant; import com.nflg.wms.common.constant.STATE; import lombok.Data; @@ -16,11 +17,18 @@ import java.util.stream.Collectors; public class ApiResult implements Serializable { private int code; + private String type; + private String message; + private Object extras; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime time = LocalDateTime.now(); + private String traceId = MDC.get(Constant.TRACE_ID); + private T result; public static ApiResult success(T value) { 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 74197046..b06935b4 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 @@ -230,4 +230,9 @@ public class QmsIncomingInspectionTaskVO { * 更新时间 */ private LocalDateTime updateTime; + + /** + * 是否强制使用二维码 + */ + private Boolean mustUseQrCode; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIncomingInspectionTaskQrService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIncomingInspectionTaskQrService.java index f481e5d9..555439ac 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIncomingInspectionTaskQrService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIncomingInspectionTaskQrService.java @@ -8,4 +8,5 @@ import com.nflg.wms.repository.entity.QmsIncomingInspectionTaskQr; */ public interface IQmsIncomingInspectionTaskQrService extends IService { + Boolean existsByTaskId(Long id); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIncomingInspectionTaskQrServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIncomingInspectionTaskQrServiceImpl.java index 1b0b56dd..eac39018 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIncomingInspectionTaskQrServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIncomingInspectionTaskQrServiceImpl.java @@ -12,4 +12,10 @@ import org.springframework.stereotype.Service; @Service public class QmsIncomingInspectionTaskQrServiceImpl extends ServiceImpl implements IQmsIncomingInspectionTaskQrService { + @Override + public Boolean existsByTaskId(Long id) { + return lambdaQuery() + .eq(QmsIncomingInspectionTaskQr::getTaskId, id) + .exists(); + } }