diff --git a/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java index 847ef71..72d041b 100644 --- a/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java +++ b/src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java @@ -5647,92 +5647,6 @@ public class QcServiceImpl implements QcService { @Override @Transactional public PageUtils qcOQCInspectionSearch(QcFAIRecordData data) { - List basicData = qcMapper.selectOQCBasicData(data); - QcFAIRecordData qcFAIRecordData = new QcFAIRecordData(); - for (QcFAIRecordData recordData : basicData) { - qcFAIRecordData.setSite(recordData.getSite()); - qcFAIRecordData.setBuNo(recordData.getBuNo()); - qcFAIRecordData.setInspectionNo(recordData.getInspectionNo()); - qcFAIRecordData.setInspectionTypeNo("110"); - qcFAIRecordData.setPartDesc(recordData.getPartDesc()); - qcFAIRecordData.setRollQty(recordData.getRollQty()); - String partNo = recordData.getPartNo(); - String attributeType1 = "A"; - List partAttribute = qcMapper.selectFQASPartAttributeByPartNo(recordData.getSite(), recordData.getBuNo(), partNo, attributeType1, qcFAIRecordData.getInspectionTypeNo()); - if (!partAttribute.isEmpty()) { - if (partAttribute.get(0).getInspectionCycle() != null) { - qcFAIRecordData.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()) && (recordData.getRollCount().compareTo(programmeData.getMinQty()) > 0 || recordData.getRollCount().compareTo(programmeData.getMinQty()) == 0) && (recordData.getRollCount().compareTo(programmeData.getMaxQty()) < 0 || recordData.getRollCount().compareTo(programmeData.getMaxQty()) == 0)) { - qcFAIRecordData.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (partAttribute.get(0).getDefaultSamplingQuantity() != null) { - qcFAIRecordData.setSamplingQty(partAttribute.get(0).getDefaultSamplingQuantity()); - } else if (partAttribute.get(0).getDefaultSamplingProportion() != null) { - BigDecimal d = partAttribute.get(0).getDefaultSamplingProportion().multiply(recordData.getRollCount()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP); - qcFAIRecordData.setSamplingQty(d); - } - QcTemplateData templateData = new QcTemplateData(); - templateData.setSite(recordData.getSite()); - templateData.setBuNo(recordData.getBuNo()); - templateData.setTemplateId(partAttribute.get(0).getTemplateId()); - templateData.setItemType("D"); - List itemList = qcMapper.templateDetailsSearch(templateData); - QcFAIRecordData faiRecordData = new QcFAIRecordData(); - faiRecordData.setSite(recordData.getSite()); - faiRecordData.setBuNo(recordData.getBuNo()); - faiRecordData.setInspectionNo(qcFAIRecordData.getInspectionNo()); - faiRecordData.setTemplateId(partAttribute.get(0).getTemplateId()); - faiRecordData.setAql(partAttribute.get(0).getAql()); - faiRecordData.setAc(partAttribute.get(0).getAc()); - faiRecordData.setRe(partAttribute.get(0).getRe()); - for (QcTemplateData itemData : itemList) { - faiRecordData.setSerialNo(itemData.getSerialNo()); - faiRecordData.setSamplingQty(null); - faiRecordData.setSamplingLevelNo(itemData.getSamplingLevelNo()); - faiRecordData.setSamplingLevelDesc(itemData.getSamplingLevelDesc()); - faiRecordData.setSamplingProgrammeNo(itemData.getSamplingProgrammeNo()); - faiRecordData.setSamplingProgrammeDesc(itemData.getSamplingProgrammeDesc()); - faiRecordData.setItemNo(itemData.getItemNo()); - faiRecordData.setItemDesc(itemData.getItemDesc()); - faiRecordData.setObjectId(itemData.getObjectID()); - faiRecordData.setObjectDesc(itemData.getObjectDesc()); - faiRecordData.setDefaultValue(itemData.getDefaultValue()); - faiRecordData.setMinValue(itemData.getMinValue()); - faiRecordData.setMaxValue(itemData.getMaxValue()); - faiRecordData.setValueType(itemData.getValueType()); - faiRecordData.setValueTypeDb(itemData.getValueTypeDb()); - if (StringUtils.isNotBlank(itemData.getSamplingProgrammeNo())) { - QcSamplingInspectionProgrammeData samplingInspectionProgrammeData = new QcSamplingInspectionProgrammeData(); - samplingInspectionProgrammeData.setSite(itemData.getSite()); - samplingInspectionProgrammeData.setBuNo(itemData.getBuNo()); - samplingInspectionProgrammeData.setSamplingProgrammeNo(itemData.getSamplingProgrammeNo()); - List dataList = qcMapper.searchSamplingProgrammeDetails(samplingInspectionProgrammeData); - for (QcSamplingInspectionProgrammeData programmeData : dataList) { - if (programmeData.getSamplingLevelNo().equals(itemData.getSamplingLevelNo()) && (recordData.getRollCount().compareTo(programmeData.getMinQty()) > 0 || recordData.getRollCount().compareTo(programmeData.getMinQty()) == 0) && (recordData.getRollCount().compareTo(programmeData.getMaxQty()) < 0 || recordData.getRollCount().compareTo(programmeData.getMaxQty()) == 0)) { - faiRecordData.setSamplingQty(programmeData.getSamplingQty()); - } - } - } else if (itemData.getItemSamplingQuantity() != null) { - faiRecordData.setSamplingQty(itemData.getItemSamplingQuantity()); - } else if (itemData.getDefaultSamplingProportion() != null) { - faiRecordData.setSamplingQty(itemData.getDefaultSamplingProportion().multiply(recordData.getRollCount()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP)); - } else { - faiRecordData.setSamplingQty(qcFAIRecordData.getSamplingQty()); - } - qcMapper.saveFQASDetailedRecord(faiRecordData); - } - } - qcMapper.updateFQASRecord(qcFAIRecordData); - } IPage resultList = this.qcMapper.qcOQCInspectionSearch(new Page<>(data.getPage(), data.getLimit()), data); return new PageUtils(resultList); }