From df62f31f8d4940c41ce589a1fa077eb9a12123e8 Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 21 Mar 2024 15:28:35 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=94=B5=E6=A3=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AD=98=E5=88=B0=E8=B4=A8=E6=A3=80=E3=80=81=E8=BF=87?= =?UTF-8?q?=E7=82=B9=E6=95=B0=E6=8D=AE=E5=B7=A5=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReportQualityInspectionController.java | 11 --- .../mapper/ReportQualityInspectionMapper.java | 6 ++ .../IReportQualityInspectionService.java | 10 +-- .../impl/MaterialCompletionServiceImpl.java | 18 ++-- ...RecordElectricalInspectionServiceImpl.java | 82 +++++++++++++++++++ .../ReportQualityInspectionServiceImpl.java | 11 +-- .../report/ReportQualityInspectionMapper.xml | 19 ++++- 7 files changed, 129 insertions(+), 28 deletions(-) diff --git a/aucma-report/src/main/java/com/aucma/report/controller/ReportQualityInspectionController.java b/aucma-report/src/main/java/com/aucma/report/controller/ReportQualityInspectionController.java index 5f5597b..c33cd6f 100644 --- a/aucma-report/src/main/java/com/aucma/report/controller/ReportQualityInspectionController.java +++ b/aucma-report/src/main/java/com/aucma/report/controller/ReportQualityInspectionController.java @@ -99,15 +99,4 @@ public class ReportQualityInspectionController extends BaseController { public AjaxResult remove(@PathVariable Long[] objIds) { return toAjax(reportQualityInspectionService.deleteReportQualityInspectionByObjIds(objIds)); } - - /** - * 测温数据添加到质检记录 - * @param temperatureHistory - * @return - */ - @PostMapping("/temperatureApi" ) - public AjaxResult temperatureApi(BoxTemperatureHistory temperatureHistory) { - System.out.println(temperatureHistory.toString()); - return success(null); - } } 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 bf8bd43..a6ae155 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 @@ -68,4 +68,10 @@ public interface ReportQualityInspectionMapper */ public HashMap pdaQueryQuantityNumber(String stationCode); + /** + * 箱体码查电检数据 + * @param barcode + * @return + */ + ReportQualityInspection selectReportQualityInspectionByBarcode(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 ad3f365..f7b790e 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 @@ -70,11 +70,9 @@ public interface IReportQualityInspectionService { public HashMap pdaQueryQuantityNumber(String reportQualityInspection); /** - * 测温数据添加到质检记录 - * - * @param reportQualityInspection 质检记录管理 - * @return 质检记录管理集合 + * 箱体码查电检数据 + * @param barcode + * @return */ - public int temperatureApi(BoxTemperatureHistory temperatureHistory); - + public ReportQualityInspection selectReportQualityInspectionByBarcode(String barcode); } diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/MaterialCompletionServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/MaterialCompletionServiceImpl.java index 7a772b6..1ae85f0 100644 --- a/aucma-report/src/main/java/com/aucma/report/service/impl/MaterialCompletionServiceImpl.java +++ b/aucma-report/src/main/java/com/aucma/report/service/impl/MaterialCompletionServiceImpl.java @@ -2,7 +2,9 @@ package com.aucma.report.service.impl; import java.util.List; +import com.aucma.common.utils.StringUtils; import com.aucma.report.domain.ReportQualityInspection; +import com.aucma.report.service.IReportQualityInspectionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.aucma.report.mapper.MaterialCompletionMapper; @@ -20,6 +22,9 @@ public class MaterialCompletionServiceImpl implements IMaterialCompletionService @Autowired private MaterialCompletionMapper materialCompletionMapper; + @Autowired + private IReportQualityInspectionService qualityInspectionService; + /** * 查询物料过点记录 * @@ -88,18 +93,21 @@ public class MaterialCompletionServiceImpl implements IMaterialCompletionService /** * 二线质检存入过点数据 + * * @param inspection */ @Override public void inspectionProcessing(ReportQualityInspection inspection) { MaterialCompletion materialCompletion = new MaterialCompletion(); //质检转过点数据 -// if (StringUtils.isNotEmpty(inspection.getBarCode())){ -// //1001 -// } -// materialCompletion.setOrderCode(); -// materialCompletion.setPlanCode(); + if (StringUtils.isNotEmpty(inspection.getBarCode())) { + ReportQualityInspection qualityInspection = qualityInspectionService.selectReportQualityInspectionByBarcode(inspection.getBarCode()); + if (StringUtils.isNotEmpty(qualityInspection.getOrderCode())){ + materialCompletion.setOrderCode(qualityInspection.getOrderCode()); + } + } materialCompletion.setMaterialBarcode(inspection.getBarCode()); + materialCompletion.setMaterialCode(inspection.getBarCode().substring(7, 18)); materialCompletion.setMaterialName(inspection.getMaterialName()); materialCompletion.setStationName(inspection.getStationCode()); materialCompletion.setCompleteDate(inspection.getInspectorTime()); 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 cccfc12..fc33f97 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 @@ -3,8 +3,13 @@ package com.aucma.report.service.impl; import java.util.HashMap; import java.util.List; +import com.aucma.base.domain.BaseQualityInspectionItem; +import com.aucma.base.service.IBaseQualityInspectionItemService; import com.aucma.common.utils.DateUtils; import com.aucma.common.utils.uuid.UUID; +import com.aucma.report.domain.ReportQualityInspection; +import com.aucma.report.service.IMaterialCompletionService; +import com.aucma.report.service.IReportQualityInspectionService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +38,15 @@ public class RecordElectricalInspectionServiceImpl implements IRecordElectricalI @Autowired private RecordElectricalInspectionMapper recordElectricalInspectionMapper; + @Autowired + private IReportQualityInspectionService qualityInspectionService; + + @Autowired + private IBaseQualityInspectionItemService itemService; + + @Autowired + private IMaterialCompletionService materialCompletionService; + /** * 查询电检数据记录 * @@ -141,6 +155,7 @@ public class RecordElectricalInspectionServiceImpl implements IRecordElectricalI public HashMap analysisElectricalInspectionData(Map paramMap) { HashMap resultData = new HashMap<>(); RecordElectricalInspection inspection = new RecordElectricalInspection(); + ArrayList detailList = new ArrayList<>(); String uuid = String.valueOf(paramMap.get("uuid")); try { String result = String.valueOf(paramMap.get("result")); @@ -170,8 +185,10 @@ public class RecordElectricalInspectionServiceImpl implements IRecordElectricalI testData.setTestresult(testDataParts[4]); testData.setRecordtime(DateUtils.getNowDate()); recordElectricalInspectionMapper.insertDetailElectricalinspection(testData); + detailList.add(testData); } } + this.insertQualityInspectionByElectrical(inspection, detailList); } catch (Exception e) { logger.error("解析电检数据接口数据:" + paramMap.toString() + ";异常：" + e); } @@ -180,4 +197,69 @@ public class RecordElectricalInspectionServiceImpl implements IRecordElectricalI return resultData; } + /** + * 电检结果存入质检数据 + * + * @param inspectionInfo + * @param detailList + */ + private void insertQualityInspectionByElectrical(RecordElectricalInspection inspectionInfo, ArrayList detailList) { + if (StringUtils.isNull(inspectionInfo.getBarcode()) || StringUtils.isNull(detailList)) { + return; + } + String barcode = inspectionInfo.getBarcode(); + ReportQualityInspection qualityInspection = qualityInspectionService.selectReportQualityInspectionByBarcode(barcode); + if (StringUtils.isNull(qualityInspection)) { + return; + } + //质检合格存入质检数据 + if (StringUtils.isNotEmpty(inspectionInfo.getResult()) && inspectionInfo.getResult().equals("OK")) { + qualityInspection.setTreatmentMeasure("3"); + qualityInspectionService.insertReportQualityInspection(qualityInspection); + materialCompletionService.inspectionProcessing(qualityInspection); + return; + } + //质检不合格存入质检数据 + for (DetailElectricalinspection detail : detailList) { + if (StringUtils.isNotEmpty(detail.getTestresult()) || detail.getTestresult().equals("OK")) { + continue; + } + String projectName = detail.getProjectname(); + BaseQualityInspectionItem item = new BaseQualityInspectionItem(); + String qualityDefectCode = null; + String qualityDefectName = null; + qualityInspection.setTestItemCode(qualityInspection.getStationCode()); + if (projectName.equals("gnd")) { + item.setQualityDefectCode("5002"); + List itemList = itemService.selectBaseQualityInspectionItemList(item); + qualityDefectCode = itemList.get(0).getQualityDefectCode(); + qualityDefectName = itemList.get(0).getQualityDefectName(); + }else if (projectName.equals("acw")){ + item.setQualityDefectCode("5004"); + List itemList = itemService.selectBaseQualityInspectionItemList(item); + qualityDefectCode = itemList.get(0).getQualityDefectCode(); + qualityDefectName = itemList.get(0).getQualityDefectName(); + }else if (projectName.equals("lvs")){ + item.setQualityDefectCode("5001"); + List itemList = itemService.selectBaseQualityInspectionItemList(item); + qualityDefectCode = itemList.get(0).getQualityDefectCode(); + qualityDefectName = itemList.get(0).getQualityDefectName(); + }else if (projectName.equals("ttl")){ + item.setQualityDefectCode("5003"); + List itemList = itemService.selectBaseQualityInspectionItemList(item); + qualityDefectCode = itemList.get(0).getQualityDefectCode(); + qualityDefectName = itemList.get(0).getQualityDefectName(); + } + qualityInspection.setQualityDefectCode(qualityDefectCode); + qualityInspection.setQualityDefectName(qualityDefectName); + qualityInspection.setTreatmentMeasure("1"); + qualityInspection.setProcessResult("返修合格"); + qualityInspection.setReworkNumber(1L); + qualityInspection.setFinishTime(DateUtils.getNowDate()); + qualityInspection.setUpdatedBy(qualityInspection.getInspectorCode()); + qualityInspection.setUpdatedTime(DateUtils.getNowDate()); + qualityInspectionService.insertReportQualityInspection(qualityInspection); + } + } + } 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 0356dd9..3662011 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 @@ -104,15 +104,16 @@ public class ReportQualityInspectionServiceImpl implements IReportQualityInspect } + + /** - * 测温数据添加到质检记录 - * @param temperatureHistory 质检记录管理 + * 箱体码查电检数据 + * @param barcode * @return */ @Override - public int temperatureApi(BoxTemperatureHistory temperatureHistory) { - - return 1; + public ReportQualityInspection selectReportQualityInspectionByBarcode(String barcode) { + return reportQualityInspectionMapper.selectReportQualityInspectionByBarcode(barcode); } diff --git a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml index b908f58..fd4059b 100644 --- a/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml +++ b/aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml @@ -29,6 +29,7 @@ + @@ -207,6 +208,22 @@ - + \ No newline at end of file