diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java index 182597d..077e676 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/controller/QcPDAController.java @@ -28,29 +28,25 @@ import java.util.Map; @RequestMapping("/qcMobile") public class QcPDAController { + //检测类型，关联主键获取qcInspectionType的字典值：0首检 1专检 2自检 3互检 4原材料检 5抽检 6成品检 + private final IQcInspectionTypeService qcInspectionTypeService; + //检测项类别 + private final IQcInspectionItemCategoryService qcInspectionItemCategoryService; + //检测项定义 + private final IQcInspectionItemService qcInspectionItemService; //检测模板主表 private final IQcInspectionTemplateService qcInspectionTemplateService; //检测模板子表 private final IQcTemplateItemService qcTemplateItemService; - //检测类型，关联主键获取qcInspectionType的字典值：0首检 1专检 2自检 3互检 4原材料检 5抽检 6成品检 - private final IQcInspectionTypeService qcInspectionTypeService; - //质检主表（质检任务） private final IQcInspectionMainService qcInspectionMainService; //质检结果子表 private final IQcInspectionResultService qcInspectionResultService; - //检测项类别 - private final IQcInspectionItemCategoryService qcInspectionItemCategoryService; - - //检测项定义 - private final IQcInspectionItemService qcInspectionItemService; - //不合格品待评审 private final IQcUnqualifiedReviewService qcUnqualifiedReviewService; - //不合格品评审记录 private final IQcUnqualifiedRecordService qcUnqualifiedRecordService; diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java index 3e6eb56..7f099be 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcInspectionMain.java @@ -117,9 +117,15 @@ public class QcInspectionMain extends TenantEntity { private String team; /** - * 检验时间 + * 检验开始时间 */ - private Date inspectionTime; + private Date inspectionStartTime; + + /** + * 检验结束时间 + */ + private Date inspectionEndTime; + /** * 生产订单号 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcUnqualifiedReview.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcUnqualifiedReview.java index 53467d0..341d25e 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcUnqualifiedReview.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/QcUnqualifiedReview.java @@ -121,9 +121,14 @@ public class QcUnqualifiedReview extends TenantEntity { private Long reviewerId; /** - * 评审时间 + * 评审开始时间 */ - private Date reviewTime; + private Date reviewStartTime; + + /** + * 评审结束时间 + */ + private Date reviewEndTime; /** * 备注 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java index 0378f32..bedc552 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionMainBo.java @@ -121,9 +121,14 @@ public class QcInspectionMainBo extends BaseEntity { private String team; /** - * 检验时间 + * 检验开始时间 */ - private Date inspectionTime; + private Date inspectionStartTime; + + /** + * 检验结束时间 + */ + private Date inspectionEndTime; /** * 生产订单号 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcUnqualifiedReviewBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcUnqualifiedReviewBo.java index 48b4a69..bbc0593 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcUnqualifiedReviewBo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcUnqualifiedReviewBo.java @@ -1,5 +1,6 @@ package org.dromara.qms.domain.bo; +import com.alibaba.excel.annotation.ExcelProperty; import org.dromara.qms.domain.QcUnqualifiedReview; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; @@ -119,9 +120,14 @@ public class QcUnqualifiedReviewBo extends BaseEntity { private Long reviewerId; /** - * 评审时间 + * 评审开始时间 */ - private Date reviewTime; + private Date reviewStartTime; + + /** + * 评审结束时间 + */ + private Date reviewEndTime; /** * 备注 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java index b4fdfc2..2839a26 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcInspectionMainVo.java @@ -148,10 +148,16 @@ public class QcInspectionMainVo implements Serializable { private String team; /** - * 检验时间 + * 检验开始时间 */ - @ExcelProperty(value = "检验时间") - private Date inspectionTime; + @ExcelProperty(value = "检验开始时间") + private Date inspectionStartTime; + + /** + * 检验结束时间 + */ + @ExcelProperty(value = "检验结束时间") + private Date inspectionEndTime; /** * 生产订单号 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcUnqualifiedReviewVo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcUnqualifiedReviewVo.java index edd061e..88507ec 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcUnqualifiedReviewVo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/vo/QcUnqualifiedReviewVo.java @@ -148,10 +148,16 @@ public class QcUnqualifiedReviewVo implements Serializable { private Long reviewerId; /** - * 评审时间 + * 评审开始时间 */ - @ExcelProperty(value = "评审时间") - private Date reviewTime; + @ExcelProperty(value = "评审开始时间") + private Date reviewStartTime; + + /** + * 评审结束时间 + */ + @ExcelProperty(value = "评审结束时间") + private Date reviewEndTime; /** * 备注 diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcUnqualifiedRecordService.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcUnqualifiedRecordService.java index 7e08648..4347b10 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcUnqualifiedRecordService.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcUnqualifiedRecordService.java @@ -13,7 +13,7 @@ import java.util.List; * 不合格品评审记录Service接口 * * @author zch - * @date 2025-07-18 + * @date 2025-07-25 */ public interface IQcUnqualifiedRecordService { @@ -66,31 +66,4 @@ public interface IQcUnqualifiedRecordService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - - /** - * PDA专用：分页查询不合格品评审记录列表（包含关联信息） - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 不合格品评审记录分页列表（包含评审任务详细信息） - */ - TableDataInfo queryPageListWithDetails(QcUnqualifiedRecordBo bo, PageQuery pageQuery); - - /** - * PDA专用：根据用户查询评审记录历史 - * - * @param reviewer 评审人 - * @param pageQuery 分页参数 - * @return 用户的评审记录历史 - */ - TableDataInfo queryPageUserRecords(String reviewer, PageQuery pageQuery); - - /** - * PDA专用：根据时间范围查询评审记录 - * - * @param bo 查询条件（包含时间范围） - * @param pageQuery 分页参数 - * @return 指定时间范围内的评审记录 - */ - TableDataInfo queryPageRecordsByDateRange(QcUnqualifiedRecordBo bo, PageQuery pageQuery); } diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcUnqualifiedReviewService.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcUnqualifiedReviewService.java index 5fd6aa0..dd30252 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcUnqualifiedReviewService.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/IQcUnqualifiedReviewService.java @@ -1,8 +1,6 @@ package org.dromara.qms.service; import org.dromara.qms.domain.QcUnqualifiedReview; -import org.dromara.qms.domain.vo.QcInspectionMainVo; -import org.dromara.qms.domain.vo.QcInspectionResultVo; import org.dromara.qms.domain.vo.QcUnqualifiedReviewVo; import org.dromara.qms.domain.bo.QcUnqualifiedReviewBo; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -10,13 +8,12 @@ import org.dromara.common.mybatis.core.page.PageQuery; import java.util.Collection; import java.util.List; -import java.util.Map; /** * 不合格品待评审Service接口 * * @author zch - * @date 2025-07-18 + * @date 2025-07-25 */ public interface IQcUnqualifiedReviewService { @@ -69,44 +66,4 @@ public interface IQcUnqualifiedReviewService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - - /** - * 分页查询待评审不合格品列表 (for PDA) - */ - TableDataInfo queryPagePendingReviews(QcUnqualifiedReviewBo bo, PageQuery pageQuery); - - /** - * 查询不合格评审详情包括质检项目 (for PDA) - */ - QcUnqualifiedReviewVo queryByIdWithItems(Long reviewId); - - /** - * 提交评审结果 (for PDA), 更新并触发流程 - */ - Boolean submitReview(QcUnqualifiedReviewBo bo); - - /** - * 获取不合格品统计汇总信息 (for PDA) - * - * @param dateRange 日期范围 - * @return 统计汇总数据 - */ - Map getUnqualifiedSummary(String dateRange); - - /** - * 触发工作流程处理 (for PDA) - * - * @param bo 不合格品评审信息 - * @return 是否触发成功 - */ - Boolean triggerWorkflowProcess(QcUnqualifiedReviewBo bo); - - /** - * 自动生成不合格品评审记录 - * - * @param inspectionVo 质检主表信息 - * @param inspectionResults 检测项结果列表 - * @return 是否生成成功 - */ - Boolean autoGenerateUnqualifiedReview(QcInspectionMainVo inspectionVo, List inspectionResults); } diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java index a039e52..d99e5e4 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java @@ -98,7 +98,8 @@ public class QcInspectionMainServiceImpl implements IQcInspectionMainService { .eq(StringUtils.isNotBlank(bo.getInspector()), QcInspectionMain::getInspector, bo.getInspector()) .eq(StringUtils.isNotBlank(bo.getShift()), QcInspectionMain::getShift, bo.getShift()) .eq(StringUtils.isNotBlank(bo.getTeam()), QcInspectionMain::getTeam, bo.getTeam()) - .eq(bo.getInspectionTime() != null, QcInspectionMain::getInspectionTime, bo.getInspectionTime()) + .eq(bo.getInspectionStartTime() != null, QcInspectionMain::getInspectionStartTime, bo.getInspectionStartTime()) + .eq(bo.getInspectionEndTime() != null, QcInspectionMain::getInspectionEndTime, bo.getInspectionEndTime()) .eq(StringUtils.isNotBlank(bo.getProductionOrder()), QcInspectionMain::getProductionOrder, bo.getProductionOrder()) .eq(StringUtils.isNotBlank(bo.getBatchNo()), QcInspectionMain::getBatchNo, bo.getBatchNo()) .eq(StringUtils.isNotBlank(bo.getBarcode()), QcInspectionMain::getBarcode, bo.getBarcode()) diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcUnqualifiedReviewServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcUnqualifiedReviewServiceImpl.java index 42d69e5..7ed6b97 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcUnqualifiedReviewServiceImpl.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcUnqualifiedReviewServiceImpl.java @@ -92,7 +92,9 @@ public class QcUnqualifiedReviewServiceImpl implements IQcUnqualifiedReviewServi .eq(bo.getInspectorId() != null, QcUnqualifiedReview::getInspectorId, bo.getInspectorId()) .eq(StringUtils.isNotBlank(bo.getReviewer()), QcUnqualifiedReview::getReviewer, bo.getReviewer()) .eq(bo.getReviewerId() != null, QcUnqualifiedReview::getReviewerId, bo.getReviewerId()) - .eq(bo.getReviewTime() != null, QcUnqualifiedReview::getReviewTime, bo.getReviewTime()) +// .eq(bo.getReviewTime() != null, QcUnqualifiedReview::getReviewTime, bo.getReviewTime()) + .eq(bo.getReviewStartTime() != null, QcUnqualifiedReview::getReviewStartTime, bo.getReviewStartTime()) + .eq(bo.getReviewEndTime() != null, QcUnqualifiedReview::getReviewEndTime, bo.getReviewEndTime()) .orderByDesc(QcUnqualifiedReview::getCreateTime); return lqw; } diff --git a/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionMainMapper.xml b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionMainMapper.xml index eb49838..87478fa 100644 --- a/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionMainMapper.xml +++ b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcInspectionMainMapper.xml @@ -24,7 +24,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + @@ -34,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select inspection_id, tenant_id, - plan_detail_id, + plan_detail_id,inspection_end_time,inspection_start_time, inspection_no, template_id, material_code, material_type, material_name, process_name, station_name, inspection_qty, qualified_qty, unqualified_qty, result, workshop, inspection_type, status, inspector, shift, team, inspection_time, production_order, batch_no, barcode, supplier_name, remark, create_dept, create_by, create_time, update_by, update_time, del_flag from qc_inspection_main @@ -61,7 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and inspector = #{inspector} and shift = #{shift} and team = #{team} - and inspection_time = #{inspectionTime} + and inspection_start_time = #{inspectionStarTime} + and inspection_end_time = #{inspectionEndTime} and production_order = #{productionOrder} and batch_no = #{batchNo} and barcode = #{barcode} diff --git a/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcUnqualifiedReviewMapper.xml b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcUnqualifiedReviewMapper.xml index 8ea0bd9..c71c990 100644 --- a/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcUnqualifiedReviewMapper.xml +++ b/ruoyi-modules/hwmom-qms/src/main/resources/mapper/qms/QcUnqualifiedReviewMapper.xml @@ -24,12 +24,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + - select review_id, tenant_id, unqualified_review_no, review_result, inspection_no, inspection_type, production_date, work_order_no, process_name, material_name, material_code, material_spec, supplier_name, supplier_code, inspection_qty, batch_no, inspector, inspector_id, reviewer, reviewer_id, review_time, remark, create_dept, create_by, create_time, update_by, update_time, del_flag + select review_id, tenant_id, unqualified_review_no, review_result, inspection_no, inspection_type, production_date, work_order_no, process_name, material_name, material_code, material_spec, supplier_name, supplier_code, inspection_qty, batch_no, inspector, inspector_id, reviewer, reviewer_id, review_time, remark, + review_start_time, review_end_time, + create_dept, create_by, create_time, update_by, update_time, del_flag from qc_unqualified_review @@ -55,7 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and inspector_id = #{inspectorId} and reviewer = #{reviewer} and reviewer_id = #{reviewerId} - and review_time = #{reviewTime} + and review_start_time = #{reviewStartTime} + and review_end_time = #{reviewEndTime} AND del_flag = '0'