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 9beef27c..4bbd32a5 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 @@ -106,6 +106,10 @@ public interface QcMapper { void delFAISubDetailedRecord(QcSubDetailInformationData data); + void updateFAIItemResultBySubDetail(@Param("site") String site, @Param("buNo") String buNo, + @Param("inspectionNo") String inspectionNo, @Param("itemNo") String itemNo, + @Param("itemResult") String itemResult, @Param("unqualifiedQuantity") Integer unqualifiedQuantity); + EamPropertiesItemData getItemByItemNo(QcItemData data); void insertItem(EamPropertiesItemData task); @@ -332,6 +336,10 @@ public interface QcMapper { void delIQCSubDetailedRecord(QcSubDetailInformationData data); + void updateIQCItemResultBySubDetail(@Param("site") String site, @Param("buNo") String buNo, + @Param("inspectionNo") String inspectionNo, @Param("itemNo") String itemNo, + @Param("itemResult") String itemResult, @Param("unqualifiedQuantity") Integer unqualifiedQuantity); + void saveIQCSubDetailed(List subDetailValues); void updateIQCMasterSubmitFlag(QcFAIRecordData data); 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 64259aec..1ea2c982 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 @@ -2122,6 +2122,8 @@ public class QcServiceImpl implements QcService { // 删除子明细的老数据 qcMapper.delFAISubDetailedRecord(data); if (subDetailValues.isEmpty()) { + // 清空子明细时,项目检验结论复位为合格 + qcMapper.updateFAIItemResultBySubDetail(data.getSite(), data.getBuNo(), data.getInspectionNo(), data.getItemNo(), "Y", 0); return null; } // 统计是否有不符合上下限得值 @@ -2168,6 +2170,11 @@ public class QcServiceImpl implements QcService { qcMapper.saveFAISubDetailed(subList); } + // 项目检验结论由子明细实测值推导:仅当该项目可自动判定(数值型且维护了上下限)时更新, + // 有不合格值为N、全部合格为Y;无法自动判定的项目保持原有结论不变 + if ("N".equals(data.getValueTypeDb()) && (data.getMaxValue() != null || data.getMinValue() != null)) { + qcMapper.updateFAIItemResultBySubDetail(data.getSite(), data.getBuNo(), data.getInspectionNo(), data.getItemNo(), count > 0 ? "N" : "Y", count); + } return count; } @@ -3446,6 +3453,8 @@ public class QcServiceImpl implements QcService { // 删除子明细的老数据 qcMapper.delIQCSubDetailedRecord(data); if (subDetailValues.isEmpty()) { + // 清空子明细时,项目检验结论复位为合格 + qcMapper.updateIQCItemResultBySubDetail(data.getSite(), data.getBuNo(), data.getInspectionNo(), data.getItemNo(), "Y", 0); return null; } // 统计是否有不符合上下限得值 @@ -3492,6 +3501,11 @@ public class QcServiceImpl implements QcService { qcMapper.saveIQCSubDetailed(subList); } + // 项目检验结论由子明细实测值推导:仅当该项目可自动判定(数值型且维护了上下限)时更新, + // 有不合格值为N、全部合格为Y;无法自动判定的项目保持原有结论不变 + if ("N".equals(data.getValueTypeDb()) && (data.getMaxValue() != null || data.getMinValue() != null)) { + qcMapper.updateIQCItemResultBySubDetail(data.getSite(), data.getBuNo(), data.getInspectionNo(), data.getItemNo(), count > 0 ? "N" : "Y", count); + } return count; } diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 13a063c8..b49d08e3 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -2092,6 +2092,14 @@ WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo} + + + UPDATE qc_fai_detailed_record + SET item_result = #{itemResult}, + unqualified_quantity = #{unqualifiedQuantity,jdbcType=DECIMAL} + WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo} + + INSERT INTO qc_fai_sub_detail_record @@ -2871,6 +2879,14 @@ WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo} + + + UPDATE qc_iqc_detailed_record + SET item_result = #{itemResult}, + unqualified_quantity = #{unqualifiedQuantity,jdbcType=DECIMAL} + WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo} + + INSERT INTO qc_iqc_sub_detail_record