From 0b273a4ec12727bbf618820cb1b1f7d3749cace7 Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 8 Apr 2025 11:18:14 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=94=B5=E6=A3=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BA=8C=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ReportQualityInspectionMapper.java | 9 ++++++++- .../IReportQualityInspectionService.java | 4 ++-- .../RecordElectricalInspectionServiceImpl.java | 10 +++++----- .../ReportQualityInspectionServiceImpl.java | 11 +++++++---- .../report/ReportQualityInspectionMapper.xml | 18 ++++++++++++++++++ 5 files changed, 40 insertions(+), 12 deletions(-) diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/ReportQualityInspectionMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/ReportQualityInspectionMapper.java index a6ae155..b2377de 100644 --- a/aucma-report/src/main/java/com/aucma/report/mapper/ReportQualityInspectionMapper.java +++ b/aucma-report/src/main/java/com/aucma/report/mapper/ReportQualityInspectionMapper.java @@ -69,9 +69,16 @@ public interface ReportQualityInspectionMapper public HashMap pdaQueryQuantityNumber(String stationCode); /** - * 箱体码查电检数据 + * 箱体码查电检数据 二线 * @param barcode * @return */ ReportQualityInspection selectReportQualityInspectionByBarcode(String barcode); + + /** + * 箱体码查电检数据 一线 + * @param barcode + * @return + */ + ReportQualityInspection selectOneReportQualityInspectionByBarcode(String barcode); } diff --git a/aucma-report/src/main/java/com/aucma/report/service/IReportQualityInspectionService.java b/aucma-report/src/main/java/com/aucma/report/service/IReportQualityInspectionService.java index 7fc59b7..37413ff 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/IReportQualityInspectionService.java +++ b/aucma-report/src/main/java/com/aucma/report/service/IReportQualityInspectionService.java @@ -3,7 +3,6 @@ package com.aucma.report.service; import java.util.HashMap; import java.util.List; -import com.aucma.report.domain.BoxTemperatureHistory; import com.aucma.report.domain.ReportQualityInspection; /** @@ -72,9 +71,10 @@ public interface IReportQualityInspectionService { /** * 箱体码查电检数据 * @param barcode + * @param productLineCode * @return */ - public ReportQualityInspection selectReportQualityInspectionByBarcode(String barcode); + public ReportQualityInspection selectReportQualityInspectionByBarcode(String barcode, String productLineCode); /** * 检验前一工位是否已完成质检 diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/RecordElectricalInspectionServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/RecordElectricalInspectionServiceImpl.java index 05b388f..eec4890 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/RecordElectricalInspectionServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/RecordElectricalInspectionServiceImpl.java @@ -190,7 +190,7 @@ public class RecordElectricalInspectionServiceImpl implements IRecordElectricalI detailList.add(testData); } } - this.insertQualityInspectionByElectrical(inspection, detailList); + this.insertQualityInspectionByElectrical(inspection, detailList, productLineCode); } catch (Exception e) { logger.error("解析电检数据接口数据:" + paramMap.toString() + ";异常：" + e); } @@ -201,16 +201,16 @@ public class RecordElectricalInspectionServiceImpl implements IRecordElectricalI /** * 电检结果存入质检数据 - * - * @param inspectionInfo + * @param inspectionInfo * @param detailList + * @param productLineCode */ - private void insertQualityInspectionByElectrical(RecordElectricalInspection inspectionInfo, ArrayList detailList) { + private void insertQualityInspectionByElectrical(RecordElectricalInspection inspectionInfo, ArrayList detailList, String productLineCode) { if (StringUtils.isNull(inspectionInfo.getBarcode()) || StringUtils.isNull(detailList)) { return; } String barcode = inspectionInfo.getBarcode(); - ReportQualityInspection qualityInspection = qualityInspectionService.selectReportQualityInspectionByBarcode(barcode); + ReportQualityInspection qualityInspection = qualityInspectionService.selectReportQualityInspectionByBarcode(barcode, productLineCode); if (StringUtils.isNull(qualityInspection)) { return; } diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java index 9210ab4..8a109a9 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/ReportQualityInspectionServiceImpl.java @@ -1,13 +1,11 @@ package com.aucma.report.service.impl; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import com.aucma.base.domain.BaseProductLine; import com.aucma.base.service.IBaseProductLineService; import com.aucma.common.utils.StringUtils; -import com.aucma.report.domain.BoxTemperatureHistory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.aucma.report.mapper.ReportQualityInspectionMapper; @@ -114,11 +112,16 @@ public class ReportQualityInspectionServiceImpl implements IReportQualityInspect /** * 箱体码查电检数据 * @param barcode + * @param productLineCode * @return */ @Override - public ReportQualityInspection selectReportQualityInspectionByBarcode(String barcode) { - return reportQualityInspectionMapper.selectReportQualityInspectionByBarcode(barcode); + public ReportQualityInspection selectReportQualityInspectionByBarcode(String barcode, String productLineCode) { + if (productLineCode.equals("CX_02")){ + return reportQualityInspectionMapper.selectReportQualityInspectionByBarcode(barcode); + } else { + return reportQualityInspectionMapper.selectOneReportQualityInspectionByBarcode(barcode); + } } /** diff --git a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml index f916d33..c6bdca4 100644 --- a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml @@ -225,4 +225,22 @@ WHERE PB.MATERIAL_BARCODE = #{barcode} + + \ No newline at end of file