feat(task): 添加来料检验任务二维码强制使用功能
- 在ApiResult中添加时间格式化注解 - 新增mustUseQrCode字段到QmsIncomingInspectionTaskVO - 实现QmsIncomingInspectionTaskQrService的existsByTaskId方法 - 在任务详情中设置mustUseQrCode属性
This commit is contained in:
parent
b2bc1130cd
commit
ff58e03f93
|
|
@ -726,6 +726,7 @@ public class IncomingInspectionTaskControllerService {
|
||||||
QmsIncomingInspectionTaskVO detail = incomingInspectionTaskService.getDetail(id);
|
QmsIncomingInspectionTaskVO detail = incomingInspectionTaskService.getDetail(id);
|
||||||
VUtil.trueThrowBusinessError(Objects.isNull(detail)).throwMessage("任务不存在");
|
VUtil.trueThrowBusinessError(Objects.isNull(detail)).throwMessage("任务不存在");
|
||||||
detail.setInspectedQty(incomingInspectionTaskService.getInspectedQty(id));
|
detail.setInspectedQty(incomingInspectionTaskService.getInspectedQty(id));
|
||||||
|
detail.setMustUseQrCode(incomingInspectionTaskQrService.existsByTaskId(id));
|
||||||
return detail;
|
return detail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package com.nflg.wms.common.pojo;
|
||||||
|
|
||||||
import cn.hutool.json.JSONUtil;
|
import cn.hutool.json.JSONUtil;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
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.Constant;
|
||||||
import com.nflg.wms.common.constant.STATE;
|
import com.nflg.wms.common.constant.STATE;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
@ -16,11 +17,18 @@ import java.util.stream.Collectors;
|
||||||
public class ApiResult<T> implements Serializable {
|
public class ApiResult<T> implements Serializable {
|
||||||
|
|
||||||
private int code;
|
private int code;
|
||||||
|
|
||||||
private String type;
|
private String type;
|
||||||
|
|
||||||
private String message;
|
private String message;
|
||||||
|
|
||||||
private Object extras;
|
private Object extras;
|
||||||
|
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
private LocalDateTime time = LocalDateTime.now();
|
private LocalDateTime time = LocalDateTime.now();
|
||||||
|
|
||||||
private String traceId = MDC.get(Constant.TRACE_ID);
|
private String traceId = MDC.get(Constant.TRACE_ID);
|
||||||
|
|
||||||
private T result;
|
private T result;
|
||||||
|
|
||||||
public static <T> ApiResult<T> success(T value) {
|
public static <T> ApiResult<T> success(T value) {
|
||||||
|
|
|
||||||
|
|
@ -230,4 +230,9 @@ public class QmsIncomingInspectionTaskVO {
|
||||||
* 更新时间
|
* 更新时间
|
||||||
*/
|
*/
|
||||||
private LocalDateTime updateTime;
|
private LocalDateTime updateTime;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否强制使用二维码
|
||||||
|
*/
|
||||||
|
private Boolean mustUseQrCode;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,4 +8,5 @@ import com.nflg.wms.repository.entity.QmsIncomingInspectionTaskQr;
|
||||||
*/
|
*/
|
||||||
public interface IQmsIncomingInspectionTaskQrService extends IService<QmsIncomingInspectionTaskQr> {
|
public interface IQmsIncomingInspectionTaskQrService extends IService<QmsIncomingInspectionTaskQr> {
|
||||||
|
|
||||||
|
Boolean existsByTaskId(Long id);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,4 +12,10 @@ import org.springframework.stereotype.Service;
|
||||||
@Service
|
@Service
|
||||||
public class QmsIncomingInspectionTaskQrServiceImpl extends ServiceImpl<QmsIncomingInspectionTaskQrMapper, QmsIncomingInspectionTaskQr> implements IQmsIncomingInspectionTaskQrService {
|
public class QmsIncomingInspectionTaskQrServiceImpl extends ServiceImpl<QmsIncomingInspectionTaskQrMapper, QmsIncomingInspectionTaskQr> implements IQmsIncomingInspectionTaskQrService {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Boolean existsByTaskId(Long id) {
|
||||||
|
return lambdaQuery()
|
||||||
|
.eq(QmsIncomingInspectionTaskQr::getTaskId, id)
|
||||||
|
.exists();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue