From ba5932e560fe3fc484c34446be05452ceaf3b12a Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 12 Jan 2024 11:32:41 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=B4=A8=E9=87=8F=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/controller/ProductionReportController.java    | 8 --------
 .../com/aucma/report/mapper/GeneralReportMapper.java     | 7 +------
 .../aucma/report/service/IProductionReportService.java   | 7 +------
 .../report/service/impl/ProductionReportServiceImpl.java | 9 ---------
 .../main/resources/mapper/report/GeneralReportMapper.xml | 6 +-----
 5 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java
index 042f507..e52acef 100644
--- a/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java
+++ b/aucma-report/src/main/java/com/aucma/report/controller/ProductionReportController.java
@@ -60,13 +60,5 @@ public class ProductionReportController extends BaseController {
         return success(list);
     }
 
-    /**
-     * 发泡注料记录报表
-     */
-    @GetMapping("/foamFillingRecordReportList")
-    public AjaxResult foamFillingRecordReportList(@RequestParam(required = false) Map hashMap) {
-        List<HashMap<String, Object>> list = productionReportService.foamFillingRecordReportList(hashMap);
-        return success(list);
-    }
 
 }
diff --git a/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java b/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java
index 2e83e4c..0231ebd 100644
--- a/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java
+++ b/aucma-report/src/main/java/com/aucma/report/mapper/GeneralReportMapper.java
@@ -86,12 +86,7 @@ public interface GeneralReportMapper {
      */
     List<HashMap<String, Object>> pourRecordReportList(Map hashMap);
 
-    /**
-     * 发泡注料记录报表
-     * @param hashMap
-     * @return
-     */
-    List<HashMap<String, Object>> foamFillingRecordReportList(Map hashMap);
+
 
     /**
      * 质量缺陷统计分析明细
diff --git a/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java b/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java
index 136f2b7..016341d 100644
--- a/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java
+++ b/aucma-report/src/main/java/com/aucma/report/service/IProductionReportService.java
@@ -43,10 +43,5 @@ public interface IProductionReportService
      */
     List<HashMap<String, Object>> ScanOfflineRecordReportList(Map hashMap);
 
-    /**
-     * 发泡注料记录报表
-     * @param hashMap
-     * @return
-     */
-    List<HashMap<String, Object>> foamFillingRecordReportList(Map hashMap);
+
 }
diff --git a/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java
index 66b8e89..a7c4222 100644
--- a/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java
+++ b/aucma-report/src/main/java/com/aucma/report/service/impl/ProductionReportServiceImpl.java
@@ -59,15 +59,6 @@ public class ProductionReportServiceImpl implements IProductionReportService {
         return reportMapper.ScanOfflineRecordReportList(hashMap);
     }
 
-    /**
-     * 发泡注料记录报表
-     * @param hashMap
-     * @return
-     */
-    @Override
-    public List<HashMap<String, Object>> foamFillingRecordReportList(Map hashMap) {
-        return reportMapper.foamFillingRecordReportList(hashMap);
-    }
 
 
 }
diff --git a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
index 7104ac5..d9f9ad5 100644
--- a/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/GeneralReportMapper.xml
@@ -124,11 +124,7 @@
         SELECT *
         FROM VIEW_PERFUSION_RECORD
     </select>
-    <select id="foamFillingRecordReportList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
-        SELECT *
-        FROM VIEW_BOX_LASTSHOTRECORD
-        ORDER BY CREATE_TIME DESC
-    </select>
+
 
     <select id="qualityDefectsDetailList" resultType="java.util.HashMap" parameterType="java.util.HashMap">
         SELECT ROWNUM SEQ, SD.QUALITY_DEFECT_NAME, SD.DEFECT_NUMBER, ROUND(DEFECT_NUMBER / ALL_DEFECT * 100, 0) || '%'  RATE