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(); + } }