From a85adf40d5e30d3b9e2a848cf8fd073998ff5c8b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 29 五月 2024 15:26:07 +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 | 214 +++++++++++++++++++++++++++++++----------------------
1 files changed, 124 insertions(+), 90 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 55e7edd..454bc48 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
@@ -3,6 +3,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.example.erp.dto.pp.DamageReportDTO;
import com.example.erp.entity.pp.DamageDetails;
import com.example.erp.entity.pp.Report;
import com.example.erp.mapper.pp.ProductionSchedulingMapper;
@@ -23,7 +24,7 @@
private final ProductionSchedulingMapper productionSchedulingMapper;
- public ReportService(ReportMapper reportMapper, OrderProcessDetailMapper orderProcessDetailMapper,ProductionSchedulingMapper productionSchedulingMapper) {
+ public ReportService(ReportMapper reportMapper, OrderProcessDetailMapper orderProcessDetailMapper, ProductionSchedulingMapper productionSchedulingMapper) {
this.reportMapper = reportMapper;
this.orderProcessDetailMapper = orderProcessDetailMapper;
this.productionSchedulingMapper = productionSchedulingMapper;
@@ -36,24 +37,24 @@
map.put("data", reportMapper.processCardProgressMp(orderId));
//鑾峰彇琛ㄥご宸ュ簭绛涢�夋暟鎹�
- List<Map<String,String>> processFilterList = orderProcessDetailMapper.filterOrderProcess(orderId);
- List<Map<String,String>> processList = processFilterList;
+ 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 =
+ 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()){
+ );
+ if (!lastProcessList.isEmpty()) {
int finalI = i;
lastProcessList.forEach(lastProcess -> {
- if(filterList.contains(lastProcess.get("process"))){
+ if (filterList.contains(lastProcess.get("process"))) {
processList.add(lastProcess);
}
});
@@ -76,55 +77,53 @@
seenValues.add(value);
}
}
- map.put("title", uniqueList );
+ 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<>();
+ 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);
+ 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);
+ map.put("mergeCells", rowCount);
return map;
}
- public Map<String,Object> crossProcessBreakingSv(Integer pageNum, Integer pageSize, List<String> selectDate, DamageDetails damageDetails) {
- Integer offset = (pageNum-1)*pageSize;
+ public Map<String, Object> crossProcessBreakingSv(Integer pageNum, Integer pageSize, List<String> selectDate, DamageDetails damageDetails) {
+ Integer offset = (pageNum - 1) * pageSize;
String endDate = LocalDate.now().toString();
String startDate = LocalDate.now().minusDays(15).toString();
- if(selectDate !=null && selectDate.size()==2){
- if(!selectDate.get(0).isEmpty()){
+ if (selectDate != null && selectDate.size() == 2) {
+ if (!selectDate.get(0).isEmpty()) {
startDate = selectDate.get(0);
}
- if(!selectDate.get(1).isEmpty()){
+ if (!selectDate.get(1).isEmpty()) {
endDate = selectDate.get(1);
}
}
- Map<String,Object> map = new HashMap<>();
- map.put("data",reportMapper.getProcessBreaking(offset, pageSize, startDate, endDate, damageDetails));
- map.put("total",reportMapper.getProcessBreakingTotal(offset, pageSize, startDate, endDate, damageDetails));
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportMapper.getProcessBreaking(offset, pageSize, startDate, endDate, damageDetails));
+ map.put("total", reportMapper.getProcessBreakingTotal(offset, pageSize, startDate, endDate, damageDetails));
List<String> list = new ArrayList<>();
list.add(startDate);
list.add(endDate);
- map.put("selectDate",list);
+ map.put("selectDate", list);
// map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, orderDetail));
return map;
}
- public Map<String,Object> workInProgressSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report) {
+ public Map<String, Object> workInProgressSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report) {
if ("null".equals(orderId)) {
orderId = "";
@@ -132,46 +131,48 @@
if ("null".equals(inputProject)) {
inputProject = "";
}
- Map<String,Object> map = new HashMap<>();
- map.put("data",reportMapper.workInProgressMp( selectTime1, selectTime2,orderId,inputProject,selectProcesses,report));
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportMapper.workInProgressMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
map.put("process", productionSchedulingMapper.selectProcess());
return map;
}
- public Map<String,Object> selectProcessToBeCompletedSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report) {
+ public Map<String, Object> selectProcessToBeCompletedSv(Date selectTime1, Date selectTime2, String orderId, String inputProject, String selectProcesses, Report report) {
if ("null".equals(orderId)) {
orderId = "";
}
if ("null".equals(inputProject)) {
inputProject = "";
}
- Map<String,Object> map = new HashMap<>();
- map.put("data",reportMapper.processToBeCompletedMp( selectTime1, selectTime2,orderId,inputProject,selectProcesses,report));
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportMapper.processToBeCompletedMp(selectTime1, selectTime2, orderId, inputProject, selectProcesses, report));
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));
+ public Map<String, Object> selectDamageReportSv(Integer pageNum, Integer pageSize, Date selectTime1, Date selectTime2, DamageReportDTO damageReportDTO) {
+ Integer offset = (pageNum - 1) * pageSize;
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportMapper.selectDamageReportMp(offset, pageSize, selectTime1, selectTime2, damageReportDTO));
+ map.put("total", reportMapper.getDamageReportPageTotal(offset, pageSize, selectTime1, selectTime2, damageReportDTO));
return map;
}
- public Map<String,Object> splittingDetailsOutsideSv(String orderId, Report report) {
- Map<String,Object> map = new HashMap<>();
- map.put("data",reportMapper.splittingDetailsOutsideMp( orderId,report));
+ 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));
+ 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));
+ 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;
}
@@ -182,24 +183,24 @@
map.put("data", reportMapper.productionScheduleMp(orderId));
//鑾峰彇琛ㄥご宸ュ簭绛涢�夋暟鎹�
- List<Map<String,String>> processFilterList = orderProcessDetailMapper.filterOrderProcess(orderId);
- List<Map<String,String>> processList = processFilterList;
+ 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 =
+ 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()){
+ if (!lastProcessList.isEmpty()) {
int finalI = i;
lastProcessList.forEach(lastProcess -> {
- if(filterList.contains(lastProcess.get("process"))){
+ if (filterList.contains(lastProcess.get("process"))) {
processList.add(lastProcess);
}
});
@@ -222,27 +223,25 @@
seenValues.add(value);
}
}
- map.put("title", uniqueList );
+ 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<>();
+ 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);
+ 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);
+ map.put("mergeCells", rowCount);
return map;
}
@@ -250,27 +249,27 @@
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));
+ map.put("data", reportMapper.taskCompletionStatusMp(selectTime1, selectTime2));
//鑾峰彇琛ㄥご宸ュ簭绛涢�夋暟鎹�
- List<Map<String,String>> processFilterList = orderProcessDetailMapper.filterOrderProcessCollect(selectTime1,selectTime2);
- List<Map<String,String>> processList = processFilterList;
+ 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 =
+ 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()){
+ if (!lastProcessList.isEmpty()) {
int finalI = i;
lastProcessList.forEach(lastProcess -> {
- if(filterList.contains(lastProcess.get("process"))){
+ if (filterList.contains(lastProcess.get("process"))) {
processList.add(lastProcess);
}
});
@@ -293,44 +292,79 @@
seenValues.add(value);
}
}
- map.put("title", uniqueList );
+ 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<>();
+ 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);
+ 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);
+ 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));
+ 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));
+ 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;
}
public List exportCrossProcessBreakingSv(List<LocalDate> dates) {
return reportMapper.exportCrossProcessBreakingMp(dates);
}
+
+ public List exportDamageReportSv(List<LocalDate> dates) {
+
+ return reportMapper.exportDamageReportMp(dates);
+ }
+
+ public List exportOrderPlanDecompositionSv(List<LocalDate> dates) {
+ return reportMapper.exportOrderPlanDecompositionMp(dates);
+ }
+
+ public List exportProcessToBeCompletedSv(Map<String, Object> dates) {
+ List<LocalDate> date= (List<LocalDate>) dates.get("date");
+ String process= (String) dates.get("processes");
+ String inputVal= (String) dates.get("inputVal");
+ String project= (String) dates.get("project");
+ if ("null".equals(inputVal)) {
+ inputVal = "";
+ }
+ if ("null".equals(project)) {
+ project = "";
+ }
+ return reportMapper.exportProcessToBeCompletedMp(date,process,inputVal,project);
+ }
+
+ public List exportWorkInProgressSv(Map<String, Object> dates) {
+ List<LocalDate> date= (List<LocalDate>) dates.get("date");
+ String process= (String) dates.get("processes");
+ String inputVal= (String) dates.get("inputVal");
+ String project= (String) dates.get("project");
+ if ("null".equals(inputVal)) {
+ inputVal = "";
+ }
+ if ("null".equals(project)) {
+ project = "";
+ }
+ return reportMapper.exportWorkInProgressMp(date,process,inputVal,project);
+ }
}
--
Gitblit v1.8.0