From de1933ae9e11a9975cdfb8d03cc718da21eba860 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 13 五月 2024 10:34:56 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 179 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index f6195a4..6590ace 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -150,4 +150,183 @@
map.put("process", productionSchedulingMapper.selectProcess());
return map;
}
+
+ public Map<String,Object> selectDamageReportSv(Date selectTime1, Date selectTime2, Report report) {
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",reportMapper.selectDamageReportMp( selectTime1, selectTime2,report));
+ return map;
+ }
+
+ public Map<String,Object> splittingDetailsOutsideSv(String orderId, Report report) {
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",reportMapper.splittingDetailsOutsideMp( orderId,report));
+ return map;
+ }
+
+ public Map<String,Object> qualityReportSv(Date selectTime1, Date selectTime2, Report report) {
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",reportMapper.qualityReportMp( selectTime1,selectTime2,report));
+ return map;
+ }
+
+ public Map<String,Object> yieldSv(Date selectTime1, Date selectTime2, String selectProcesses, Report report) {
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",reportMapper.yieldMp( selectTime1,selectTime2,selectProcesses,report));
+ map.put("process", productionSchedulingMapper.selectProcess());
+ return map;
+ }
+
+ public Map<String, Object> productionScheduleSv(String orderId, List<Integer> columns) {
+ Map<String, Object> map = new HashMap<>();
+ //鑾峰彇琛ㄦ牸鍐呭鏁版嵁
+ map.put("data", reportMapper.productionScheduleMp(orderId));
+
+ //鑾峰彇琛ㄥご宸ュ簭绛涢�夋暟鎹�
+ List<Map<String,String>> processFilterList = orderProcessDetailMapper.filterOrderProcess(orderId);
+ List<Map<String,String>> processList = processFilterList;
+
+ List<String> filterList = new ArrayList<>();
+ //寰幆閬嶅巻鏁扮粍锛屽垽鏂搴忓彿褰撳墠鐨勫伐搴�
+ for (int i = 1; i < processFilterList.size(); i++) {
+ filterList.add(processFilterList.get(i).get("process"));
+ List<Map<String,String>> lastProcessList =
+ orderProcessDetailMapper.filterLastProcess(
+ orderId,
+ String.valueOf(processFilterList.get(i).get("order_number")),
+ String.valueOf(processFilterList.get(i).get("technology_number")),
+ String.valueOf(processFilterList.get(i).get("id"))
+ );
+ if(!lastProcessList.isEmpty()){
+ int finalI = i;
+ lastProcessList.forEach(lastProcess -> {
+ if(filterList.contains(lastProcess.get("process"))){
+ processList.add(lastProcess);
+ }
+ });
+ }
+
+ }
+ // 浣跨敤HashSet鏉ヨ褰曞凡缁忛亣鍒扮殑value鍊�
+ Set<String> seenValues = new HashSet<>();
+ // 鍒涘缓涓�涓柊鐨凩ist鏉ュ瓨鍌ㄧ粨鏋�
+ List<Map<String, String>> uniqueList = new ArrayList<>();
+
+ // 鍙嶅悜閬嶅巻鍘熷List
+ for (int i = processList.size() - 1; i >= 0; i--) {
+ Map<String, String> maps = processList.get(i);
+ String value = maps.values().iterator().next(); // 鍋囪姣忎釜Map鍙湁涓�涓獀alue
+
+ // 濡傛灉value杩樻病鏈夎鐪嬪埌杩囷紝灏辨坊鍔犲埌缁撴灉List鍜孒ashSet涓�
+ if (!seenValues.contains(value)) {
+ uniqueList.add(0, maps); // 娣诲姞鍒扮粨鏋淟ist鐨勫紑澶达紝浠ヤ繚鎸佸師椤哄簭
+ seenValues.add(value);
+ }
+ }
+ map.put("title", uniqueList );
+
+
+
+
+ List<Map<String,Integer>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
+ List<Map<String,Integer>> rowCount = new ArrayList<>();
+ columns.forEach(col ->{
+ getRowCount.forEach(row ->{
+ Map<String,Integer> getRow = new HashMap<>();
+ // { row: 0, col: 1, rowspan: 3, colspan: 0},
+ getRow.put("row",row.get("RowNum"));
+ getRow.put("col",col);
+ getRow.put("rowspan",row.get("rowCount"));
+ getRow.put("colspan",0);
+ rowCount.add(getRow);
+ });
+ });
+
+
+ map.put("mergeCells",rowCount);
+
+ return map;
+ }
+
+ public Map<String, Object> taskCompletionStatusSv(Date selectTime1, Date selectTime2, List<Integer> columns) {
+ Map<String, Object> map = new HashMap<>();
+ //鑾峰彇琛ㄦ牸鍐呭鏁版嵁
+ map.put("data", reportMapper.taskCompletionStatusMp(selectTime1,selectTime2));
+
+ //鑾峰彇琛ㄥご宸ュ簭绛涢�夋暟鎹�
+ List<Map<String,String>> processFilterList = orderProcessDetailMapper.filterOrderProcessCollect(selectTime1,selectTime2);
+ List<Map<String,String>> processList = processFilterList;
+
+ List<String> filterList = new ArrayList<>();
+ //寰幆閬嶅巻鏁扮粍锛屽垽鏂搴忓彿褰撳墠鐨勫伐搴�
+ for (int i = 1; i < processFilterList.size(); i++) {
+ filterList.add(processFilterList.get(i).get("process"));
+ List<Map<String,String>> lastProcessList =
+ orderProcessDetailMapper.filterLastProcess(
+ String.valueOf(processFilterList.get(i).get("order_id")),
+ String.valueOf(processFilterList.get(i).get("order_number")),
+ String.valueOf(processFilterList.get(i).get("technology_number")),
+ String.valueOf(processFilterList.get(i).get("id"))
+ );
+ if(!lastProcessList.isEmpty()){
+ int finalI = i;
+ lastProcessList.forEach(lastProcess -> {
+ if(filterList.contains(lastProcess.get("process"))){
+ processList.add(lastProcess);
+ }
+ });
+ }
+
+ }
+ // 浣跨敤HashSet鏉ヨ褰曞凡缁忛亣鍒扮殑value鍊�
+ Set<String> seenValues = new HashSet<>();
+ // 鍒涘缓涓�涓柊鐨凩ist鏉ュ瓨鍌ㄧ粨鏋�
+ List<Map<String, String>> uniqueList = new ArrayList<>();
+
+ // 鍙嶅悜閬嶅巻鍘熷List
+ for (int i = processList.size() - 1; i >= 0; i--) {
+ Map<String, String> maps = processList.get(i);
+ String value = maps.values().iterator().next(); // 鍋囪姣忎釜Map鍙湁涓�涓獀alue
+
+ // 濡傛灉value杩樻病鏈夎鐪嬪埌杩囷紝灏辨坊鍔犲埌缁撴灉List鍜孒ashSet涓�
+ if (!seenValues.contains(value)) {
+ uniqueList.add(0, maps); // 娣诲姞鍒扮粨鏋淟ist鐨勫紑澶达紝浠ヤ繚鎸佸師椤哄簭
+ seenValues.add(value);
+ }
+ }
+ map.put("title", uniqueList );
+
+
+
+
+ List<Map<String,Integer>> getRowCount = orderProcessDetailMapper.getGlassLRowCollect(selectTime1,selectTime2);
+ List<Map<String,Integer>> rowCount = new ArrayList<>();
+ columns.forEach(col ->{
+ getRowCount.forEach(row ->{
+ Map<String,Integer> getRow = new HashMap<>();
+ // { row: 0, col: 1, rowspan: 3, colspan: 0},
+ getRow.put("row",row.get("RowNum"));
+ getRow.put("col",col);
+ getRow.put("rowspan",row.get("rowCount"));
+ getRow.put("colspan",0);
+ rowCount.add(getRow);
+ });
+ });
+
+
+ map.put("mergeCells",rowCount);
+
+ return map;
+ }
+
+ public Map<String,Object> orderPlanDecompositionSv(Date selectTime1, Date selectTime2,Report report) {
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",reportMapper.orderPlanDecompositionMp( selectTime1,selectTime2,report));
+ return map;
+ }
+
+ public Map<String,Object> rawMaterialRequisitionSv(Date selectTime1, Date selectTime2, Report report) {
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",reportMapper.rawMaterialRequisitionMp( selectTime1,selectTime2,report));
+ return map;
+ }
}
--
Gitblit v1.8.0