diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorDetailVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorDetailVO.java index 94defc8c..20ca0c52 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorDetailVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorDetailVO.java @@ -63,5 +63,5 @@ public class QmsQualityInspectorDetailVO { /** * PQC绑定机型列表 */ - private List pqcModels; + private List pqcModels; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorPqcModelVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorPqcModelVO.java index a3d19676..2afcec08 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorPqcModelVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorPqcModelVO.java @@ -8,10 +8,6 @@ import lombok.Data; @Data public class QmsQualityInspectorPqcModelVO { - /** - * PQC规则ID - */ - private Long pqcRuleId; /** * 机型编号 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorVO.java index 40b875d4..3b4793b9 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorVO.java @@ -61,11 +61,6 @@ public class QmsQualityInspectorVO { */ private Integer inspectionType; - /** - * PQC绑定机型编号列表 - */ - private List pqcModelNos; - /** * 转办人ID */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsInspectorModelItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsInspectorModelItem.java new file mode 100644 index 00000000..e0e548ea --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsInspectorModelItem.java @@ -0,0 +1,63 @@ +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.time.LocalDateTime; + +/** + *

+ * 质检员机型明细表 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("qms_inspector_model_item") +public class QmsInspectorModelItem implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 质检员ID (qms_quality_inspector.id) + */ + private Long inspectorId; + + /** + * 机型编号 + */ + private String modelNo; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 修改人 + */ + private String updateBy; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsInspectorModelItemMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsInspectorModelItemMapper.java new file mode 100644 index 00000000..cff38bff --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsInspectorModelItemMapper.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.wms.repository.entity.QmsInspectorModelItem; + +/** + *

+ * 质检员机型明细 Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface QmsInspectorModelItemMapper extends BaseMapper { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectorModelItemService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectorModelItemService.java new file mode 100644 index 00000000..b0e746ab --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectorModelItemService.java @@ -0,0 +1,16 @@ +package com.nflg.wms.repository.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nflg.wms.repository.entity.QmsInspectorModelItem; + +/** + *

+ * 质检员机型明细 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface IQmsInspectorModelItemService extends IService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectorModelItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectorModelItemServiceImpl.java new file mode 100644 index 00000000..08cbed8f --- /dev/null +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectorModelItemServiceImpl.java @@ -0,0 +1,22 @@ +package com.nflg.wms.repository.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nflg.wms.repository.entity.QmsInspectorModelItem; +import com.nflg.wms.repository.mapper.QmsInspectorModelItemMapper; +import com.nflg.wms.repository.service.IQmsInspectorModelItemService; +import org.springframework.stereotype.Service; + +/** + *

+ * 质检员机型明细 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class QmsInspectorModelItemServiceImpl + extends ServiceImpl + implements IQmsInspectorModelItemService { + +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsQualityInspectorServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsQualityInspectorServiceImpl.java index 54ff0205..a7e08a87 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsQualityInspectorServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsQualityInspectorServiceImpl.java @@ -15,23 +15,9 @@ import com.nflg.wms.common.pojo.qo.QmsQualityInspectorTransferQO; import com.nflg.wms.common.pojo.qo.QmsQualityInspectorUpdateQO; import com.nflg.wms.common.pojo.vo.*; import com.nflg.wms.common.util.UserUtil; -import com.nflg.wms.repository.entity.QmsInspectorMaterialCategoryItem; -import com.nflg.wms.repository.entity.QmsInspectorMaterialItem; -import com.nflg.wms.repository.entity.QmsQcMaterialCategory; -import com.nflg.wms.repository.entity.QmsQualityInspector; -import com.nflg.wms.repository.entity.User; +import com.nflg.wms.repository.entity.*; import com.nflg.wms.repository.mapper.QmsQualityInspectorMapper; -import com.nflg.wms.repository.service.IQmsInspectorMaterialCategoryItemService; -import com.nflg.wms.repository.service.IQmsInspectorMaterialItemService; -import com.nflg.wms.repository.entity.Department; -import com.nflg.wms.repository.entity.Position; -import com.nflg.wms.repository.entity.UserInterior; -import com.nflg.wms.repository.service.IDepartmentService; -import com.nflg.wms.repository.service.IPositionService; -import com.nflg.wms.repository.service.IUserInteriorService; -import com.nflg.wms.repository.service.IQmsQcMaterialCategoryService; -import com.nflg.wms.repository.service.IQmsQualityInspectorService; -import com.nflg.wms.repository.service.IUserService; +import com.nflg.wms.repository.service.*; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -73,6 +59,10 @@ public class QmsQualityInspectorServiceImpl extends ServiceImpl modelNos) { + inspectorModelItemService.lambdaUpdate() + .eq(QmsInspectorModelItem::getInspectorId, inspectorId) + .remove(); + inspectorModelItemService.saveBatch(modelNos.stream() + .map(modelNo -> { + QmsInspectorModelItem item = new QmsInspectorModelItem(); + item.setInspectorId(inspectorId); + item.setModelNo(modelNo); + item.setCreateBy(UserUtil.getUserName()); + item.setCreateTime(LocalDateTime.now()); + return item; + }) + .collect(Collectors.toList()) + ); + } + + private List getPqcModelsByInspectorId(Long inspectorId) { + if (inspectorId == null) { + return Collections.emptyList(); + } + return inspectorModelItemService.lambdaQuery() + .eq(QmsInspectorModelItem::getInspectorId, inspectorId) + .list() + .stream() + .map(QmsInspectorModelItem::getModelNo) + .filter(Objects::nonNull) + .distinct() + .collect(Collectors.toList()); + } + private QmsQualityInspector getPqcInspector(Long id) { QmsQualityInspector inspector = getById(id); if (Objects.isNull(inspector)) { @@ -231,6 +253,8 @@ public class QmsQualityInspectorServiceImpl extends ServiceImpl search(QmsQualityInspectorSearchQO request) { - IPage page = baseMapper.searchPage(request, new Page<>(request.getPage(), request.getPageSize())); - return page; + return baseMapper.searchPage(request, new Page<>(request.getPage(), request.getPageSize())); } @Override @@ -453,7 +482,7 @@ public class QmsQualityInspectorServiceImpl extends ServiceImpl + + + +