From 5bf75c182c1fb1c7e6b237caa95f53b43ac76240 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 28 Apr 2025 15:00:47 +0800 Subject: [PATCH] =?UTF-8?q?2025-04-28=20=E6=96=B0=E5=A2=9E=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/modules/pms/mapper/QcMapper.java | 14 +- .../pms/service/Impl/QcServiceImpl.java | 1431 ++++------------- src/main/resources/mapper/pms/QcMapper.xml | 42 +- 3 files changed, 324 insertions(+), 1163 deletions(-) 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 bc7e35a1..fb3f7df1 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 @@ -232,8 +232,6 @@ public interface QcMapper { void saveFAIRecord(QcFAIRecordData data); - void saveFAIDetailedRecord(QcFAIRecordData faiRecordData); - IPage qcFAIInspectionSearch(Page qcFAIRecordDataPage,@Param("query") QcFAIRecordData data); String selectFamilyIdByPartNo(String partNo, String site); @@ -248,8 +246,6 @@ public interface QcMapper { List selectIPQCBasicData(); - void saveIPQCDetailedRecord(QcFAIRecordData faiRecordData); - void saveIPQCRecord(QcFAIRecordData qcFAIRecordData); IPage qcIPQCInspectionSearch(Page qcFAIRecordDataPage,@Param("query") QcFAIRecordData data); @@ -357,9 +353,7 @@ public interface QcMapper { List getOrderNoList(QcFAIRecordData data); - IPage qcFQCInspectionSearch(Page qcFAIRecordDataPage,@Param("query") QcFAIRecordData data); - - void saveFQCDetailedRecord(QcFAIRecordData faiRecordData); + IPage qcFQCInspectionSearch(Page qcFAIRecordDataPage, @Param("query") QcFAIRecordData data); void saveFQCRecord(QcFAIRecordData data); @@ -614,4 +608,10 @@ public interface QcMapper { void updateFAIDetailSubmitFlag2(QcFAIRecordData qcData); void updateFAISubDetailSubmitFlag2(QcFAIRecordData qcData); + + void saveFAIDetailedRecords(List faiRecordDataList); + + void saveFQCDetailedRecords(List faiRecordDataList); + + void saveIPQCDetailedRecords(List faiRecordDataList); } 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 80098aca..21747aeb 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 @@ -97,7 +97,7 @@ public class QcServiceImpl implements QcService { // ======================= 检验方法 ======================= /** - * @description: 条件查询检验方法 + * 条件查询检验方法 **/ @Override public PageUtils qcMethodSearch(QcMethodData data) { @@ -106,7 +106,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增检验方法 + * 新增检验方法 **/ @Override public void qcMethodSave(QcMethodData data) { @@ -139,7 +139,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 修改检验方法 + * 修改检验方法 **/ @Override public void qcMethodUpdate(QcMethodData data) { @@ -159,7 +159,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除检验方法 + * 删除检验方法 **/ @Override public void qcMethodDelete(QcMethodData data) { @@ -175,7 +175,7 @@ public class QcServiceImpl implements QcService { // ======================= 检验项目 ======================= /** - * @description: 根据条件查询检验项目 + * 根据条件查询检验项目 **/ @Override public PageUtils qcItemSearch(QcItemData data) { @@ -184,7 +184,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增检验项目 + * 新增检验项目 **/ @Override @Transactional @@ -232,7 +232,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 修改检验项目 + * 修改检验项目 **/ @Override @Transactional @@ -267,7 +267,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除检验项目 + * 删除检验项目 **/ @Override @Transactional @@ -284,7 +284,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 检验项目导入 + * 检验项目导入 **/ @Override @Transactional @@ -364,7 +364,7 @@ public class QcServiceImpl implements QcService { // ======================= 质检员信息维护 ======================= /** - * @description: 查询质检员信息列表 + * 查询质检员信息列表 **/ @Override public List inspectorSearch() { @@ -373,7 +373,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增质检员信息 + * 新增质检员信息 **/ @Override public ResponseData inspectorSave(QcInspectorData data) { @@ -392,7 +392,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 修改质检员信息 + * 修改质检员信息 **/ @Override public ResponseData inspectorUpdate(QcInspectorData data) { @@ -406,7 +406,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除质检员信息 + * 删除质检员信息 **/ @Override public ResponseData inspectorDelete(QcInspectorData data) { @@ -421,7 +421,7 @@ public class QcServiceImpl implements QcService { // ======================= 抽样方案维护 ======================= /** - * @description: 查询抽检方案 + * 查询抽检方案 **/ @Override public PageUtils samplingInspectionPlanSearch(QcSamplingInspectionPlanData data) { @@ -430,7 +430,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增抽样方案 + * 新增抽样方案 **/ @Override public void samplingInspectionPlanSave(QcSamplingInspectionPlanData data) { @@ -462,7 +462,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 修改抽样方案 + * 修改抽样方案 **/ @Override public void samplingInspectionPlanUpdate(QcSamplingInspectionPlanData data) { @@ -482,7 +482,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除抽样方案 + * 删除抽样方案 **/ @Override public void samplingInspectionPlanDelete(QcSamplingInspectionPlanData data) { @@ -492,7 +492,7 @@ public class QcServiceImpl implements QcService { // ======================= 检验模板维护 ======================= /** - * @description: 查询模板 + * 查询模板 **/ @Override public PageUtils templateSearch(QcTemplateData data) { @@ -501,7 +501,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增模板 + * 新增模板 **/ @Override public void templateSave(QcTemplateData data) { @@ -534,7 +534,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 修改模板 + * 修改模板 **/ @Override public void templateUpdate(QcTemplateData data) { @@ -553,7 +553,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 模板中的项目清单 + * 模板中的项目清单 **/ @Override public List templateDetailsSearch(QcTemplateData data) { @@ -562,7 +562,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增项目的检验明细 + * 新增项目的检验明细 **/ @Override public void addItemDetails(QcTemplateData data) { @@ -586,7 +586,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除项目的检验明细 + * 删除项目的检验明细 **/ @Override @Transactional @@ -607,7 +607,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 获取当前项目不包含的明细 + * 获取当前项目不包含的明细 **/ @Override public List getItemList(QcTemplateData data) { @@ -616,7 +616,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 查询项目 + * 查询项目 **/ @Override public List getItem(QcTemplateData data) { @@ -641,7 +641,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除项目 + * 删除项目 **/ @Override @Transactional @@ -653,7 +653,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增项目明细的自定义最大最小值 + * 新增项目明细的自定义最大最小值 **/ @Override @Transactional @@ -667,7 +667,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 检验模板导入 + * 检验模板导入 **/ @Override @Transactional @@ -776,7 +776,7 @@ public class QcServiceImpl implements QcService { // ======================= 样本量维护 ======================= /** - * @description: 查询样本量 + * 查询样本量 **/ @Override public PageUtils samplingQtySearch(QcSamplingInspectionQtyData data) { @@ -785,7 +785,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增样本量 + * 新增样本量 **/ @Override public void samplingQtySave(QcSamplingInspectionQtyData data) { @@ -814,7 +814,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 修改样本量 + * 修改样本量 **/ @Override public void samplingQtyUpdate(QcSamplingInspectionQtyData data) { @@ -836,7 +836,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除样本量 + * 删除样本量 **/ @Override public void samplingQtyDelete(QcSamplingInspectionQtyData data) { @@ -852,7 +852,7 @@ public class QcServiceImpl implements QcService { // ======================= 批量级次维护 ======================= /** - * @description: 查询批量级次 + * 查询批量级次 **/ @Override public PageUtils samplingQtyRankSearch(QcSamplingInspectionQtyRankData data) { @@ -861,7 +861,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增批量级次 + * 新增批量级次 **/ @Override public void samplingQtyRankSave(QcSamplingInspectionQtyRankData data) { @@ -890,7 +890,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 修改批量级次 + * 修改批量级次 **/ @Override public void samplingQtyRankUpdate(QcSamplingInspectionQtyRankData data) { @@ -912,7 +912,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除批量级次 + * 删除批量级次 **/ @Override public void samplingQtyRankDelete(QcSamplingInspectionQtyRankData data) { @@ -927,7 +927,7 @@ public class QcServiceImpl implements QcService { // ======================= 检验等级维护 ======================= /** - * @description: 查询检验等级 + * 查询检验等级 **/ @Override public PageUtils samplingLevelSearch(QcSamplingInspectionLevelData data) { @@ -936,7 +936,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增检验等级 + * 新增检验等级 **/ @Override public void samplingLevelSave(QcSamplingInspectionLevelData data) { @@ -965,7 +965,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 修改检验等级 + * 修改检验等级 **/ @Override public void samplingLevelUpdate(QcSamplingInspectionLevelData data) { @@ -987,7 +987,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除检验等级 + * 删除检验等级 **/ @Override public void samplingLevelDelete(QcSamplingInspectionLevelData data) { @@ -1000,7 +1000,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 搜索所有检验类型 + * 搜索所有检验类型 **/ @Override public List inspectionTypeSearch(QcInspectionTypeData data) { @@ -1009,7 +1009,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 搜索所有设备 + * 搜索所有设备 **/ @Override public List objectSearch(EamObjectData inData) { @@ -1023,7 +1023,7 @@ public class QcServiceImpl implements QcService { // ======================= 物料属性设置维护 ======================= /** - * @description: 查询物料属性 + * 查询物料属性 **/ @Override public PageUtils qcPartAttributeSearch(QcPartAttributeData data) { @@ -1032,7 +1032,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增物料属性 + * 新增物料属性 **/ @Override public void qcPartAttributeSave(QcPartAttributeData data) { @@ -1052,7 +1052,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 物料属性修改 + * 物料属性修改 **/ @Override public void qcPartAttributeEdit(QcPartAttributeData data) { @@ -1072,7 +1072,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除物料属性 + * 删除物料属性 **/ @Override @Transactional @@ -1084,7 +1084,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 查询物料模板 + * 查询物料模板 **/ @Override public List searchPartAttributeDetails(QcTemplateData data) { @@ -1093,7 +1093,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增物料属性模板 + * 新增物料属性模板 **/ @Override @Transactional @@ -1146,7 +1146,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 可选模板 + * 可选模板 **/ @Override public List getTemplateList(QcTemplateData data) { @@ -1155,7 +1155,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 已有模板 + * 已有模板 **/ @Override public List getPartTemplateList(QcTemplateData data) { @@ -1164,7 +1164,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 物料可选模板 + * 物料可选模板 **/ @Override public List getTemplateListAll(QcTemplateData data) { @@ -1173,7 +1173,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除物料属性模板 + * 删除物料属性模板 **/ @Override @Transactional @@ -1192,7 +1192,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增物料属性模板详情 + * 新增物料属性模板详情 **/ @Override @Transactional @@ -1203,7 +1203,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 物料属性导入 + * 物料属性导入 **/ @Override @Transactional @@ -1269,7 +1269,7 @@ public class QcServiceImpl implements QcService { // ======================= 类别属性设置维护 ======================= /** - * @description: 查询类别属性 + * 查询类别属性 **/ @Override public PageUtils qcFamilyAttributeSearch(QcPartAttributeData data) { @@ -1278,7 +1278,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增类别属性 + * 新增类别属性 **/ @Override public void qcFamilyAttributeSave(QcPartAttributeData data) { @@ -1293,7 +1293,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除类别属性 + * 删除类别属性 **/ @Override @Transactional @@ -1305,7 +1305,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 类别属性导入 + * 类别属性导入 **/ @Override @Transactional @@ -1369,7 +1369,7 @@ public class QcServiceImpl implements QcService { // ======================= 抽样方案维护 ======================= /** - * @description: 查询抽样方案 + * 查询抽样方案 **/ @Override public PageUtils samplingProgrammeSearch(QcSamplingInspectionProgrammeData data) { @@ -1378,7 +1378,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增抽样方案 + * 新增抽样方案 **/ @Override public void samplingProgrammeSave(QcSamplingInspectionProgrammeData data) { @@ -1406,7 +1406,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除抽样方案 + * 删除抽样方案 **/ @Override @Transactional @@ -1418,7 +1418,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 搜索抽样方案中的矩阵 + * 搜索抽样方案中的矩阵 **/ @Override public List searchSamplingProgrammeDetails(QcSamplingInspectionProgrammeData data) { @@ -1427,7 +1427,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 获取该方案不包含的矩阵 + * 获取该方案不包含的矩阵 **/ @Override public List getPlanList(QcSamplingInspectionProgrammeData data) { @@ -1436,7 +1436,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 获取当前方案所包含的矩阵 + * 获取当前方案所包含的矩阵 **/ @Override public List getProgrammePlanList(QcSamplingInspectionProgrammeData data) { @@ -1445,7 +1445,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增抽样方案中的矩阵 + * 新增抽样方案中的矩阵 **/ @Override @Transactional @@ -1466,7 +1466,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除抽样方案中的矩阵 + * 删除抽样方案中的矩阵 **/ @Override @Transactional @@ -1491,7 +1491,7 @@ public class QcServiceImpl implements QcService { // ======================= FAI检验维护 ======================= /** - * @description: FAI检验记录查询 + * FAI检验记录查询 **/ @Override @Transactional @@ -1502,7 +1502,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增FAI检验 + * 新增FAI检验 **/ @Override @Transactional @@ -1531,88 +1531,12 @@ public class QcServiceImpl implements QcService { data.setInspectionCycle(partAttribute.get(0).getInspectionCycle()); } // 获取抽样数量 - // 如果该检验模板有维护抽样方案 - if (StringUtils.isNotBlank(partAttribute.get(0).getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(partAttribute.get(0).getSite()); - samplingInspectionProgrammeData.setBuNo(partAttribute.get(0).getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(partAttribute.get(0).getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(partAttribute.get(0).getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0) ){ - data.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (partAttribute.get(0).getDefaultSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - data.setSamplingQty(partAttribute.get(0).getDefaultSamplingQuantity()); - } else if (partAttribute.get(0).getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - data.setSamplingQty(partAttribute.get(0).getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP)); - } - - // 获取根据该检验模板下维护的检验项目 - QcTemplateData templateData = new QcTemplateData(); - templateData.setSite(data.getSite()); - templateData.setBuNo(data.getBuNo()); - templateData.setTemplateId(partAttribute.get(0).getTemplateId()); - templateData.setItemType("D"); - List itemList = qcMapper.templateDetailsSearch(templateData); - QcFAIRecordData faiRecordData = new QcFAIRecordData(); - faiRecordData.setSite(data.getSite()); // 工厂 - faiRecordData.setBuNo(data.getBuNo()); // BU - faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号 - faiRecordData.setOrderNo(data.getOrderNo()); // 工单号 - faiRecordData.setTemplateId(partAttribute.get(0).getTemplateId()); // 模板编码 - faiRecordData.setAql(partAttribute.get(0).getAql()); // aql - faiRecordData.setAc(partAttribute.get(0).getAc()); // ac - faiRecordData.setRe(partAttribute.get(0).getRe()); // re - for (QcTemplateData qcTemplateData : itemList) { - faiRecordData.setSamplingQty(null); - faiRecordData.setSamplingLevelNo(qcTemplateData.getSamplingLevelNo()); // 检验水平编码 - faiRecordData.setSamplingLevelDesc(qcTemplateData.getSamplingLevelDesc()); // 检验水平名称 - faiRecordData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); // 抽样方案编码 - faiRecordData.setSamplingProgrammeDesc(qcTemplateData.getSamplingProgrammeDesc()); // 抽样方案名称 - faiRecordData.setItemNo(qcTemplateData.getItemNo()); // 项目编码 - faiRecordData.setItemDesc(qcTemplateData.getItemDesc()); // 项目名称 - faiRecordData.setObjectId(qcTemplateData.getObjectID()); // 设备编码 - faiRecordData.setObjectDesc(qcTemplateData.getObjectDesc()); // 设备名称 - faiRecordData.setDefaultValue(qcTemplateData.getDefaultValue()); // 默认值 - faiRecordData.setMinValue(qcTemplateData.getMinValue()); // 最小值 - faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值 - faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型 - faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb()); - faiRecordData.setOrderId(qcTemplateData.getOrderId()); - // 获取抽样数量 - // 如果该检验项目有维护抽样方案 - if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(qcTemplateData.getSite()); - samplingInspectionProgrammeData.setBuNo(qcTemplateData.getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(qcTemplateData.getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0)) { - faiRecordData.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (qcTemplateData.getItemSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - faiRecordData.setSamplingQty(qcTemplateData.getItemSamplingQuantity()); - } else if (qcTemplateData.getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - faiRecordData.setSamplingQty(qcTemplateData.getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP)); - } else { - // 最后则根据检验单抽样数量赋值 - faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量 - } - // 新增FAI明细记录信息 - qcMapper.saveFAIDetailedRecord(faiRecordData); - } + BigDecimal samplingQty = getInspectionSamplingQty(partAttribute, data.getRollQty()); + data.setSamplingQty(samplingQty); + // 获取检验明细数据 + List faiRecordDataList = getInspectionDetails(partAttribute.get(0), data); + // 新增FAI明细记录信息 + qcMapper.saveFAIDetailedRecords(faiRecordDataList); } else { // 明细记录信息赋值 String partNo = data.getPartNo(); @@ -1627,95 +1551,18 @@ public class QcServiceImpl implements QcService { resourceId = data.getResourceId(); } partAttribute = qcMapper.selectPartAttributeByOperationAndResource(data.getSite(), data.getBuNo(), partNo, attributeType1, data.getInspectionTypeNo(),operationDesc, resourceId); - if (!partAttribute.isEmpty()) { // 获取检验周期 if (partAttribute.get(0).getInspectionCycle() != null) { data.setInspectionCycle(partAttribute.get(0).getInspectionCycle()); } // 获取抽样数量 - // 如果该检验模板有维护抽样方案 - if (StringUtils.isNotBlank(partAttribute.get(0).getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(partAttribute.get(0).getSite()); - samplingInspectionProgrammeData.setBuNo(partAttribute.get(0).getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(partAttribute.get(0).getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(partAttribute.get(0).getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0) ){ - data.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (partAttribute.get(0).getDefaultSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - data.setSamplingQty(partAttribute.get(0).getDefaultSamplingQuantity()); - } else if (partAttribute.get(0).getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - data.setSamplingQty(partAttribute.get(0).getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP)); - } - - // 获取根据该检验模板下维护的检验项目 - QcTemplateData templateData = new QcTemplateData(); - templateData.setSite(data.getSite()); - templateData.setBuNo(data.getBuNo()); - templateData.setTemplateId(partAttribute.get(0).getTemplateId()); - templateData.setItemType("D"); - List itemList = qcMapper.templateDetailsSearch(templateData); - QcFAIRecordData faiRecordData = new QcFAIRecordData(); - faiRecordData.setSite(data.getSite()); // 工厂 - faiRecordData.setBuNo(data.getBuNo()); // BU - faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号 - faiRecordData.setOrderNo(data.getOrderNo()); // 工单号 - faiRecordData.setTemplateId(partAttribute.get(0).getTemplateId()); // 模板编码 - faiRecordData.setAql(partAttribute.get(0).getAql()); // aql - faiRecordData.setAc(partAttribute.get(0).getAc()); // ac - faiRecordData.setRe(partAttribute.get(0).getRe()); // re - for (QcTemplateData qcTemplateData : itemList) { - faiRecordData.setSamplingQty(null); - faiRecordData.setSamplingLevelNo(qcTemplateData.getSamplingLevelNo()); // 检验水平编码 - faiRecordData.setSamplingLevelDesc(qcTemplateData.getSamplingLevelDesc()); // 检验水平名称 - faiRecordData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); // 抽样方案编码 - faiRecordData.setSamplingProgrammeDesc(qcTemplateData.getSamplingProgrammeDesc()); // 抽样方案名称 - faiRecordData.setItemNo(qcTemplateData.getItemNo()); // 项目编码 - faiRecordData.setItemDesc(qcTemplateData.getItemDesc()); // 项目名称 - faiRecordData.setObjectId(qcTemplateData.getObjectID()); // 设备编码 - faiRecordData.setObjectDesc(qcTemplateData.getObjectDesc()); // 设备名称 - faiRecordData.setDefaultValue(qcTemplateData.getDefaultValue()); // 默认值 - faiRecordData.setMinValue(qcTemplateData.getMinValue()); // 最小值 - faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值 - faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型 - faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb()); - faiRecordData.setOrderId(qcTemplateData.getOrderId()); - // 获取抽样数量 - // 如果该检验项目有维护抽样方案 - if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(qcTemplateData.getSite()); - samplingInspectionProgrammeData.setBuNo(qcTemplateData.getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(qcTemplateData.getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0)) { - faiRecordData.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (qcTemplateData.getItemSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - faiRecordData.setSamplingQty(qcTemplateData.getItemSamplingQuantity()); - } else if (qcTemplateData.getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - faiRecordData.setSamplingQty(qcTemplateData.getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP)); - } else { - // 最后则根据检验单抽样数量赋值 - faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量 - } - // 新增FAI明细记录信息 - qcMapper.saveFAIDetailedRecord(faiRecordData); - } + BigDecimal samplingQty = getInspectionSamplingQty(partAttribute, data.getRollQty()); + data.setSamplingQty(samplingQty); + // 获取检验明细数据 + List faiRecordDataList = getInspectionDetails(partAttribute.get(0), data); + // 新增FAI明细记录信息 + qcMapper.saveFAIDetailedRecords(faiRecordDataList); } else { // 获取物料的类别编码 String familyId = qcMapper.selectFamilyIdByPartNo(partNo,data.getSite()); @@ -1728,88 +1575,12 @@ public class QcServiceImpl implements QcService { data.setInspectionCycle(familyAttribute.get(0).getInspectionCycle()); } // 获取抽样数量 - // 如果该检验模板有维护抽样方案 - if (StringUtils.isNotBlank(familyAttribute.get(0).getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(familyAttribute.get(0).getSite()); - samplingInspectionProgrammeData.setBuNo(familyAttribute.get(0).getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(familyAttribute.get(0).getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(familyAttribute.get(0).getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0) ){ - data.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (familyAttribute.get(0).getDefaultSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - data.setSamplingQty(familyAttribute.get(0).getDefaultSamplingQuantity()); - } else if (familyAttribute.get(0).getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - data.setSamplingQty(familyAttribute.get(0).getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP)); - } - - // 获取根据该检验模板下维护的检验项目 - QcTemplateData templateData = new QcTemplateData(); - templateData.setSite(data.getSite()); - templateData.setBuNo(data.getBuNo()); - templateData.setTemplateId(familyAttribute.get(0).getTemplateId()); - templateData.setItemType("D"); - List itemList = qcMapper.templateDetailsSearch(templateData); - QcFAIRecordData faiRecordData = new QcFAIRecordData(); - faiRecordData.setSite(data.getSite()); // 工厂 - faiRecordData.setBuNo(data.getBuNo()); // BU - faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号 - faiRecordData.setOrderNo(data.getOrderNo()); // 工单号 - faiRecordData.setTemplateId(familyAttribute.get(0).getTemplateId()); // 模板编码 - faiRecordData.setAql(familyAttribute.get(0).getAql()); // aql - faiRecordData.setAc(familyAttribute.get(0).getAc()); // ac - faiRecordData.setRe(familyAttribute.get(0).getRe()); // re - for (QcTemplateData qcTemplateData : itemList) { - faiRecordData.setSamplingQty(null); - faiRecordData.setSamplingLevelNo(qcTemplateData.getSamplingLevelNo()); // 检验水平编码 - faiRecordData.setSamplingLevelDesc(qcTemplateData.getSamplingLevelDesc()); // 检验水平名称 - faiRecordData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); // 抽样方案编码 - faiRecordData.setSamplingProgrammeDesc(qcTemplateData.getSamplingProgrammeDesc()); // 抽样方案名称 - faiRecordData.setItemNo(qcTemplateData.getItemNo()); // 项目编码 - faiRecordData.setItemDesc(qcTemplateData.getItemDesc()); // 项目名称 - faiRecordData.setObjectId(qcTemplateData.getObjectID()); // 设备编码 - faiRecordData.setObjectDesc(qcTemplateData.getObjectDesc()); // 设备名称 - faiRecordData.setDefaultValue(qcTemplateData.getDefaultValue()); // 默认值 - faiRecordData.setMinValue(qcTemplateData.getMinValue()); // 最小值 - faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值 - faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型 - faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb()); - faiRecordData.setOrderId(qcTemplateData.getOrderId()); - // 获取抽样数量 - // 如果该检验项目有维护抽样方案 - if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(qcTemplateData.getSite()); - samplingInspectionProgrammeData.setBuNo(qcTemplateData.getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(qcTemplateData.getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0)) { - faiRecordData.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (qcTemplateData.getItemSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - faiRecordData.setSamplingQty(qcTemplateData.getItemSamplingQuantity()); - } else if (qcTemplateData.getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - faiRecordData.setSamplingQty(qcTemplateData.getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP)); - } else { - // 最后则根据检验单抽样数量赋值 - faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量 - } - // 新增IPQC明细记录信息 - qcMapper.saveFAIDetailedRecord(faiRecordData); - } + BigDecimal samplingQty = getInspectionSamplingQty(familyAttribute, data.getRollQty()); + data.setSamplingQty(samplingQty); + // 获取检验明细数据 + List faiRecordDataList = getInspectionDetails(familyAttribute.get(0), data); + // 新增FAI明细记录信息 + qcMapper.saveFAIDetailedRecords(faiRecordDataList); } } } @@ -1818,7 +1589,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: FAI明细记录查询 + * FAI明细记录查询 **/ @Override public List faiDetailSearch(QcFAIRecordData data) { @@ -1827,7 +1598,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 保存检验记录 + * 保存检验记录 **/ @Override @Transactional @@ -1956,7 +1727,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除检验记录 + * 删除检验记录 **/ @Override @Transactional @@ -1988,7 +1759,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 审核 + * 审核 **/ @Override @Transactional @@ -2011,7 +1782,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 检查FAI是否已提交 + * 检查FAI是否已提交 **/ @Override public Integer checkFAIIsSubmit(SubDetailValues data) { @@ -2024,7 +1795,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增FAI子明细信息 + * 新增FAI子明细信息 **/ @Override @Transactional @@ -2092,7 +1863,7 @@ public class QcServiceImpl implements QcService { /** - * @description: 查询FAI的子明细 + * 查询FAI的子明细 **/ @Override public List selectFAISubDetailedRecord(SubDetailValues data) { @@ -2107,7 +1878,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 检查子明细中的实测值是否在规定范围 + * 检查子明细中的实测值是否在规定范围 **/ @Override public Integer checkFAISubDetailValue(CheckSubDetailValueVo data) { @@ -2124,7 +1895,7 @@ public class QcServiceImpl implements QcService { // ======================= FQC检验维护 ======================= /** - * @description: FQC记录查询 + * FQC记录查询 **/ @Override public PageUtils qcFQCInspectionSearch(QcFAIRecordData data) { @@ -2134,7 +1905,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: FQC记录新增 + * FQC记录新增 **/ @Override @Transactional @@ -2163,88 +1934,12 @@ public class QcServiceImpl implements QcService { data.setInspectionCycle(partAttribute.get(0).getInspectionCycle()); } // 获取抽样数量 - // 如果该检验模板有维护抽样方案 - if (StringUtils.isNotBlank(partAttribute.get(0).getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(partAttribute.get(0).getSite()); - samplingInspectionProgrammeData.setBuNo(partAttribute.get(0).getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(partAttribute.get(0).getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(partAttribute.get(0).getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0) ) { - data.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (partAttribute.get(0).getDefaultSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - data.setSamplingQty(partAttribute.get(0).getDefaultSamplingQuantity()); - } else if (partAttribute.get(0).getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - data.setSamplingQty(partAttribute.get(0).getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP)); - } - - // 获取根据该检验模板下维护的检验项目 - QcTemplateData templateData = new QcTemplateData(); - templateData.setSite(data.getSite()); - templateData.setBuNo(data.getBuNo()); - templateData.setTemplateId(partAttribute.get(0).getTemplateId()); - templateData.setItemType("D"); - List itemList = qcMapper.templateDetailsSearch(templateData); - QcFAIRecordData faiRecordData = new QcFAIRecordData(); - faiRecordData.setSite(data.getSite()); // 工厂 - faiRecordData.setBuNo(data.getBuNo()); // BU - faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号 - faiRecordData.setOrderNo(data.getOrderNo()); // 工单号 - faiRecordData.setTemplateId(partAttribute.get(0).getTemplateId()); // 模板编码 - faiRecordData.setAql(partAttribute.get(0).getAql()); // aql - faiRecordData.setAc(partAttribute.get(0).getAc()); // ac - faiRecordData.setRe(partAttribute.get(0).getRe()); // re - for (QcTemplateData qcTemplateData : itemList) { - faiRecordData.setSamplingQty(null); - faiRecordData.setSamplingLevelNo(qcTemplateData.getSamplingLevelNo()); // 检验水平编码 - faiRecordData.setSamplingLevelDesc(qcTemplateData.getSamplingLevelDesc()); // 检验水平名称 - faiRecordData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); // 抽样方案编码 - faiRecordData.setSamplingProgrammeDesc(qcTemplateData.getSamplingProgrammeDesc()); // 抽样方案名称 - faiRecordData.setItemNo(qcTemplateData.getItemNo()); // 项目编码 - faiRecordData.setItemDesc(qcTemplateData.getItemDesc()); // 项目名称 - faiRecordData.setObjectId(qcTemplateData.getObjectID()); // 设备编码 - faiRecordData.setObjectDesc(qcTemplateData.getObjectDesc()); // 设备名称 - faiRecordData.setDefaultValue(qcTemplateData.getDefaultValue()); // 默认值 - faiRecordData.setMinValue(qcTemplateData.getMinValue()); // 最小值 - faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值 - faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型 - faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb()); - faiRecordData.setOrderId(qcTemplateData.getOrderId()); - // 获取抽样数量 - // 如果该检验项目有维护抽样方案 - if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(qcTemplateData.getSite()); - samplingInspectionProgrammeData.setBuNo(qcTemplateData.getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(qcTemplateData.getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0)) { - faiRecordData.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (qcTemplateData.getItemSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - faiRecordData.setSamplingQty(qcTemplateData.getItemSamplingQuantity()); - } else if (qcTemplateData.getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - faiRecordData.setSamplingQty(qcTemplateData.getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP)); - } else { - // 最后则根据检验单抽样数量赋值 - faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量 - } - // 新增FQC明细记录信息 - qcMapper.saveFQCDetailedRecord(faiRecordData); - } + BigDecimal samplingQty = getInspectionSamplingQty(partAttribute, data.getRollQty()); + data.setSamplingQty(samplingQty); + // 获取检验明细数据 + List faiRecordDataList = getInspectionDetails(partAttribute.get(0), data); + // 新增FQC明细记录信息 + qcMapper.saveFQCDetailedRecords(faiRecordDataList); } else { // 明细记录信息赋值 String partNo = data.getPartNo(); @@ -2265,88 +1960,12 @@ public class QcServiceImpl implements QcService { data.setInspectionCycle(partAttribute.get(0).getInspectionCycle()); } // 获取抽样数量 - // 如果该检验模板有维护抽样方案 - if (StringUtils.isNotBlank(partAttribute.get(0).getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(partAttribute.get(0).getSite()); - samplingInspectionProgrammeData.setBuNo(partAttribute.get(0).getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(partAttribute.get(0).getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(partAttribute.get(0).getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0) ) { - data.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (partAttribute.get(0).getDefaultSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - data.setSamplingQty(partAttribute.get(0).getDefaultSamplingQuantity()); - } else if (partAttribute.get(0).getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - data.setSamplingQty(partAttribute.get(0).getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP)); - } - - // 获取根据该检验模板下维护的检验项目 - QcTemplateData templateData = new QcTemplateData(); - templateData.setSite(data.getSite()); - templateData.setBuNo(data.getBuNo()); - templateData.setTemplateId(partAttribute.get(0).getTemplateId()); - templateData.setItemType("D"); - List itemList = qcMapper.templateDetailsSearch(templateData); - QcFAIRecordData faiRecordData = new QcFAIRecordData(); - faiRecordData.setSite(data.getSite()); // 工厂 - faiRecordData.setBuNo(data.getBuNo()); // BU - faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号 - faiRecordData.setOrderNo(data.getOrderNo()); // 工单号 - faiRecordData.setTemplateId(partAttribute.get(0).getTemplateId()); // 模板编码 - faiRecordData.setAql(partAttribute.get(0).getAql()); // aql - faiRecordData.setAc(partAttribute.get(0).getAc()); // ac - faiRecordData.setRe(partAttribute.get(0).getRe()); // re - for (QcTemplateData qcTemplateData : itemList) { - faiRecordData.setSamplingQty(null); - faiRecordData.setSamplingLevelNo(qcTemplateData.getSamplingLevelNo()); // 检验水平编码 - faiRecordData.setSamplingLevelDesc(qcTemplateData.getSamplingLevelDesc()); // 检验水平名称 - faiRecordData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); // 抽样方案编码 - faiRecordData.setSamplingProgrammeDesc(qcTemplateData.getSamplingProgrammeDesc()); // 抽样方案名称 - faiRecordData.setItemNo(qcTemplateData.getItemNo()); // 项目编码 - faiRecordData.setItemDesc(qcTemplateData.getItemDesc()); // 项目名称 - faiRecordData.setObjectId(qcTemplateData.getObjectID()); // 设备编码 - faiRecordData.setObjectDesc(qcTemplateData.getObjectDesc()); // 设备名称 - faiRecordData.setDefaultValue(qcTemplateData.getDefaultValue()); // 默认值 - faiRecordData.setMinValue(qcTemplateData.getMinValue()); // 最小值 - faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值 - faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型 - faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb()); - faiRecordData.setOrderId(qcTemplateData.getOrderId()); - // 获取抽样数量 - // 如果该检验项目有维护抽样方案 - if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(qcTemplateData.getSite()); - samplingInspectionProgrammeData.setBuNo(qcTemplateData.getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(qcTemplateData.getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0)) { - faiRecordData.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (qcTemplateData.getItemSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - faiRecordData.setSamplingQty(qcTemplateData.getItemSamplingQuantity()); - } else if (qcTemplateData.getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - faiRecordData.setSamplingQty(qcTemplateData.getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP)); - } else { - // 最后则根据检验单抽样数量赋值 - faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量 - } - // 新增FQC明细记录信息 - qcMapper.saveFQCDetailedRecord(faiRecordData); - } + BigDecimal samplingQty = getInspectionSamplingQty(partAttribute, data.getRollQty()); + data.setSamplingQty(samplingQty); + // 获取检验明细数据 + List faiRecordDataList = getInspectionDetails(partAttribute.get(0), data); + // 新增FQC明细记录信息 + qcMapper.saveFQCDetailedRecords(faiRecordDataList); } else { // 获取物料的类别编码 String familyId = qcMapper.selectFamilyIdByPartNo(partNo,data.getSite()); @@ -2359,88 +1978,12 @@ public class QcServiceImpl implements QcService { data.setInspectionCycle(familyAttribute.get(0).getInspectionCycle()); } // 获取抽样数量 - // 如果该检验模板有维护抽样方案 - if (StringUtils.isNotBlank(familyAttribute.get(0).getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(familyAttribute.get(0).getSite()); - samplingInspectionProgrammeData.setBuNo(familyAttribute.get(0).getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(familyAttribute.get(0).getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(familyAttribute.get(0).getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0) ){ - data.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (familyAttribute.get(0).getDefaultSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - data.setSamplingQty(familyAttribute.get(0).getDefaultSamplingQuantity()); - } else if (familyAttribute.get(0).getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - data.setSamplingQty(familyAttribute.get(0).getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP)); - } - - // 获取根据该检验模板下维护的检验项目 - QcTemplateData templateData = new QcTemplateData(); - templateData.setSite(data.getSite()); - templateData.setBuNo(data.getBuNo()); - templateData.setTemplateId(familyAttribute.get(0).getTemplateId()); - templateData.setItemType("D"); - List itemList = qcMapper.templateDetailsSearch(templateData); - QcFAIRecordData faiRecordData = new QcFAIRecordData(); - faiRecordData.setSite(data.getSite()); // 工厂 - faiRecordData.setBuNo(data.getBuNo()); // BU - faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号 - faiRecordData.setOrderNo(data.getOrderNo()); // 工单号 - faiRecordData.setTemplateId(familyAttribute.get(0).getTemplateId()); // 模板编码 - faiRecordData.setAql(familyAttribute.get(0).getAql()); // aql - faiRecordData.setAc(familyAttribute.get(0).getAc()); // ac - faiRecordData.setRe(familyAttribute.get(0).getRe()); // re - for (QcTemplateData qcTemplateData : itemList) { - faiRecordData.setSamplingQty(null); - faiRecordData.setSamplingLevelNo(qcTemplateData.getSamplingLevelNo()); // 检验水平编码 - faiRecordData.setSamplingLevelDesc(qcTemplateData.getSamplingLevelDesc()); // 检验水平名称 - faiRecordData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); // 抽样方案编码 - faiRecordData.setSamplingProgrammeDesc(qcTemplateData.getSamplingProgrammeDesc()); // 抽样方案名称 - faiRecordData.setItemNo(qcTemplateData.getItemNo()); // 项目编码 - faiRecordData.setItemDesc(qcTemplateData.getItemDesc()); // 项目名称 - faiRecordData.setObjectId(qcTemplateData.getObjectID()); // 设备编码 - faiRecordData.setObjectDesc(qcTemplateData.getObjectDesc()); // 设备名称 - faiRecordData.setDefaultValue(qcTemplateData.getDefaultValue()); // 默认值 - faiRecordData.setMinValue(qcTemplateData.getMinValue()); // 最小值 - faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值 - faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型 - faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb()); - faiRecordData.setOrderId(qcTemplateData.getOrderId()); - // 获取抽样数量 - // 如果该检验项目有维护抽样方案 - if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(qcTemplateData.getSite()); - samplingInspectionProgrammeData.setBuNo(qcTemplateData.getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(qcTemplateData.getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0)) { - faiRecordData.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (qcTemplateData.getItemSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - faiRecordData.setSamplingQty(qcTemplateData.getItemSamplingQuantity()); - } else if (qcTemplateData.getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - faiRecordData.setSamplingQty(qcTemplateData.getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP)); - } else { - // 最后则根据检验单抽样数量赋值 - faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量 - } - // 新增FQC明细记录信息 - qcMapper.saveFQCDetailedRecord(faiRecordData); - } + BigDecimal samplingQty = getInspectionSamplingQty(familyAttribute, data.getRollQty()); + data.setSamplingQty(samplingQty); + // 获取检验明细数据 + List faiRecordDataList = getInspectionDetails(familyAttribute.get(0), data); + // 新增FQC明细记录信息 + qcMapper.saveFQCDetailedRecords(faiRecordDataList); } } } @@ -2449,7 +1992,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: FQC明细记录查询 + * FQC明细记录查询 **/ @Override public List fqcDetailSearch(QcFAIRecordData data) { @@ -2458,7 +2001,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除FQC检验记录 + * 删除FQC检验记录 **/ @Override @Transactional @@ -2488,7 +2031,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 保存FQC检验记录 + * 保存FQC检验记录 **/ @Override @Transactional @@ -2542,7 +2085,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: FQC审核 + * FQC审核 **/ @Override @Transactional @@ -2565,7 +2108,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增FQC子明细 + * 新增FQC子明细 **/ @Override @Transactional @@ -2623,7 +2166,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 查询FQC子明细 + * 查询FQC子明细 **/ @Override public List selectFQCSubDetailedRecord(SubDetailValues data) { @@ -2638,7 +2181,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 检查是否已提交 + * 检查是否已提交 **/ @Override public Integer checkFQCIsSubmit(SubDetailValues data) { @@ -2651,7 +2194,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 检查FQC子明细中的实测值是否在规定范围 + * 检查FQC子明细中的实测值是否在规定范围 **/ @Override public Integer checkFQCSubDetailValue(CheckSubDetailValueVo data) { @@ -2668,7 +2211,7 @@ public class QcServiceImpl implements QcService { // ======================= IPQC检验维护 ======================= /** - * @description: IPQC检验记录查询 + * IPQC检验记录查询 **/ @Override @Transactional @@ -2679,7 +2222,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 检查动控是否开启 + * 检查动控是否开启 **/ @Override public List queryController(SysSceneDynamicControlModelEntity data) { @@ -2688,7 +2231,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 获取检验模板列表 + * 获取检验模板列表 **/ @Override public List queryTemplateList(QcTemplateData data) { @@ -2704,7 +2247,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增IPQC记录 + * 新增IPQC记录 **/ @Override @Transactional @@ -2733,88 +2276,12 @@ public class QcServiceImpl implements QcService { data.setInspectionCycle(partAttribute.get(0).getInspectionCycle()); } // 获取抽样数量 - // 如果该检验模板有维护抽样方案 - if (StringUtils.isNotBlank(partAttribute.get(0).getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(partAttribute.get(0).getSite()); - samplingInspectionProgrammeData.setBuNo(partAttribute.get(0).getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(partAttribute.get(0).getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(partAttribute.get(0).getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0) ){ - data.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (partAttribute.get(0).getDefaultSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - data.setSamplingQty(partAttribute.get(0).getDefaultSamplingQuantity()); - } else if (partAttribute.get(0).getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - data.setSamplingQty(partAttribute.get(0).getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP)); - } - - // 获取根据该检验模板下维护的检验项目 - QcTemplateData templateData = new QcTemplateData(); - templateData.setSite(data.getSite()); - templateData.setBuNo(data.getBuNo()); - templateData.setTemplateId(partAttribute.get(0).getTemplateId()); - templateData.setItemType("D"); - List itemList = qcMapper.templateDetailsSearch(templateData); - QcFAIRecordData faiRecordData = new QcFAIRecordData(); - faiRecordData.setSite(data.getSite()); // 工厂 - faiRecordData.setBuNo(data.getBuNo()); // BU - faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号 - faiRecordData.setOrderNo(data.getOrderNo()); // 工单号 - faiRecordData.setTemplateId(partAttribute.get(0).getTemplateId()); // 模板编码 - faiRecordData.setAql(partAttribute.get(0).getAql()); // aql - faiRecordData.setAc(partAttribute.get(0).getAc()); // ac - faiRecordData.setRe(partAttribute.get(0).getRe()); // re - for (QcTemplateData qcTemplateData : itemList) { - faiRecordData.setSamplingQty(null); - faiRecordData.setSamplingLevelNo(qcTemplateData.getSamplingLevelNo()); // 检验水平编码 - faiRecordData.setSamplingLevelDesc(qcTemplateData.getSamplingLevelDesc()); // 检验水平名称 - faiRecordData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); // 抽样方案编码 - faiRecordData.setSamplingProgrammeDesc(qcTemplateData.getSamplingProgrammeDesc()); // 抽样方案名称 - faiRecordData.setItemNo(qcTemplateData.getItemNo()); // 项目编码 - faiRecordData.setItemDesc(qcTemplateData.getItemDesc()); // 项目名称 - faiRecordData.setObjectId(qcTemplateData.getObjectID()); // 设备编码 - faiRecordData.setObjectDesc(qcTemplateData.getObjectDesc()); // 设备名称 - faiRecordData.setDefaultValue(qcTemplateData.getDefaultValue()); // 默认值 - faiRecordData.setMinValue(qcTemplateData.getMinValue()); // 最小值 - faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值 - faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型 - faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb()); - faiRecordData.setOrderId(qcTemplateData.getOrderId()); - // 获取抽样数量 - // 如果该检验项目有维护抽样方案 - if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(qcTemplateData.getSite()); - samplingInspectionProgrammeData.setBuNo(qcTemplateData.getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(qcTemplateData.getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0)) { - faiRecordData.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (qcTemplateData.getItemSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - faiRecordData.setSamplingQty(qcTemplateData.getItemSamplingQuantity()); - } else if (qcTemplateData.getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - faiRecordData.setSamplingQty(qcTemplateData.getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP)); - } else { - // 最后则根据检验单抽样数量赋值 - faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量 - } - // 新增IPQC明细记录信息 - qcMapper.saveIPQCDetailedRecord(faiRecordData); - } + BigDecimal samplingQty = getInspectionSamplingQty(partAttribute, data.getRollQty()); + data.setSamplingQty(samplingQty); + // 获取检验明细数据 + List faiRecordDataList = getInspectionDetails(partAttribute.get(0), data); + // 新增IPQC明细记录信息 + qcMapper.saveIPQCDetailedRecords(faiRecordDataList); } else { // 动控未开启 // 明细记录信息赋值 String partNo = data.getPartNo(); @@ -2835,89 +2302,12 @@ public class QcServiceImpl implements QcService { data.setInspectionCycle(partAttribute.get(0).getInspectionCycle()); } // 获取抽样数量 - // 如果该检验模板有维护抽样方案 - if (StringUtils.isNotBlank(partAttribute.get(0).getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(partAttribute.get(0).getSite()); - samplingInspectionProgrammeData.setBuNo(partAttribute.get(0).getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(partAttribute.get(0).getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(partAttribute.get(0).getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0) ){ - data.setSamplingQty(programmeData.getSamplingQty()); - } - } - } - else if (partAttribute.get(0).getDefaultSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - data.setSamplingQty(partAttribute.get(0).getDefaultSamplingQuantity()); - } else if (partAttribute.get(0).getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - data.setSamplingQty(partAttribute.get(0).getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP)); - } - - // 获取根据该检验模板下维护的检验项目 - QcTemplateData templateData = new QcTemplateData(); - templateData.setSite(data.getSite()); - templateData.setBuNo(data.getBuNo()); - templateData.setTemplateId(partAttribute.get(0).getTemplateId()); - templateData.setItemType("D"); - List itemList = qcMapper.templateDetailsSearch(templateData); - QcFAIRecordData faiRecordData = new QcFAIRecordData(); - faiRecordData.setSite(data.getSite()); // 工厂 - faiRecordData.setBuNo(data.getBuNo()); // BU - faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号 - faiRecordData.setOrderNo(data.getOrderNo()); // 工单号 - faiRecordData.setTemplateId(partAttribute.get(0).getTemplateId()); // 模板编码 - faiRecordData.setAql(partAttribute.get(0).getAql()); // aql - faiRecordData.setAc(partAttribute.get(0).getAc()); // ac - faiRecordData.setRe(partAttribute.get(0).getRe()); // re - for (QcTemplateData qcTemplateData : itemList) { - faiRecordData.setSamplingQty(null); - faiRecordData.setSamplingLevelNo(qcTemplateData.getSamplingLevelNo()); // 检验水平编码 - faiRecordData.setSamplingLevelDesc(qcTemplateData.getSamplingLevelDesc()); // 检验水平名称 - faiRecordData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); // 抽样方案编码 - faiRecordData.setSamplingProgrammeDesc(qcTemplateData.getSamplingProgrammeDesc()); // 抽样方案名称 - faiRecordData.setItemNo(qcTemplateData.getItemNo()); // 项目编码 - faiRecordData.setItemDesc(qcTemplateData.getItemDesc()); // 项目名称 - faiRecordData.setObjectId(qcTemplateData.getObjectID()); // 设备编码 - faiRecordData.setObjectDesc(qcTemplateData.getObjectDesc()); // 设备名称 - faiRecordData.setDefaultValue(qcTemplateData.getDefaultValue()); // 默认值 - faiRecordData.setMinValue(qcTemplateData.getMinValue()); // 最小值 - faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值 - faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型 - faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb()); - faiRecordData.setOrderId(qcTemplateData.getOrderId()); - // 获取抽样数量 - // 如果该检验项目有维护抽样方案 - if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(qcTemplateData.getSite()); - samplingInspectionProgrammeData.setBuNo(qcTemplateData.getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(qcTemplateData.getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0)) { - faiRecordData.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (qcTemplateData.getItemSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - faiRecordData.setSamplingQty(qcTemplateData.getItemSamplingQuantity()); - } else if (qcTemplateData.getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - faiRecordData.setSamplingQty(qcTemplateData.getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP)); - } else { - // 最后则根据检验单抽样数量赋值 - faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量 - } - // 新增IPQC明细记录信息 - qcMapper.saveIPQCDetailedRecord(faiRecordData); - } + BigDecimal samplingQty = getInspectionSamplingQty(partAttribute, data.getRollQty()); + data.setSamplingQty(samplingQty); + // 获取检验明细数据 + List faiRecordDataList = getInspectionDetails(partAttribute.get(0), data); + // 新增IPQC明细记录信息 + qcMapper.saveIPQCDetailedRecords(faiRecordDataList); } else { // 获取物料的类别编码 String familyId = qcMapper.selectFamilyIdByPartNo(partNo,data.getSite()); @@ -2930,88 +2320,12 @@ public class QcServiceImpl implements QcService { data.setInspectionCycle(familyAttribute.get(0).getInspectionCycle()); } // 获取抽样数量 - // 如果该检验模板有维护抽样方案 - if (StringUtils.isNotBlank(familyAttribute.get(0).getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(familyAttribute.get(0).getSite()); - samplingInspectionProgrammeData.setBuNo(familyAttribute.get(0).getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(familyAttribute.get(0).getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(familyAttribute.get(0).getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0) ){ - data.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (familyAttribute.get(0).getDefaultSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - data.setSamplingQty(familyAttribute.get(0).getDefaultSamplingQuantity()); - } else if (familyAttribute.get(0).getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - data.setSamplingQty(familyAttribute.get(0).getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP)); - } - - // 获取根据该检验模板下维护的检验项目 - QcTemplateData templateData = new QcTemplateData(); - templateData.setSite(data.getSite()); - templateData.setBuNo(data.getBuNo()); - templateData.setTemplateId(familyAttribute.get(0).getTemplateId()); - templateData.setItemType("D"); - List itemList = qcMapper.templateDetailsSearch(templateData); - QcFAIRecordData faiRecordData = new QcFAIRecordData(); - faiRecordData.setSite(data.getSite()); // 工厂 - faiRecordData.setBuNo(data.getBuNo()); // BU - faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号 - faiRecordData.setOrderNo(data.getOrderNo()); // 工单号 - faiRecordData.setTemplateId(familyAttribute.get(0).getTemplateId()); // 模板编码 - faiRecordData.setAql(familyAttribute.get(0).getAql()); // aql - faiRecordData.setAc(familyAttribute.get(0).getAc()); // ac - faiRecordData.setRe(familyAttribute.get(0).getRe()); // re - for (QcTemplateData qcTemplateData : itemList) { - faiRecordData.setSamplingQty(null); - faiRecordData.setSamplingLevelNo(qcTemplateData.getSamplingLevelNo()); // 检验水平编码 - faiRecordData.setSamplingLevelDesc(qcTemplateData.getSamplingLevelDesc()); // 检验水平名称 - faiRecordData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); // 抽样方案编码 - faiRecordData.setSamplingProgrammeDesc(qcTemplateData.getSamplingProgrammeDesc()); // 抽样方案名称 - faiRecordData.setItemNo(qcTemplateData.getItemNo()); // 项目编码 - faiRecordData.setItemDesc(qcTemplateData.getItemDesc()); // 项目名称 - faiRecordData.setObjectId(qcTemplateData.getObjectID()); // 设备编码 - faiRecordData.setObjectDesc(qcTemplateData.getObjectDesc()); // 设备名称 - faiRecordData.setDefaultValue(qcTemplateData.getDefaultValue()); // 默认值 - faiRecordData.setMinValue(qcTemplateData.getMinValue()); // 最小值 - faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值 - faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型 - faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb()); - faiRecordData.setOrderId(qcTemplateData.getOrderId()); - // 获取抽样数量 - // 如果该检验项目有维护抽样方案 - if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(qcTemplateData.getSite()); - samplingInspectionProgrammeData.setBuNo(qcTemplateData.getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); - // 获取抽样方案维护的矩阵详情 - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - // 根据抽样方案确定抽样数 - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(qcTemplateData.getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0)) { - faiRecordData.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (qcTemplateData.getItemSamplingQuantity() != null) { - // 没有维护抽样方案，再根据默认抽样数来确定 - faiRecordData.setSamplingQty(qcTemplateData.getItemSamplingQuantity()); - } else if (qcTemplateData.getDefaultSamplingProportion() != null) { - // 也没有维护默认抽样数，最后根据默认抽样比例来确定 - faiRecordData.setSamplingQty(qcTemplateData.getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP)); - } else { - // 最后则根据检验单抽样数量赋值 - faiRecordData.setSamplingQty(data.getSamplingQty()); // 抽样数量 - } - // 新增IPQC明细记录信息 - qcMapper.saveIPQCDetailedRecord(faiRecordData); - } + BigDecimal samplingQty = getInspectionSamplingQty(familyAttribute, data.getRollQty()); + data.setSamplingQty(samplingQty); + // 获取检验明细数据 + List faiRecordDataList = getInspectionDetails(familyAttribute.get(0), data); + // 新增IPQC明细记录信息 + qcMapper.saveIPQCDetailedRecords(faiRecordDataList); } } } @@ -3033,7 +2347,7 @@ public class QcServiceImpl implements QcService { /** - * @description: IPQC明细记录查询 + * IPQC明细记录查询 **/ @Override public List ipqcDetailSearch(QcFAIRecordData data) { @@ -3042,7 +2356,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除IPQC检验记录 + * 删除IPQC检验记录 **/ @Override @Transactional @@ -3072,7 +2386,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 保存IPQC检验记录 + * 保存IPQC检验记录 **/ @Override @Transactional @@ -3126,7 +2440,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: IPQC审核 + * IPQC审核 **/ @Override @Transactional @@ -3149,7 +2463,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增IPQC子明细信息 + * 新增IPQC子明细信息 **/ @Override @Transactional @@ -3208,7 +2522,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 查询IPQC子明细 + * 查询IPQC子明细 **/ @Override public List selectIPQCSubDetailedRecord(SubDetailValues data) { @@ -3223,7 +2537,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 检查IPQC是否已提交 + * 检查IPQC是否已提交 **/ @Override public Integer checkIPQCIsSubmit(SubDetailValues data) { @@ -3236,7 +2550,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 检查IPQC子明细中的实测值是否在规定范围 + * 检查IPQC子明细中的实测值是否在规定范围 **/ @Override public Integer checkIPQCSubDetailValue(CheckSubDetailValueVo data) { @@ -3251,7 +2565,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 查询工序列表 + * 查询工序列表 **/ @Override public List getOperationList(QcFAIRecordData data) { @@ -3273,7 +2587,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 查询机台列表 + * 查询机台列表 **/ @Override public List getResourceList(QcFAIRecordData data) { @@ -3283,7 +2597,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 查询物料列表 + * 查询物料列表 **/ @Override public List getPartList(QcFAIRecordData data) { @@ -3295,7 +2609,7 @@ public class QcServiceImpl implements QcService { // ======================= IQC检验维护 ======================= /** - * @description: IQC检验记录查询 + * IQC检验记录查询 **/ @Override @Transactional @@ -3323,8 +2637,6 @@ public class QcServiceImpl implements QcService { // 删除文件 qcMapper.deleteInspectionFiles(recordData); -// // 修改detailFlag字段为N -// qcMapper.updateIQCDetailFlag(qcData); // 拿到供应商编码 String supplierNo = ""; if (StringUtils.isNotBlank(recordData.getSupplierNo())) { @@ -3529,7 +2841,113 @@ public class QcServiceImpl implements QcService { } /** - * @description: iqc检验记录查询 + * 获取抽样数量 + */ + public BigDecimal getInspectionSamplingQty(List partAttribute, BigDecimal rollQty) { + QcFAIRecordData firstPart = partAttribute.get(0); + BigDecimal samplingQty = null; + // 如果该检验模板有维护抽样方案 + if (StringUtils.isNotBlank(firstPart.getSamplingProgrammeNo())) { + QcSamplingInspectionProgrammeData searchCriteria = new QcSamplingInspectionProgrammeData(); + searchCriteria .setSite(firstPart.getSite()); + searchCriteria .setBuNo(firstPart.getBuNo()); + searchCriteria .setSamplingProgrammeNo(firstPart.getSamplingProgrammeNo()); + // 获取抽样方案维护的矩阵详情 + List dataList = qcMapper.searchSamplingProgrammeDetails(searchCriteria); + // 根据抽样方案确定抽样数 + for (QcSamplingInspectionProgrammeData programmeData : dataList) { + if (programmeData.getSamplingLevelNo().equals(firstPart.getSamplingLevelNo()) && (rollQty.compareTo(programmeData.getMinQty()) > 0 || rollQty.compareTo(programmeData.getMinQty()) == 0) && (rollQty.compareTo(programmeData.getMaxQty()) < 0 || rollQty.compareTo(programmeData.getMaxQty()) == 0) ){ + samplingQty = programmeData.getSamplingQty(); + break; + } + } + } + // 没有维护抽样方案，再根据默认抽样数来确定 + if (samplingQty == null && firstPart.getDefaultSamplingQuantity() != null) { + samplingQty = firstPart.getDefaultSamplingQuantity(); + } + // 也没有维护默认抽样数，最后根据默认抽样比例来确定 + if (samplingQty == null && firstPart.getDefaultSamplingProportion() != null) { + samplingQty = firstPart.getDefaultSamplingProportion().multiply(rollQty).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP); + } + return samplingQty; + } + + /** + * 获取检验明细数据 + */ + public List getInspectionDetails(QcFAIRecordData firstPart, QcFAIRecordData data) { + // 获取根据该检验模板下维护的检验项目 + QcTemplateData templateData = new QcTemplateData(); + templateData.setSite(data.getSite()); + templateData.setBuNo(data.getBuNo()); + templateData.setTemplateId(firstPart.getTemplateId()); + templateData.setItemType("D"); + List itemList = qcMapper.templateDetailsSearch(templateData); + List faiRecordDataList = new ArrayList<>(); + for (QcTemplateData qcTemplateData : itemList) { + QcFAIRecordData faiRecordData = new QcFAIRecordData(); + faiRecordData.setSite(data.getSite()); // 工厂 + faiRecordData.setBuNo(data.getBuNo()); // BU + faiRecordData.setInspectionNo(data.getInspectionNo()); // 检验单号 + faiRecordData.setOrderNo(data.getOrderNo()); // 工单号 + faiRecordData.setTemplateId(firstPart.getTemplateId()); // 模板编码 + faiRecordData.setAql(firstPart.getAql()); // aql + faiRecordData.setAc(firstPart.getAc()); // ac + faiRecordData.setRe(firstPart.getRe()); // re + faiRecordData.setSamplingQty(null); + faiRecordData.setSamplingLevelNo(qcTemplateData.getSamplingLevelNo()); // 检验水平编码 + faiRecordData.setSamplingLevelDesc(qcTemplateData.getSamplingLevelDesc()); // 检验水平名称 + faiRecordData.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); // 抽样方案编码 + faiRecordData.setSamplingProgrammeDesc(qcTemplateData.getSamplingProgrammeDesc()); // 抽样方案名称 + faiRecordData.setItemNo(qcTemplateData.getItemNo()); // 项目编码 + faiRecordData.setItemDesc(qcTemplateData.getItemDesc()); // 项目名称 + faiRecordData.setObjectId(qcTemplateData.getObjectID()); // 设备编码 + faiRecordData.setObjectDesc(qcTemplateData.getObjectDesc()); // 设备名称 + faiRecordData.setDefaultValue(qcTemplateData.getDefaultValue()); // 默认值 + faiRecordData.setMinValue(qcTemplateData.getMinValue()); // 最小值 + faiRecordData.setMaxValue(qcTemplateData.getMaxValue()); // 最大值 + faiRecordData.setValueType(qcTemplateData.getValueType()); // 检测值类型 + faiRecordData.setValueTypeDb(qcTemplateData.getValueTypeDb()); + faiRecordData.setOrderId(qcTemplateData.getOrderId()); + // 获取抽样数量 + // 如果该检验项目有维护抽样方案 + BigDecimal samplingQty = null; + if (StringUtils.isNotBlank(qcTemplateData.getSamplingProgrammeNo())) { + QcSamplingInspectionProgrammeData searchCriteria = new QcSamplingInspectionProgrammeData(); + searchCriteria.setSite(qcTemplateData.getSite()); + searchCriteria.setBuNo(qcTemplateData.getBuNo()); + searchCriteria.setSamplingProgrammeNo(qcTemplateData.getSamplingProgrammeNo()); + // 获取抽样方案维护的矩阵详情 + List dataList = qcMapper.searchSamplingProgrammeDetails(searchCriteria); + // 根据抽样方案确定抽样数 + for (QcSamplingInspectionProgrammeData programmeData : dataList) { + if (programmeData.getSamplingLevelNo().equals(qcTemplateData.getSamplingLevelNo()) && (data.getRollQty().compareTo(programmeData.getMinQty()) > 0 || data.getRollQty().compareTo(programmeData.getMinQty()) == 0) && (data.getRollQty().compareTo(programmeData.getMaxQty()) < 0 || data.getRollQty().compareTo(programmeData.getMaxQty()) == 0)) { + samplingQty = programmeData.getSamplingQty(); + break; + } + } + } + // 没有维护抽样方案，再根据默认抽样数来确定 + if (samplingQty == null && qcTemplateData.getItemSamplingQuantity() != null) { + samplingQty = qcTemplateData.getItemSamplingQuantity(); + } + // 也没有维护默认抽样数，最后根据默认抽样比例来确定 + if (samplingQty == null && qcTemplateData.getDefaultSamplingProportion() != null) { + samplingQty = qcTemplateData.getDefaultSamplingProportion().multiply(data.getRollQty()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP); + } + // 最后则根据检验单抽样数量赋值 + if (samplingQty == null) { + samplingQty = data.getSamplingQty(); + } + faiRecordData.setSamplingQty(samplingQty); + faiRecordDataList.add(faiRecordData); + } + return faiRecordDataList; + } + + /** + * iqc检验记录查询 **/ @Override public List iqcDetailSearch(QcFAIRecordData data) { @@ -3538,7 +2956,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 查询IQC子明细记录 + * 查询IQC子明细记录 **/ @Override public List selectIQCSubDetailedRecord(SubDetailValues data) { @@ -3553,7 +2971,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 检查子明细中的实测值是否在规定范围 + * 检查子明细中的实测值是否在规定范围 **/ @Override public Integer checkIQCSubDetailValue(CheckSubDetailValueVo data) { @@ -3568,7 +2986,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增明细信息 + * 新增明细信息 **/ @Override @Transactional @@ -3622,7 +3040,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 检查是否已提交 + * 检查是否已提交 **/ @Override public Integer checkIQCIsSubmit(SubDetailValues data) { @@ -3635,7 +3053,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 新增子明细信息 + * 新增子明细信息 **/ @Override @Transactional @@ -3694,7 +3112,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 审核 + * 审核 **/ @Override @Transactional @@ -3786,7 +3204,6 @@ public class QcServiceImpl implements QcService { /** * 取消审核 - * @param data */ @Override @Transactional @@ -3816,7 +3233,6 @@ public class QcServiceImpl implements QcService { /** * 取消审核 - * @param data */ @Override @Transactional @@ -3858,7 +3274,6 @@ public class QcServiceImpl implements QcService { if ("不合格".equals(data.getInspectionResult())) { // 获取数据库设置的邮件接收地址 MailAddressData qc = qcMapper.getSendMailAddress(data.getSite(), type, ""); - //List collect = data.getItemList().stream().filter(a -> "N".equals(a.getItemResult())).map(QcFAIRecordData::getItemDesc).collect(Collectors.toList()); if (qc != null) { List params = new ArrayList<>(); params.add(data.getSite()); @@ -4003,7 +3418,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 查询文件ID + * 查询文件ID **/ @Override public SysOssEntity queryFileId(SysOssEntity data) { @@ -4015,7 +3430,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 获取工序列表 + * 获取工序列表 **/ @Override public List getOperationDescList(QcPartAttributeData data) { @@ -4024,7 +3439,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 获取供应商列表 + * 获取供应商列表 **/ @Override public List getManufacturerList(QcPartAttributeData data) { @@ -4033,7 +3448,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 获取所有机台 + * 获取所有机台 **/ @Override public List getAllResourceList(QcFAIRecordData data) { @@ -4042,7 +3457,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 获取工单列表 + * 获取工单列表 **/ @Override public List getOrderNoList(QcFAIRecordData data) { @@ -4051,7 +3466,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 获取物料其它信息 + * 获取物料其它信息 **/ @Override public List getPartInformation(QcFAIRecordData data) { @@ -4060,7 +3475,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 获取特殊工序列表 + * 获取特殊工序列表 **/ @Override public List getSpecialOperationList(QcFAIRecordData data) { @@ -4076,7 +3491,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 获取处置措施列表 + * 获取处置措施列表 **/ @Override public List disposalMeasuresSearch(QcFAIRecordData data) { @@ -4085,7 +3500,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 查询文件路径 + * 查询文件路径 **/ @Override public List searchItemFileUrl(QcFAIRecordData data) { @@ -4099,7 +3514,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 删除图片 + * 删除图片 **/ @Override public void imageDelete(SysOssEntity data) { @@ -4107,7 +3522,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 模糊查询标签号 + * 模糊查询标签号 **/ @Override public List getRollNo(QcFAIRecordData data) { @@ -4116,7 +3531,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 标签号回车事件 + * 标签号回车事件 **/ @Override public List rollNoEnter(QcFAIRecordData data) { @@ -4135,7 +3550,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 查询物料集合 + * 查询物料集合 **/ @Override public List queryPartList(QcFAIRecordData data) { @@ -4151,7 +3566,7 @@ public class QcServiceImpl implements QcService { } /** - * @description: 查询单位列表 + * 查询单位列表 **/ @Override public List umSearch(QcFAIRecordData data) { @@ -4233,11 +3648,6 @@ public class QcServiceImpl implements QcService { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); stringValue = dateFormat.format(dateValue); } else { -// // 数字格式化 -// double numericValue = cell.getNumericCellValue(); -// BigDecimal bigDecimalValue = BigDecimal.valueOf(numericValue); -// DecimalFormat decimalFormat = new DecimalFormat("#.####"); // 保留四位小数 -// stringValue = decimalFormat.format(bigDecimalValue); // 使用 DataFormatter 获取实际显示值 stringValue = formatter.formatCellValue(cell); } @@ -4262,8 +3672,6 @@ public class QcServiceImpl implements QcService { stringValue = "Unknown Type"; } task.setSubDetailValue(stringValue); -// row.getCell(3).setCellType(CellType.STRING); -// task.setSubDetailValue(row.getCell(3).getStringCellValue()); // map中是否已存在该key if (!countMap.containsKey(task.getItemNo())) { // 没有则新建并赋初始值 countMap.put(task.getItemNo(), 0); @@ -4327,9 +3735,6 @@ public class QcServiceImpl implements QcService { /** * 文件上传 - * @param list - * @param inData - * @return */ @Override public List upload(MultipartFile[] list, GetParamInData inData) { @@ -4406,7 +3811,6 @@ public class QcServiceImpl implements QcService { /** * 获取采购类型 - * @return */ @Override public List orderTypeSearch() { @@ -4416,15 +3820,12 @@ public class QcServiceImpl implements QcService { /** * 开始检验 - * @param data */ @Override @Transactional public void actionIQCInspection(EamObjectInData data) { // 修改检验单状态为待检验 qcMapper.actionIQCInspection(data); -// // 查出该检验单的项目 -// List list = qcMapper.getIQCDetail(data); // 将用户名和检验单号存入Equipment_data_acquisition if (!data.getEquipmentList().isEmpty()) { List collect = data.getEquipmentList().stream().map(a -> { @@ -4437,15 +3838,12 @@ public class QcServiceImpl implements QcService { /** * 开始检验 - * @param data */ @Override @Transactional public void actionFAIInspection(EamObjectInData data) { // 修改检验单状态为待检验 qcMapper.actionFAIInspection(data); -// // 查出该检验单的项目 -// List list = qcMapper.getFAIDetail(data); // 将用户名和检验单号存入Equipment_data_acquisition if (!data.getEquipmentList().isEmpty()) { List collect = data.getEquipmentList().stream().map(a -> { @@ -4458,15 +3856,12 @@ public class QcServiceImpl implements QcService { /** * 开始检验 - * @param data */ @Override @Transactional public void actionIPQCInspection(EamObjectInData data) { // 修改检验单状态为待检验 qcMapper.actionIPQCInspection(data); -// // 查出该检验单的项目 -// List list = qcMapper.getIPQCDetail(data); // 将用户名和检验单号存入Equipment_data_acquisition if (!data.getEquipmentList().isEmpty()) { List collect = data.getEquipmentList().stream().map(a -> { @@ -4479,15 +3874,12 @@ public class QcServiceImpl implements QcService { /** * 开始检验 - * @param data */ @Override @Transactional public void actionFQCInspection(EamObjectInData data) { // 修改检验单状态为待检验 qcMapper.actionFQCInspection(data); -// // 查出该检验单的项目 -// List list = qcMapper.getFQCDetail(data); // 将用户名和检验单号存入Equipment_data_acquisition if (!data.getEquipmentList().isEmpty()) { List collect = data.getEquipmentList().stream().map(a -> { @@ -4500,7 +3892,6 @@ public class QcServiceImpl implements QcService { /** * 数据采集 - * @param data */ @Override @Transactional @@ -4528,117 +3919,6 @@ public class QcServiceImpl implements QcService { throw new XJException(msg, Integer.parseInt(code)); } } - -// List subDetailList = new LinkedList<>(); -// List fileList = new ArrayList<>(); -// for (EquipmentDataAcquisitionData acquisitionData : noList) { -// // 查检验项目的过滤条件 -// SubDetailValues values = new SubDetailValues(); -// values.setSite(acquisitionData.getSite()); -// values.setBuNo(acquisitionData.getBuNo()); -// values.setItemNo(acquisitionData.getItemNo()); -// String collectionDataContent = qcMapper.getItemCollectionDataContent(values); -// // 临时对象 -// EquipmentDataAcquisitionData tempAcquisitionData = new EquipmentDataAcquisitionData(); -// BeanUtils.copyProperties(acquisitionData,tempAcquisitionData); -// tempAcquisitionData.setCollectionDataContent(collectionDataContent); -// // 循环数据采集来源 -// int type = 0; -// for (int i = 0; i < acquisitionData.getCollectionSource().split(",").length; i++) { -// // 数据采集来源 -// tempAcquisitionData.setCollectionSource(acquisitionData.getCollectionSource().split(",")[i]); -// // 数据采集方式 -// if (tempAcquisitionData.getCollectionSource().startsWith("value")) { // 如果采集来源是以"value"开头则采集方式使用文件数据采集(file) -// if (tempAcquisitionData.getCollectionMethod().contains("plc")) { -// tempAcquisitionData.setCollectionMethod("plc"); -// } else if (tempAcquisitionData.getCollectionMethod().contains("RS232")) { -// tempAcquisitionData.setCollectionMethod("RS232"); -// } else { -// tempAcquisitionData.setCollectionMethod("file"); -// } -// } else if ("photo_value1".equals(tempAcquisitionData.getCollectionSource())){ // // 如果采集来源是"photo_value1"开头则采集方式使用文件数据采集(image) -// tempAcquisitionData.setCollectionMethod("image"); -// } else if ("file_value1".equals(tempAcquisitionData.getCollectionSource())){ // // 如果采集来源是"file_value1"开头则采集方式使用文件数据采集(fileUrl) -// tempAcquisitionData.setCollectionMethod("fileUrl"); -// } -// // 设备号 -// tempAcquisitionData.setEquipmentNo(acquisitionData.getEquipmentNo()); -// if ("file".equals(tempAcquisitionData.getCollectionMethod()) || "plc".equals(tempAcquisitionData.getCollectionMethod()) || "RS232".equals(tempAcquisitionData.getCollectionMethod())) { -// // 文件数据采集 -// if (tempAcquisitionData.getCollectionSource().startsWith("value")) { -// tempAcquisitionData.setSubDetailValueType(type); -// type++; -// } -// List dataList = qcMapper.dataAcquisition(tempAcquisitionData); -// subDetailList.addAll(dataList); -// } else if ("image".equals(tempAcquisitionData.getCollectionMethod()) || "fileUrl".equals(tempAcquisitionData.getCollectionMethod())) { -// // 图片采集 -// List dataList2 = qcMapper.dataAcquisition2(tempAcquisitionData); -// List collect = dataList2.stream().map(a -> { -// a.setFileName(a.getUrl().split("\\$")[1]); -// a.setNewFileName(a.getUrl().split("\\\\")[a.getUrl().split("\\\\").length-1]); -// return a; -// }).collect(Collectors.toList()); -// fileList.addAll(collect); -// } -// } -// } -// if (subDetailList.isEmpty()) { -// throw new RuntimeException("未采集到数据信息!"); -// } -// -// // 整合实测值A和实测值B -// List groupCannotBeEmpty = subDetailList.stream() -// .collect(Collectors.groupingBy(a -> new AbstractMap.SimpleEntry<>(a.getItemNo(), a.getNum()))) -// .values().stream() -// .map(userList -> userList.stream() -// .reduce((u1, u2) -> { -// SubDetailValues result = new SubDetailValues(data.getSite(), data.getBuNo(), data.getInspectionNo(), u1.getItemNo(), u1.getNum(), -// u1.getSubDetailValue() != null ? u1.getSubDetailValue() : u2.getSubDetailValue(), -// u1.getSubDetailValueB() != null ? u1.getSubDetailValueB() : u2.getSubDetailValueB(), -// u1.getSubDetailValueC() != null ? u1.getSubDetailValueC() : u2.getSubDetailValueC(), -// u1.getSubDetailValueD() != null ? u1.getSubDetailValueD() : u2.getSubDetailValueD(), -// u1.getSubDetailValueE() != null ? u1.getSubDetailValueE() : u2.getSubDetailValueE()); -// return result; -// }) -// .orElseThrow(() -> new IllegalStateException("Group cannot be empty"))) -// .collect(Collectors.toList()); -// -// // 分批插入 -// int batchSize = 150; // 假设每批200条记录 -// for (int i = 0; i < groupCannotBeEmpty.size(); i += batchSize) { -// int end = Math.min(i + batchSize, groupCannotBeEmpty.size()); -// List subList = groupCannotBeEmpty.subList(i, end); -// // 新增数据采集信息 -// if ("iqc".equals(data.getFlag())) { -// qcMapper.saveIQCSubDetailed(subList); -// } else if ("ipqc".equals(data.getFlag())) { -// qcMapper.saveIPQCSubDetailed(subList); -// } else if ("fqc".equals(data.getFlag())) { -// qcMapper.saveFQCSubDetailed(subList); -// } else if ("fai".equals(data.getFlag())) { -// qcMapper.saveFAISubDetailed(subList); -// } -// } -// -// // 新增图片采集信息 -// if (!fileList.isEmpty()) { -// int batchSize2 = 150; -// for (int i = 0; i < fileList.size(); i += batchSize2) { -// int end = Math.min(i + batchSize2, fileList.size()); -// List subFileList = fileList.subList(i, end); -// qcMapper.saveFileList(subFileList); -// } -// } -// -// // 修改数据采集方式为 "RS232" 的 inspectionNo -// List rsList = subDetailList.stream().filter(a -> "RS232".equals(a.getCollectionMethod())).collect(Collectors.toList()); -// if (!rsList.isEmpty()) { -// for (SubDetailValues detailValues : rsList) { -// qcMapper.updateEquipmentDataDetailInspectionNo(detailValues); -// } -// } - // 判断是否合格 // 获取检验单使用的模板中的项目 List templateDetails = qcMapper.getInspectionTemplateDetail(data); @@ -4710,8 +3990,6 @@ public class QcServiceImpl implements QcService { /** * 根据项目采集数据 - * @param data - * @return */ @Override @Transactional @@ -4739,118 +4017,6 @@ public class QcServiceImpl implements QcService { throw new XJException(msg, Integer.parseInt(code)); } } - -// List subDetailList = new LinkedList<>(); -// List fileList = new ArrayList<>(); -// for (EquipmentDataAcquisitionData acquisitionData : noList) { -// // 查检验项目的过滤条件 -// SubDetailValues values = new SubDetailValues(); -// values.setSite(acquisitionData.getSite()); -// values.setBuNo(acquisitionData.getBuNo()); -// values.setItemNo(acquisitionData.getItemNo()); -// String collectionDataContent = qcMapper.getItemCollectionDataContent(values); -// // 临时对象 -// EquipmentDataAcquisitionData tempAcquisitionData = new EquipmentDataAcquisitionData(); -// BeanUtils.copyProperties(acquisitionData,tempAcquisitionData); -// tempAcquisitionData.setCollectionDataContent(collectionDataContent); -// // 循环数据采集来源 -// int type = 0; -// for (int i = 0; i < acquisitionData.getCollectionSource().split(",").length; i++) { -// // 数据采集来源 -// tempAcquisitionData.setCollectionSource(acquisitionData.getCollectionSource().split(",")[i]); -// // 数据采集方式 -// if (tempAcquisitionData.getCollectionSource().startsWith("value")) { // 如果采集来源是以"value"开头则采集方式使用文件数据采集(file) -// if (tempAcquisitionData.getCollectionMethod().contains("plc")) { -// tempAcquisitionData.setCollectionMethod("plc"); -// } else if (tempAcquisitionData.getCollectionMethod().contains("RS232")) { -// tempAcquisitionData.setCollectionMethod("RS232"); -// } else { -// tempAcquisitionData.setCollectionMethod("file"); -// } -// } else if ("photo_value1".equals(tempAcquisitionData.getCollectionSource())){ // // 如果采集来源是"photo_value1"开头则采集方式使用文件数据采集(image) -// tempAcquisitionData.setCollectionMethod("image"); -// } else if ("file_value1".equals(tempAcquisitionData.getCollectionSource())){ // // 如果采集来源是"file_value1"开头则采集方式使用文件数据采集(fileUrl) -// tempAcquisitionData.setCollectionMethod("fileUrl"); -// } -// // 设备号 -// tempAcquisitionData.setEquipmentNo(acquisitionData.getEquipmentNo()); -// if ("file".equals(tempAcquisitionData.getCollectionMethod()) || "plc".equals(tempAcquisitionData.getCollectionMethod()) || "RS232".equals(tempAcquisitionData.getCollectionMethod())) { -// // 文件数据采集 -// if (tempAcquisitionData.getCollectionSource().startsWith("value")) { -// tempAcquisitionData.setSubDetailValueType(type); -// type++; -// } -// List dataList = qcMapper.dataAcquisition(tempAcquisitionData); -// subDetailList.addAll(dataList); -// } else if ("image".equals(tempAcquisitionData.getCollectionMethod()) || "fileUrl".equals(tempAcquisitionData.getCollectionMethod())) { -// // 图片采集 -// List dataList2 = qcMapper.dataAcquisition2(tempAcquisitionData); -// List collect = dataList2.stream().map(a -> { -// a.setFileName(a.getUrl().split("\\$")[1]); -// a.setNewFileName(a.getUrl().split("\\\\")[a.getUrl().split("\\\\").length-1]); -// return a; -// }).collect(Collectors.toList()); -// fileList.addAll(collect); -// } -// } -// } -// -// if (subDetailList.isEmpty() && fileList.isEmpty()) { -// throw new RuntimeException("未采集到数据信息!"); -// } -// -// // 整合实测值A和实测值B -// List groupCannotBeEmpty = subDetailList.stream() -// .collect(Collectors.groupingBy(a -> new AbstractMap.SimpleEntry<>(a.getItemNo(), a.getNum()))) -// .values().stream() -// .map(userList -> userList.stream() -// .reduce((u1, u2) -> { -// SubDetailValues result = new SubDetailValues(data.getSite(), data.getBuNo(), data.getInspectionNo(), u1.getItemNo(), u1.getNum(), -// u1.getSubDetailValue() != null ? u1.getSubDetailValue() : u2.getSubDetailValue(), -// u1.getSubDetailValueB() != null ? u1.getSubDetailValueB() : u2.getSubDetailValueB(), -// u1.getSubDetailValueC() != null ? u1.getSubDetailValueC() : u2.getSubDetailValueC(), -// u1.getSubDetailValueD() != null ? u1.getSubDetailValueD() : u2.getSubDetailValueD(), -// u1.getSubDetailValueE() != null ? u1.getSubDetailValueE() : u2.getSubDetailValueE()); -// return result; -// }) -// .orElseThrow(() -> new IllegalStateException("Group cannot be empty"))) -// .collect(Collectors.toList()); -// -// // 分批插入 -// int batchSize = 150; // 假设每批150条记录 -// for (int i = 0; i < groupCannotBeEmpty.size(); i += batchSize) { -// int end = Math.min(i + batchSize, groupCannotBeEmpty.size()); -// List subList = groupCannotBeEmpty.subList(i, end); -// // 新增数据采集信息 -// if ("iqc".equals(data.getFlag())) { -// qcMapper.saveIQCSubDetailed(subList); -// } else if ("ipqc".equals(data.getFlag())) { -// qcMapper.saveIPQCSubDetailed(subList); -// } else if ("fqc".equals(data.getFlag())) { -// qcMapper.saveFQCSubDetailed(subList); -// } else if ("fai".equals(data.getFlag())) { -// qcMapper.saveFAISubDetailed(subList); -// } -// } -// -// // 新增图片采集信息 -// if (!fileList.isEmpty()) { -// int batchSize2 = 150; -// for (int i = 0; i < fileList.size(); i += batchSize2) { -// int end = Math.min(i + batchSize2, fileList.size()); -// List subFileList = fileList.subList(i, end); -// qcMapper.saveFileList(subFileList); -// } -// } -// -// // 修改数据采集方式为 "RS232" 的 inspectionNo -// List rsList = subDetailList.stream().filter(a -> "RS232".equals(a.getCollectionMethod())).collect(Collectors.toList()); -// if (!rsList.isEmpty()) { -// for (SubDetailValues detailValues : rsList) { -// qcMapper.updateEquipmentDataDetailInspectionNo(detailValues); -// } -// } - QcInspectionStandardData templateDetail = new QcInspectionStandardData(); templateDetail.setSite(data.getSite()); templateDetail.setBuNo(data.getBuNo()); @@ -4920,8 +4086,6 @@ public class QcServiceImpl implements QcService { /** * 获取采集条件路径 - * @param data - * @return */ @Override public List getEquipmentNoList(EquipmentFolderLocationData data) { @@ -4938,8 +4102,6 @@ public class QcServiceImpl implements QcService { /** * 获取责任人列表 - * @param data - * @return */ @Override public List getResponsibleOperatorList(EamAdminData data) { @@ -4956,8 +4118,6 @@ public class QcServiceImpl implements QcService { /** * 获取采集数据内容 - * @param data - * @return */ @Override public List getDataContentList(QcCollectionDataContentData data) { @@ -4974,8 +4134,6 @@ public class QcServiceImpl implements QcService { /** * 项目不包含的设备 - * @param data - * @return */ @Override public List getObjectList1(EamObjectInData data) { @@ -4985,8 +4143,6 @@ public class QcServiceImpl implements QcService { /** * 项目所包含的设备 - * @param data - * @return */ @Override public List getObjectList2(EamObjectInData data) { @@ -4996,8 +4152,6 @@ public class QcServiceImpl implements QcService { /** * 根据条件查询可选设备 - * @param data - * @return */ @Override public List getObjectListBy(EamObjectInData data) { @@ -5007,7 +4161,6 @@ public class QcServiceImpl implements QcService { /** * 新增项目设备 - * @param data */ @Override @Transactional @@ -5019,11 +4172,7 @@ public class QcServiceImpl implements QcService { // 新增 qcMapper.addItemObject(collect); } - - /** - * - * @param data - */ + @Override @Transactional public void deleteItemObject(EamObjectInData data) { @@ -5037,7 +4186,6 @@ public class QcServiceImpl implements QcService { /** * 编辑项目设备 - * @param data */ @Override @Transactional @@ -5056,8 +4204,6 @@ public class QcServiceImpl implements QcService { /** * 查询项目设备 - * @param data - * @return */ @Override public List getIQCItemObjectList(EamObjectInData data) { @@ -5076,8 +4222,6 @@ public class QcServiceImpl implements QcService { /** * 查询项目设备 - * @param data - * @return */ @Override public List getFAIItemObjectList(EamObjectInData data) { @@ -5096,8 +4240,6 @@ public class QcServiceImpl implements QcService { /** * 查询项目设备 - * @param data - * @return */ @Override public List getFQCItemObjectList(EamObjectInData data) { @@ -5116,8 +4258,6 @@ public class QcServiceImpl implements QcService { /** * 查询项目设备 - * @param data - * @return */ @Override public List getIPQCItemObjectList(EamObjectInData data) { @@ -5136,8 +4276,6 @@ public class QcServiceImpl implements QcService { /** * 获取检验标准 - * @param data - * @return */ @Override public List getInspectionStandards(QcInspectionStandardData data) { @@ -5147,7 +4285,6 @@ public class QcServiceImpl implements QcService { /** * 新增检验标准 - * @param data */ @Override @Transactional diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 03a03ba3..dfeab8f7 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -1585,9 +1585,17 @@ - - INSERT INTO qc_fai_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty, bu_no,order_id) - 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}, #{buNo},#{orderId,jdbcType=INTEGER}) + + INSERT INTO qc_fai_detailed_record + (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, + AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, + max_value, value_type_db, value_type, site, sampling_qty, bu_no, order_id) + VALUES + + (#{item.inspectionNo}, #{item.orderNo}, #{item.templateId}, #{item.samplingLevelNo}, #{item.samplingLevelDesc}, #{item.samplingProgrammeNo}, #{item.samplingProgrammeDesc}, + #{item.aql,jdbcType=DECIMAL}, #{item.ac,jdbcType=DECIMAL}, #{item.re,jdbcType=DECIMAL}, #{item.itemNo}, #{item.itemDesc}, #{item.objectId}, #{item.objectDesc}, #{item.defaultValue}, #{item.minValue,jdbcType=DECIMAL}, + #{item.maxValue,jdbcType=DECIMAL}, #{item.valueTypeDb}, #{item.valueType}, #{item.site}, #{item.samplingQty,jdbcType=DECIMAL}, #{item.buNo}, #{item.orderId}) + @@ -1926,9 +1934,17 @@ - - INSERT INTO qc_ipqc_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty, bu_no,order_id) - 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}, #{buNo},#{orderId,jdbcType=INTEGER}) + + INSERT INTO qc_ipqc_detailed_record + (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, + AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, + max_value, value_type_db, value_type, site, sampling_qty, bu_no, order_id) + VALUES + + (#{item.inspectionNo}, #{item.orderNo}, #{item.templateId}, #{item.samplingLevelNo}, #{item.samplingLevelDesc}, #{item.samplingProgrammeNo}, #{item.samplingProgrammeDesc}, + #{item.aql,jdbcType=DECIMAL}, #{item.ac,jdbcType=DECIMAL}, #{item.re,jdbcType=DECIMAL}, #{item.itemNo}, #{item.itemDesc}, #{item.objectId}, #{item.objectDesc}, #{item.defaultValue}, #{item.minValue,jdbcType=DECIMAL}, + #{item.maxValue,jdbcType=DECIMAL}, #{item.valueTypeDb}, #{item.valueType}, #{item.site}, #{item.samplingQty,jdbcType=DECIMAL}, #{item.buNo}, #{item.orderId}) + @@ -2811,9 +2827,17 @@ - - INSERT INTO qc_fqc_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty, bu_no,order_id) - 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}, #{buNo},#{orderId,jdbcType=INTEGER}) + + INSERT INTO qc_fqc_detailed_record + (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, + AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, + max_value, value_type_db, value_type, site, sampling_qty, bu_no, order_id) + VALUES + + (#{item.inspectionNo}, #{item.orderNo}, #{item.templateId}, #{item.samplingLevelNo}, #{item.samplingLevelDesc}, #{item.samplingProgrammeNo}, #{item.samplingProgrammeDesc}, + #{item.aql,jdbcType=DECIMAL}, #{item.ac,jdbcType=DECIMAL}, #{item.re,jdbcType=DECIMAL}, #{item.itemNo}, #{item.itemDesc}, #{item.objectId}, #{item.objectDesc}, #{item.defaultValue}, #{item.minValue,jdbcType=DECIMAL}, + #{item.maxValue,jdbcType=DECIMAL}, #{item.valueTypeDb}, #{item.valueType}, #{item.site}, #{item.samplingQty,jdbcType=DECIMAL}, #{item.buNo}, #{item.orderId}) +