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 9742167d..f0d50a67 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 @@ -209,7 +209,7 @@ public class IncomingInspectionTaskControllerService { .setRequiredFinishTime(Objects.nonNull(standard) ? now.plusDays(standard.getInspectionCycle()) : null) .setIsOverdue(false) .setRequestNo(request.getRequestNo()) - .setBatchNo(request.getBatchNo()); + .setReturnType(request.getReturnType()); returnInspectionTaskService.save(task); Long sourceTypeId = dictionaryItemService.getIdByCode("MessageType", "ReturnInspectionTask"); diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsReturnInspectionTaskControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsReturnInspectionTaskControllerService.java index 33c5e959..6d55958b 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsReturnInspectionTaskControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsReturnInspectionTaskControllerService.java @@ -218,6 +218,7 @@ public class QmsReturnInspectionTaskControllerService { vo.setId(record.getId()); vo.setTaskId(record.getTaskId()); vo.setMaterialUniqueNo(record.getMaterialUniqueNo()); + vo.setBatchNo(record.getBatchNo()); vo.setQualified(record.getQualified()); vo.setCreateUserId(record.getCreateUserId()); vo.setCreateUserName(record.getCreateUserName()); @@ -518,6 +519,7 @@ public class QmsReturnInspectionTaskControllerService { QmsReturnInspectionTaskRecord record = new QmsReturnInspectionTaskRecord() .setTaskId(task.getId()) .setMaterialUniqueNo(StrUtil.isBlank(request.getMaterialUniqueNo()) ? null : request.getMaterialUniqueNo()) + .setBatchNo(StrUtil.isBlank(request.getBatchNo()) ? null : request.getBatchNo()) .setQualified(request.getQualified()) .setCreateUserId(UserUtil.getUserId()) .setCreateUserName(UserUtil.getUserName()) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalReturnInspectionApplyQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalReturnInspectionApplyQO.java index dbd4a7a2..b69c1d98 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalReturnInspectionApplyQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalReturnInspectionApplyQO.java @@ -6,40 +6,20 @@ import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.experimental.Accessors; -/** - * 对外接口-退料检测申请QO - */ @Data @Accessors(chain = true) public class ExternalReturnInspectionApplyQO { - /** - * 请求单号，第三方唯一编号 - */ @NotBlank(message = "请求单号不能为空") private String requestNo; - /** - * 物料编号 - */ @NotBlank(message = "物料编号不能为空") private String materialNo; - /** - * 物料类别id - */ - @NotNull(message = "物料类别不能为空") - private Long materialCategoryId; - - /** - * 送检数量 - */ - @NotNull(message = "送检数量不能为空") - @Min(value = 1, message = "送检数量必须大于0") + @NotNull(message = "检验数量不能为空") + @Min(value = 1, message = "检验数量必须大于0") private Integer inspectionQty; - /** - * 批次号 - */ - private String batchNo; + @NotNull(message = "退料来源不能为空") + private Short returnType; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewAddQO.java index 83ff728d..94c85e1c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewAddQO.java @@ -6,37 +6,17 @@ import lombok.Data; import java.util.List; -/** - * 新增COA审核参数 - */ @Data public class QmsCoaReviewAddQO { - /** - * 物料编码（必传，用于匹配任务） - */ @NotBlank(message = "物料编码不能为空") private String materialNo; - /** - * 采购单号（必传） - */ @NotBlank(message = "采购单号不能为空") private String purchaseNo; - /** - * 批次号 - */ private String batchNo; - /** - * COA报告文件ID列表（必传） - */ @NotEmpty(message = "COA报告不能为空") private List coaFileIds; - - /** - * 图片列表（可选） - */ - private List images; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewUpdateQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewUpdateQO.java index 7a992c9b..bec25214 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewUpdateQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaReviewUpdateQO.java @@ -7,44 +7,20 @@ import lombok.Data; import java.util.List; -/** - * 修改COA审核参数 - * 状态0时都可以改，状态3时只能改COA报告 - */ @Data public class QmsCoaReviewUpdateQO { - /** - * 记录ID（必传） - */ @NotNull(message = "ID不能为空") private Long id; - /** - * 物料编码 - */ @NotBlank(message = "物料编码不能为空") private String materialNo; - /** - * 采购单号 - */ @NotBlank(message = "采购单号不能为空") private String purchaseNo; - /** - * 批次号 - */ private String batchNo; - /** - * COA报告文件ID列表 - */ @NotEmpty(message = "COA报告不能为空") private List coaFileIds; - - /** - * 图片列表（可选） - */ - private List images; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsReturnInspectionTaskResultQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsReturnInspectionTaskResultQO.java index f452c056..d11f0146 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsReturnInspectionTaskResultQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsReturnInspectionTaskResultQO.java @@ -22,6 +22,8 @@ public class QmsReturnInspectionTaskResultQO { */ private String materialUniqueNo; + private String batchNo; + /** * 检测开始时间 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsReturnInspectionTaskSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsReturnInspectionTaskSearchQO.java index f963073a..e9c2c461 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsReturnInspectionTaskSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsReturnInspectionTaskSearchQO.java @@ -30,7 +30,7 @@ public class QmsReturnInspectionTaskSearchQO extends PageQO { /** * 批次号 */ - private String batchNo; + private Short returnType; /** * 检验人姓名 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsReturnInspectionTaskRecordVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsReturnInspectionTaskRecordVO.java index caa8279f..4012aa92 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsReturnInspectionTaskRecordVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsReturnInspectionTaskRecordVO.java @@ -25,6 +25,8 @@ public class QmsReturnInspectionTaskRecordVO { */ private String materialUniqueNo; + private String batchNo; + /** * 是否合格 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsReturnInspectionTaskVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsReturnInspectionTaskVO.java index c53dc07f..f47dd481 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsReturnInspectionTaskVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsReturnInspectionTaskVO.java @@ -69,7 +69,7 @@ public class QmsReturnInspectionTaskVO { private Boolean callbackResult; - private String batchNo; + private Short returnType; private Long updateUserId; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsReturnInspectionTask.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsReturnInspectionTask.java index 47b18aa0..7126dbc0 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsReturnInspectionTask.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsReturnInspectionTask.java @@ -11,9 +11,6 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.time.LocalDateTime; -/** - * 退料检测任务 - */ @Getter @Setter @ToString @@ -25,119 +22,27 @@ public class QmsReturnInspectionTask implements Serializable { @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; - - /** - * 检测单号 - */ private String taskNo; - - /** - * 检测标准id - */ private Long inspectionStandardId; - - /** - * 检测方式，关联字典项id - */ private Long testingMethodDictItemId; - - /** - * 物料id - */ private Long materialId; - - /** - * 物料类别id - */ private Long materialCategoryId; - - /** - * 送检数量 - */ private Integer inspectionQty; - - /** - * 合格数量 - */ private Integer qualifiedQty; - - /** - * 不合格数量 - */ private Integer unqualifiedQty; - - /** - * 检验状态：0=待检，1=检验中，2=已检 - */ private Short inspectionStatus; - - /** - * 检验人id - */ private Long inspectorId; - - /** - * 代办人id - */ private Long agentId; - - /** - * 送检时间 - */ private LocalDateTime submitTime; - - /** - * 检验开始时间 - */ private LocalDateTime inspectionStartTime; - - /** - * 检验完成时间 - */ private LocalDateTime inspectionFinishTime; - - /** - * 要求完成时间 - */ private LocalDateTime requiredFinishTime; - - /** - * 是否超期 - */ private Boolean isOverdue; - - /** - * 最近更新人id - */ private Long updateUserId; - - /** - * 最近更新人姓名 - */ private String updateUserName; - - /** - * 更新时间 - */ private LocalDateTime updateTime; - - /** - * 回调结果 - */ private Boolean callbackResult; - - /** - * 请求单号，第三方唯一编号 - */ private String requestNo; - - /** - * 批次号 - */ - private String batchNo; - - /** - * 转办人id - */ + private Short returnType; private Long assigneeId; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsReturnInspectionTaskRecord.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsReturnInspectionTaskRecord.java index 5bdf9b0f..6b0a992a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsReturnInspectionTaskRecord.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsReturnInspectionTaskRecord.java @@ -11,9 +11,6 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.time.LocalDateTime; -/** - * 退料检测记录 - */ @Getter @Setter @ToString @@ -25,49 +22,14 @@ public class QmsReturnInspectionTaskRecord implements Serializable { @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; - - /** - * 退料检测任务id - */ private Long taskId; - - /** - * 物料唯一码 - */ private String materialUniqueNo; - - /** - * 是否合格 - */ + private String batchNo; private Boolean qualified; - - /** - * 创建人ID - */ private Long createUserId; - - /** - * 创建人姓名 - */ private String createUserName; - - /** - * 创建时间 - */ private LocalDateTime createTime; - - /** - * 更新人ID - */ private Long updateUserId; - - /** - * 更新人姓名 - */ private String updateUserName; - - /** - * 更新时间 - */ private LocalDateTime updateTime; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsReturnInspectionTaskRecordDetails.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsReturnInspectionTaskRecordDetails.java deleted file mode 100644 index 99a4ca51..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsReturnInspectionTaskRecordDetails.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.nflg.wms.repository.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * 退料检测记录详情 - */ -@Getter -@Setter -@ToString -@Accessors(chain = true) -@TableName("qms_return_inspection_task_record_details") -public class QmsReturnInspectionTaskRecordDetails implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "id", type = IdType.ASSIGN_ID) - private Long id; - - /** - * 退料检测任务记录id - */ - private Long recordId; - - /** - * 检验标准项内容ID - */ - private Long inspectionStandardItemContentId; - - /** - * 备注 - */ - private String remark; - - /** - * 测量值 - */ - private BigDecimal measuredValue; - - /** - * 是否合格 - */ - private Boolean qualified; - - /** - * 图片id列表，多个逗号分隔 - */ - private String imageIds; -} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsReturnInspectionTaskMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsReturnInspectionTaskMapper.java deleted file mode 100644 index 7dba0282..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsReturnInspectionTaskMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.nflg.wms.repository.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nflg.wms.common.pojo.qo.QmsReturnInspectionTaskSearchQO; -import com.nflg.wms.common.pojo.qo.QmsReturnInspectionTaskTodoSearchQO; -import com.nflg.wms.common.pojo.vo.QmsReturnInspectionTaskVO; -import com.nflg.wms.repository.entity.QmsReturnInspectionTask; -import org.apache.ibatis.annotations.Param; - -/** - * 退料检测任务 Mapper - */ -public interface QmsReturnInspectionTaskMapper extends BaseMapper { - - IPage search(@Param("request") QmsReturnInspectionTaskSearchQO request, - Page page); - - IPage todoSearch(@Param("request") QmsReturnInspectionTaskTodoSearchQO request, - Page page, - @Param("inspectorId") Long inspectorId, - @Param("userId") Long userId); -} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsReturnInspectionTaskRecordDetailsMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsReturnInspectionTaskRecordDetailsMapper.java deleted file mode 100644 index e9a31315..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsReturnInspectionTaskRecordDetailsMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.nflg.wms.repository.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nflg.wms.repository.entity.QmsReturnInspectionTaskRecordDetails; - -/** - * 退料检测记录详情 Mapper - */ -public interface QmsReturnInspectionTaskRecordDetailsMapper extends BaseMapper { -} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsReturnInspectionTaskRecordMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsReturnInspectionTaskRecordMapper.java deleted file mode 100644 index 36a40074..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsReturnInspectionTaskRecordMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.nflg.wms.repository.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nflg.wms.repository.entity.QmsReturnInspectionTaskRecord; - -/** - * 退料检测记录 Mapper - */ -public interface QmsReturnInspectionTaskRecordMapper extends BaseMapper { -} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsReturnInspectionTaskRecordDetailsService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsReturnInspectionTaskRecordDetailsService.java deleted file mode 100644 index 915f6eb6..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsReturnInspectionTaskRecordDetailsService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.nflg.wms.repository.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nflg.wms.repository.entity.QmsReturnInspectionTaskRecordDetails; - -/** - * 退料检测记录详情 服务类 - */ -public interface IQmsReturnInspectionTaskRecordDetailsService extends IService { -} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsReturnInspectionTaskRecordService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsReturnInspectionTaskRecordService.java deleted file mode 100644 index fdcacd6a..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsReturnInspectionTaskRecordService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.nflg.wms.repository.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nflg.wms.repository.entity.QmsReturnInspectionTaskRecord; - -/** - * 退料检测记录 服务类 - */ -public interface IQmsReturnInspectionTaskRecordService extends IService { -} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsReturnInspectionTaskService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsReturnInspectionTaskService.java deleted file mode 100644 index 95ee383d..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsReturnInspectionTaskService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.nflg.wms.repository.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.nflg.wms.common.pojo.qo.QmsReturnInspectionTaskSearchQO; -import com.nflg.wms.common.pojo.qo.QmsReturnInspectionTaskTodoSearchQO; -import com.nflg.wms.common.pojo.vo.QmsReturnInspectionTaskVO; -import com.nflg.wms.repository.entity.QmsReturnInspectionTask; - -/** - * 退料检测任务 服务类 - */ -public interface IQmsReturnInspectionTaskService extends IService { - - IPage search(QmsReturnInspectionTaskSearchQO request); - - IPage todoSearch(QmsReturnInspectionTaskTodoSearchQO request, Long inspectorId, Long userId); -} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java index 468ecc14..3c213aaf 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java @@ -1,6 +1,5 @@ package com.nflg.wms.repository.service.impl; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -133,7 +132,7 @@ public class QmsCoaReviewServiceImpl extends ServiceImpl implements IQmsReturnInspectionTaskRecordDetailsService { -} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsReturnInspectionTaskRecordServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsReturnInspectionTaskRecordServiceImpl.java deleted file mode 100644 index 3c5c8540..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsReturnInspectionTaskRecordServiceImpl.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nflg.wms.repository.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nflg.wms.repository.entity.QmsReturnInspectionTaskRecord; -import com.nflg.wms.repository.mapper.QmsReturnInspectionTaskRecordMapper; -import com.nflg.wms.repository.service.IQmsReturnInspectionTaskRecordService; -import org.springframework.stereotype.Service; - -/** - * 退料检测记录 服务实现类 - */ -@Service -public class QmsReturnInspectionTaskRecordServiceImpl extends ServiceImpl implements IQmsReturnInspectionTaskRecordService { -} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsReturnInspectionTaskServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsReturnInspectionTaskServiceImpl.java deleted file mode 100644 index 03e1a44e..00000000 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsReturnInspectionTaskServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.nflg.wms.repository.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nflg.wms.common.pojo.qo.QmsReturnInspectionTaskSearchQO; -import com.nflg.wms.common.pojo.qo.QmsReturnInspectionTaskTodoSearchQO; -import com.nflg.wms.common.pojo.vo.QmsReturnInspectionTaskVO; -import com.nflg.wms.repository.entity.QmsReturnInspectionTask; -import com.nflg.wms.repository.mapper.QmsReturnInspectionTaskMapper; -import com.nflg.wms.repository.service.IQmsReturnInspectionTaskService; -import org.springframework.stereotype.Service; - -/** - * 退料检测任务 服务实现类 - */ -@Service -public class QmsReturnInspectionTaskServiceImpl extends ServiceImpl implements IQmsReturnInspectionTaskService { - - @Override - public IPage search(QmsReturnInspectionTaskSearchQO request) { - return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize())); - } - - @Override - public IPage todoSearch(QmsReturnInspectionTaskTodoSearchQO request, Long inspectorId, Long userId) { - return baseMapper.todoSearch(request, new Page<>(request.getPage(), request.getPageSize()), inspectorId, userId); - } -} diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsReturnInspectionTaskMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsReturnInspectionTaskMapper.xml index e0277bad..3492b54f 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsReturnInspectionTaskMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsReturnInspectionTaskMapper.xml @@ -44,7 +44,7 @@ t.required_finish_time, t.is_overdue, t.callback_result, - t.batch_no, + t.return_type, t.update_user_id, t.update_user_name, t.update_time @@ -72,8 +72,8 @@ AND m.material_no ILIKE concat('%', #{request.materialNo}, '%') - - AND t.batch_no ILIKE concat('%', #{request.batchNo}, '%') + + AND t.return_type = #{request.returnType} AND iu.user_name ILIKE concat('%', #{request.inspectorName}, '%') @@ -158,7 +158,7 @@ t.required_finish_time, t.is_overdue, t.callback_result, - t.batch_no, + t.return_type, t.update_user_id, t.update_user_name, t.update_time @@ -193,7 +193,6 @@ OR m.drawing_no ILIKE concat('%', #{request.key}, '%') OR t.task_no ILIKE concat('%', #{request.key}, '%') OR t.request_no ILIKE concat('%', #{request.key}, '%') - OR t.batch_no ILIKE concat('%', #{request.key}, '%') )