diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java index e79f0a02..4944974b 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java @@ -56,6 +56,26 @@ public class EamWorkOrderInData extends EamWorkOrderData{ private BigDecimal responseTime; // 机台名称 private String resourceDesc; + // 反馈描述 + private String feedBackDesc; + // 反馈编码 + private String feedBackId; + + public String getFeedBackId() { + return feedBackId; + } + + public void setFeedBackId(String feedBackId) { + this.feedBackId = feedBackId; + } + + public String getFeedBackDesc() { + return feedBackDesc; + } + + public void setFeedBackDesc(String feedBackDesc) { + this.feedBackDesc = feedBackDesc; + } public String getResourceDesc() { return resourceDesc; diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java index 7410dc20..9f62e8c6 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java @@ -434,4 +434,8 @@ public interface QcMapper { List umSearch(QcFAIRecordData data); SubDetailValues checkItem(SubDetailValues task); + + void saveIPQCRecordCount(QcFAIRecordData data); + + void deleteIPQCRecordCount(QcFAIRecordData qcData); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index c29ac022..385996d2 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java @@ -2555,6 +2555,8 @@ public class QcServiceImpl implements QcService { } // 新增IPQC主记录信息 qcMapper.saveIPQCRecord(data); + // 新增IPQC记录到count表 + qcMapper.saveIPQCRecordCount(data); } /** @@ -2587,6 +2589,8 @@ public class QcServiceImpl implements QcService { qcMapper.deleteIPQCDetailedRecord(qcData); // 删除子明细记录信息 qcMapper.deleteIPQCSubDetailedRecord(qcData); + // 删除count表记录 + qcMapper.deleteIPQCRecordCount(qcData); } } diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index dca7ad61..cb3989fa 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -663,7 +663,8 @@ a.check_item_no, a.reach_date, a.reach_operator, - a.reach_operator_name + a.reach_operator_name, + b.FeedBackDesc FROM eam_workOrder a LEFT JOIN eam_defect_feedBack b on a.site = b.site and a.PlanID = b.feedBackID LEFT JOIN eam_defect c on b.DefectID = c.DefectID @@ -753,7 +754,8 @@ CASE WHEN (DATEDIFF(SECOND, b.CreatedDate, a.reach_date) 60) THEN DATEDIFF(SECOND, b.CreatedDate, a.reach_date) / 60.0 ELSE DATEDIFF(MINUTE, b.CreatedDate, a.reach_date) - END AS responseTime + END AS responseTime, + b.FeedBackDesc FROM eam_workOrder a left join eam_defect_feedBack b on a.site = b.site and a.PlanID = b.feedBackID left join eam_defect c on b.DefectID = c.DefectID @@ -1319,10 +1321,10 @@ AND a.status = #{query.status} - AND a.defectDate > #{query.startDate} + AND a.defectDate >= #{query.startDate} - AND #{query.endDate} > a.defectDate + AND #{query.endDate} >= a.defectDate and a.FunctionType = #{query.functionType} diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 5a89287e..b3a8f4f8 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -972,7 +972,7 @@ LEFT JOIN qc_part_attribute as qpa ON qpa.attribute_no = qat.attribute_no and qat.site = qpa.site LEFT JOIN qc_template as qt ON qat.template_id = qt.template_id and qat.site = qt.site LEFT JOIN qc_sampling_inspection_level as qsil ON qat.sampling_level_no = qsil.sampling_level_no - LEFT JOIN qc_inspection_type as qit ON qt.inspection_type_no = qit.inspection_type_no + LEFT JOIN qc_inspection_type as qit ON qt.inspection_type_no = qit.inspection_type_no and qt.site = qit.site LEFT JOIN qc_sampling_inspection_programme as qsip ON qat.sampling_programme_no = qsip.sampling_programme_no WHERE qat.site = #{site} and qpa.attribute_type = #{attributeType} and qpa.attribute_no = #{attributeNo} @@ -1713,6 +1713,12 @@ VALUES(#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL}) + + + INSERT INTO qc_ipqc_record_count (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id, new_data) + VALUES(#{inspectionNo}, #{site}, #{state}, getDate(), #{inspectionTypeNo}, #{inspectionCycle,jdbcType=DECIMAL}, #{orderNo}, #{operationDesc}, #{resourceId}, #{partNo}, #{rollQty}, #{samplingQty,jdbcType=DECIMAL}, #{seqNo}, #{batchRollNo}, #{specialRequirements}, #{workCenterNo}, #{rollNo}, #{umId}, 'Y') + + INSERT INTO qc_ipqc_record (inspection_no, site, state, task_date, inspection_type_no, inspection_cycle, order_no, operation_desc, resource_id, part_no, roll_qty, sampling_qty, ssr_id, seq_no, batch_roll_no, special_requirements, work_center_no, roll_no, um_id) @@ -1834,6 +1840,12 @@ WHERE inspection_no = #{inspectionNo} and site = #{site} + + + DELETE FROM qc_ipqc_record_count + WHERE inspection_no = #{inspectionNo} and site = #{site} + + DELETE FROM qc_ipqc_detailed_record