From 6b6f3fbd333894209e0df1822ff89881aa4319fe Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期五, 29 八月 2025 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 152 insertions(+), 13 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 2670764..af20ff9 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
@@ -23,6 +23,7 @@
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.sql.Date;
+import java.sql.SQLOutput;
import java.time.LocalDate;
import java.util.*;
import java.util.function.Function;
@@ -159,12 +160,12 @@
//鍒ゆ柇澶硅兌鍜屽す鑳跺悗宸ュ簭
//Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")
if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
- clos.put(uniqueList.get(i).get("process"), 15+i);
+ clos.put(uniqueList.get(i).get("process"), 14+i);
}
//鍒ゆ柇涓┖鍜屼腑绌哄悗宸ュ簭
//Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")
if(Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")){
- columns.add(15+i);
+ columns.add(14+i);
}
}
@@ -193,14 +194,15 @@
});
//鍒ゆ柇鍚庡伐搴忔娴佺▼鍗″彿鏄惁鏈夋鐮�
List<DamageDetails> hasBreak = damageDetailsMapper
- .selectList(new LambdaQueryWrapper<DamageDetails>()
- .eq(DamageDetails::getProcessId, dataList.get(i).get("processId"))
- .eq(DamageDetails::getOrderNumber, dataList.get(i).get("order_number"))
- .eq(DamageDetails::getTechnologyNumber, dataList.get(i).get("technology_number"))
- .eq(DamageDetails::getPatchStatus, 0)
- .gt(DamageDetails::getBreakageQuantity,0)
-
+ .getNotReview(dataList.get(i).get("processId"),
+ String.valueOf(dataList.get(i).get("order_number")),
+ String.valueOf(dataList.get(i).get("technology_number"))
);
+
+
+
+
+
if(!hasBreak.isEmpty()){
int finalI = i;
data.forEach((thisProcess, index)->{
@@ -211,12 +213,13 @@
thisProcess,
orderId
);
+
if(behindProcess!=null &&!behindProcess.isEmpty()){
Integer behindDamageSum = damageDetailsMapper.getBehindDamageSum(
dataList.get(finalI).get("processId"),
String.valueOf(dataList.get(finalI).get("order_number")),
String.valueOf(dataList.get(finalI).get("technology_number")),
- behindProcess
+ behindProcess,1
);
if(behindDamageSum>0){
data.put(thisProcess, String.valueOf(Integer.parseInt(data.get(thisProcess) )- behindDamageSum));
@@ -382,7 +385,7 @@
return map;
}
- public Map<String, Object> yieldSv(Date selectTime1, Date selectTime2, String selectProcesses, Report report) {
+ public Map<String, Object> yieldSv(String selectTime1, String 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());
@@ -826,9 +829,138 @@
List<Map<String, String>> dataList = reportMapper.processCardProgressCollectMp(orderId);
//鑾峰彇琛ㄥご宸ュ簭绛涢�夋暟鎹�
List<Map<String, String>> uniqueList = orderProcessDetailMapper.filterOrderProcess(orderId);
-
map.put("title", uniqueList);
- return null;
+ Map<String,Map<String,Object>> clos = new HashMap<>();
+ for (int i=0;i<uniqueList.size();i++){
+ //鏍规嵁娴佺▼鏌ヨ鍩虹鏁版嵁
+ BasicData basicData = basicDataMapper.selectOne(
+ new QueryWrapper<BasicData>()
+ .eq("basic_category","process")
+ .eq("basic_name",uniqueList.get(i).get("process"))
+ .last("limit 1")
+ );
+ Map<String,Object> getCol = new HashMap<>();
+ //鍒ゆ柇澶硅兌鍜屽す鑳跺悗宸ュ簭
+ //Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")
+ if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
+ getCol.put("col", 11+i);
+ getCol.put("step","stepA");
+ clos.put(uniqueList.get(i).get("process"), getCol);
+ }
+ //鍒ゆ柇涓┖鍜屼腑绌哄悗宸ュ簭
+ //Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")
+ if(Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")){
+ columns.add(11+i);
+ getCol.put("col", 11+i);
+ getCol.put("step","stepB");
+ clos.put(uniqueList.get(i).get("process"), getCol);
+ }
+ }
+ List<Map<String, Object>> 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", ((Number) row.get("RowNum")).intValue());
+ getRow.put("col", col);
+ getRow.put("rowspan", ((Number) row.get("rowCount")).intValue());
+ getRow.put("colspan", 0);
+ rowCount.add(getRow);
+ });
+ });
+
+ //寰幆缁撴灉
+ for (int i=0;i<dataList.size();i++ ) {
+ dataList.get(i).put("reportWorkQuantityShow",dataList.get(i).get("reportWorkQuantity"));
+ Map<String, String> data = JSON.parseObject(dataList.get(i).get("reportWorkQuantity"),
+ new TypeReference<Map<String, String>>() {
+ });
+ Map<String, String> dataShow = JSON.parseObject(dataList.get(i).get("reportWorkQuantityShow"),
+ new TypeReference<Map<String, String>>() {
+ });
+ //鍒ゆ柇鍚庡伐搴忔娴佺▼鍗″彿鏄惁鏈夋鐮�
+ List<DamageDetails> hasBreak = damageDetailsMapper
+ .getNotReview(dataList.get(i).get("process_id"),
+ null,
+ String.valueOf(dataList.get(i).get("technology_number"))
+ );
+
+ if(!hasBreak.isEmpty()){
+ int finalI = i;
+ data.forEach((thisProcess, index)->{
+ String behindProcess = orderProcessDetailMapper.getBehindProcess(
+ dataList.get(finalI).get("process_id"),
+ String.valueOf(dataList.get(finalI).get("order_number")),
+ String.valueOf(dataList.get(finalI).get("technology_number")),
+ thisProcess,
+ orderId
+ );
+
+ if(behindProcess!=null &&!behindProcess.isEmpty()){
+ Integer behindDamageSum = damageDetailsMapper.getBehindDamageSum(
+ dataList.get(finalI).get("process_id"),
+ String.valueOf(dataList.get(finalI).get("order_number")),
+ String.valueOf(dataList.get(finalI).get("technology_number")),
+ behindProcess,
+ null
+ );
+ if(behindDamageSum>0){
+ data.put(thisProcess, String.valueOf(Integer.parseInt(data.get(thisProcess) )- behindDamageSum));
+ dataShow.put(thisProcess, String.valueOf(Integer.parseInt(dataShow.get(thisProcess) )- behindDamageSum));
+ }
+
+ }
+ });
+
+ }
+
+ if(!clos.isEmpty()){
+ Integer max = orderGlassDetailMapper
+ .getMaxTechnologyNumberByGroup(dataList.get(i).get("order_id"),
+ String.valueOf(dataList.get(i).get("order_number")),
+ String.valueOf(dataList.get(i).get("group"))
+ );
+ Integer min = orderGlassDetailMapper
+ .getMinTechnologyNumberByGroup(dataList.get(i).get("order_id"),
+ String.valueOf(dataList.get(i).get("order_number")),
+ String.valueOf(dataList.get(i).get("group"))
+ );
+
+ for (String key : clos.keySet()) {
+ if(data.get(key) != null){
+ //鍒ゆ柇鏄す鑳跺伐搴�
+ if( clos.get(key).get("step")=="stepA"){
+ if(min == Integer.parseInt(String.valueOf(dataList.get(i).get("technology_number"))) ){
+ Map<String, Integer> getRow = new HashMap<>();
+ getRow.put("row", i );
+ getRow.put("col", (Integer) clos.get(key).get("col"));
+ getRow.put("rowspan", max-min+1);
+ getRow.put("colspan", 0);
+ rowCount.add(getRow);
+ }else{
+ data.put(key,"0");
+ }
+ }else{//涓┖锛屼腑绌哄悗宸ュ簭
+ //灏忕墖搴忓彿涓嶆槸1 鐨勬椂鍊欒祴鍊�0
+ if(Integer.parseInt(String.valueOf(dataList.get(i).get("technology_number"))) !=1){
+ data.put(key,"0");
+ }
+ }
+ }
+ }
+ }
+ dataList.get(i).put("reportWorkQuantity",JSON.toJSONString(data));
+ dataList.get(i).put("reportWorkQuantityShow",JSON.toJSONString(dataShow));
+
+ }
+
+ map.put("mergeCells", rowCount);
+
+ map.put("data",dataList);
+
+
+ return map;
}
public Map<String, Object> processCardProgressReportSv(String orderId, List<Integer> columns) {
@@ -904,4 +1036,11 @@
return map;
}
+
+ public Map<String, Object> yieldProcessSv(String selectTime1, String selectTime2, Report report) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", reportMapper.yieldProcessMp(selectTime1, selectTime2, report));
+ map.put("process", productionSchedulingMapper.selectProcess());
+ return map;
+ }
}
--
Gitblit v1.8.0