diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java index c01e2eba..007188e7 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java @@ -10,7 +10,6 @@ import com.foreverwin.mesnac.anomaly.dto.PartsManufacturing; import com.foreverwin.mesnac.anomaly.service.ReportService; import com.foreverwin.mesnac.integration.model.IntegrationLog; import com.foreverwin.modular.core.util.CommonMethods; -import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -82,4 +81,6 @@ public class ReportController { return R.failed(e.getMessage()); } } + + } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java index 0ca38386..80672bcb 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java @@ -1,6 +1,5 @@ package com.foreverwin.mesnac.anomaly.service.impl; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.foreverwin.mesnac.anomaly.dto.PartsManufacturing; import com.foreverwin.mesnac.anomaly.mapper.ReportMapper; import com.foreverwin.mesnac.anomaly.service.ReportService; @@ -61,6 +60,12 @@ public class ReportServiceImpl implements ReportService { return reportMapper.partsManufacturing(site,locale,partsManufacturing); } + /** + * 余料退回明细表 + * @param item + * @param itemDescription + * @return + */ @Override public List> surplusReturnTable(String item, String itemDescription) { String locale = LocaleContextHolder.getLocale().getLanguage(); @@ -68,13 +73,16 @@ public class ReportServiceImpl implements ReportService { return reportMapper.surplusReturnTable(site,locale,item,itemDescription); } + /** + * 资源维修报表 + * @param map + * @return + */ @Override public List> resourceRepair(Map map) { String locale = LocaleContextHolder.getLocale().getLanguage(); String site = CommonMethods.getSite(); - - Map> ncCodeMap = new HashMap<>(); NcCode ncCode = new NcCode(); ncCode.setSite(site); @@ -132,6 +140,11 @@ public class ReportServiceImpl implements ReportService { return maps; } + /** + * 检验记录报表 + * @param paramMap + * @return + */ @Override public List> findInspectionTask(Map paramMap) { return reportMapper.findInspectionTask(paramMap);