update mes大屏设计参考接口

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/controller/ProdReportController.java

@@ -3,6 +3,7 @@ package org.dromara.mes.controller;
 
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -12,6 +13,7 @@ import org.dromara.mes.service.IProdReportService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -77,4 +79,29 @@ public class ProdReportController extends BaseController {
         ExcelUtil.exportExcel(list, "生产计划完成率对比报表", PlanCompletionContrastReportVo.class, response);
     }
 
+
+    /**
+     * 大屏设计：生产计划完成率接口
+     *
+     * @param hashMap
+     * @return
+     */
+    @GetMapping("/designPlanCompletionRate")
+    public R<List<PlanCompletionRateReportVo>> designPlanCompletionRate(@RequestParam(required = false) Map hashMap) {
+        List<PlanCompletionRateReportVo> vos = prodReportService.planCompletionRateReportVoList(hashMap);
+        return R.ok(vos);
+    }
+
+    /**
+     * 日产量接口
+     *
+     * @param hashMap
+     * @return
+     */
+    @GetMapping("/designDailyOutputInformation")
+    public R<List<HashMap<String, Object>>> designDailyOutputInformation(@RequestParam(required = false) Map hashMap) {
+        List<HashMap<String, Object>> vos = prodReportService.designDailyOutputInformation(hashMap);
+        return R.ok(vos);
+    }
+
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/mapper/ProdReportMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import org.dromara.mes.domain.vo.PlanCompletionContrastReportVo;
 import org.dromara.mes.domain.vo.PlanCompletionRateReportVo;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -53,4 +54,12 @@ public interface ProdReportMapper {
      * @return
      */
     List<PlanCompletionContrastReportVo> planCompletionContrastReportVoList(@Param("map") Map hashMap, @Param("tableName") String tableName);
+
+    /**
+     * 日产量接口
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> designDailyOutputInformation(@Param("map") Map hashMap, @Param("tableName") String tableName);
+
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/IProdReportService.java

@@ -6,6 +6,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.mes.domain.vo.PlanCompletionContrastReportVo;
 import org.dromara.mes.domain.vo.PlanCompletionRateReportVo;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -49,4 +50,12 @@ public interface IProdReportService {
      * @return
      */
     List<PlanCompletionContrastReportVo> planCompletionContrastReportVoList(Map hashMap);
+
+    /**
+     * 日产量接口
+     * @param hashMap
+     * @return
+     */
+    List<HashMap<String, Object>> designDailyOutputInformation(Map hashMap);
+
 }

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdReportServiceImpl.java

@@ -12,6 +12,7 @@ import org.dromara.mes.mapper.ProdReportMapper;
 import org.dromara.mes.service.IProdReportService;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -73,6 +74,28 @@ public class ProdReportServiceImpl implements IProdReportService {
         return tableName;
     }
 
+    /**
+     * 根据工序ID获取生产计划明细数据库表名
+     *
+     * @param processId 工序ID
+     * @return 生产计划明细数据库表名
+     */
+    public String getPlanDetailTableNameByProcessId(Long processId) {
+        if (StringUtils.isNull(processId)) {
+            return null;
+        }
+
+        String tableName;
+        if (processId == 17L) {
+            tableName = DatabaseConstants.TABLE_NAME_PROD_PRODUCT_PLAN_DETAIL_PREFIX + "_3";
+        } else if (processId == 18L) {
+            tableName = DatabaseConstants.TABLE_NAME_PROD_PRODUCT_PLAN_DETAIL_PREFIX + "_4";
+        } else {
+            tableName = DatabaseConstants.TABLE_NAME_PROD_PRODUCT_PLAN_DETAIL_PREFIX + "_2";
+        }
+        return tableName;
+    }
+
     /**
      * 生产计划完成率对比报表
      * @param hashMap
@@ -97,4 +120,15 @@ public class ProdReportServiceImpl implements IProdReportService {
         return prodReportMapper.planCompletionContrastReportVoList(hashMap, tableName);
     }
 
+    /**
+     * 日产量接口
+     * @param hashMap
+     * @return
+     */
+    @Override
+    public List<HashMap<String, Object>> designDailyOutputInformation(Map hashMap) {
+        String tableName = getPlanDetailTableNameByProcessId(Long.parseLong(String.valueOf(hashMap.get("processId"))));
+        return prodReportMapper.designDailyOutputInformation(hashMap, tableName);
+    }
+
 }

ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdReportMapper.xml

@@ -104,4 +104,17 @@
         ORDER BY materialName
     </select>
 
+    <select id="designDailyOutputInformation" resultType="java.util.HashMap">
+        SELECT CONVERT(DATE, t.real_end_time) productionDate,
+               COUNT(*)                       completeAmount
+        FROM ${tableName} t
+                 LEFT JOIN base_material_info bmi ON bmi.material_id = t.material_id
+        WHERE real_end_time IS NOT NULL
+        <if test="map.beginDate != null  and map.beginDate != '' and map.endDate != null  and map.endDate != ''">
+            AND FORMAT(t.real_end_time, 'yyyy-MM-dd') BETWEEN #{map.beginDate} AND #{map.endDate}
+        </if>
+        GROUP BY CONVERT(DATE, t.real_end_time)
+        ORDER BY productionDate
+    </select>
+
 </mapper>