From f68809ce9f7755daaafe9e451c80e91859cc5313 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 十一月 2025 14:37:06 +0800
Subject: [PATCH] 提交
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 273 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 190 insertions(+), 83 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 aa48c94..76a1175 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
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.TypeReference;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.common.AsyncQueryExecutor;
+import com.example.erp.entity.sd.*;
import com.example.erp.tools.AreaComputed.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,10 +13,6 @@
import com.example.erp.dto.pp.*;
import com.example.erp.entity.pp.DamageDetails;
import com.example.erp.entity.pp.Report;
-import com.example.erp.entity.sd.BasicData;
-import com.example.erp.entity.sd.OrderDetail;
-import com.example.erp.entity.sd.OrderGlassDetail;
-import com.example.erp.entity.sd.ProductDetail;
import com.example.erp.mapper.pp.*;
import com.example.erp.mapper.sd.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +50,7 @@
FlowCardMapper flowCardMapper;
private ReportingWorkMapper reportingWorkMapper;
+ private final OrderMapper orderMapper;
@Resource
private AsyncQueryExecutor asyncExecutor;
@@ -82,7 +80,10 @@
.eq("prod_id", orderDetail.getProductId())
.eq("glass_sort",dto1.getTechnologyNumber())
);
- dto1.setGlassName(productDetail.getDetail());
+ if(productDetail!=null){
+ dto1.setGlassName(productDetail.getDetail());
+ }
+
//basicData.getNickname().equals("stepC")
}else if(basicData.getNickname().equals("stepC")){
OrderGlassDetail orderGlassDetailGroup = orderGlassDetailMapper
@@ -133,7 +134,7 @@
ProductionSchedulingMapper productionSchedulingMapper, FlowCardMapper flowCardMapper,
OrderGlassDetailMapper orderGlassDetailMapper, BasicDataMapper basicDataMapper,
ProductDetailMapper productDetailMapper, OrderDetailMapper orderDetailMapper,
- ReportingWorkMapper reportingWorkMapper, DamageDetailsMapper damageDetailsMapper) {
+ ReportingWorkMapper reportingWorkMapper, DamageDetailsMapper damageDetailsMapper, OrderMapper orderMapper) {
this.reportMapper = reportMapper;
this.orderProcessDetailMapper = orderProcessDetailMapper;
this.productionSchedulingMapper = productionSchedulingMapper;
@@ -144,6 +145,7 @@
this.orderDetailMapper = orderDetailMapper;
this.reportingWorkMapper = reportingWorkMapper;
this.damageDetailsMapper = damageDetailsMapper;
+ this.orderMapper = orderMapper;
}
//娴佺▼鍗¤繘搴︽柟娉�
@@ -300,8 +302,6 @@
dataList.get(i).put("reportWorkQuantityShow",JSON.toJSONString(dataShow));
}
-
-
map.put("data",dataList );
@@ -485,13 +485,14 @@
public Map<String, Object> workInProgressSv(
Integer pageNum, Integer pageSize,
String orderId, String inputProject, String selectProcesses,
- String optionVal, WorkInProgressDTO workInProgressDTO) {
+ String optionVal,String terminationVals, WorkInProgressDTO workInProgressDTO) {
Integer offset = (pageNum - 1) * pageSize;
if ("null".equals(orderId)) orderId = "";
if ("null".equals(inputProject)) inputProject = "";
if ("null".equals(optionVal)) optionVal = "";
+ if ("null".equals(terminationVals)) terminationVals = "";
if ("all".equals(selectProcesses)) selectProcesses = "";
String laminating = reportMapper.getLaminating(selectProcesses);
@@ -502,6 +503,7 @@
String finalOrderId = orderId;
String finalInputProject = inputProject;
String finalSelectProcesses = selectProcesses;
+ String finalTerminationVals = terminationVals;
CompletableFuture<List<WorkInProgressDTO>> dataList2Future =
asyncExecutor.runAsync(() ->
reportMapper.workInProgressMpdataList2(
@@ -519,7 +521,7 @@
totalFuture = asyncExecutor.runAsync(() ->
reportMapper.workInProgressOrderFootSum(
- offset, pageSize, finalOrderId, finalInputProject, finalSelectProcesses, workInProgressDTO));
+ offset, pageSize, finalOrderId, finalInputProject, finalSelectProcesses,finalTerminationVals, workInProgressDTO));
} else if ("2".equals(optionVal)) {
// 娴佺▼鍗″彿姹囨��
@@ -529,25 +531,25 @@
totalFuture = asyncExecutor.runAsync(() ->
reportMapper.workInProgressOrderFootSum(
- offset, pageSize, finalOrderId, finalInputProject, finalSelectProcesses, workInProgressDTO));
+ offset, pageSize, finalOrderId, finalInputProject, finalSelectProcesses,finalTerminationVals, workInProgressDTO));
} else if ("3".equals(optionVal)) {
dataList1Future = asyncExecutor.runAsync(() ->
reportMapper.workInProgressMpdataList1(
- offset, pageSize, finalOrderId, finalInputProject, finalSelectProcesses, laminating, workInProgressDTO));
+ offset, pageSize, finalOrderId, finalInputProject, finalSelectProcesses, laminating,finalTerminationVals, workInProgressDTO));
totalFuture = asyncExecutor.runAsync(() ->
reportMapper.workInProgressOrderFootSum(
- offset, pageSize, finalOrderId, finalInputProject, finalSelectProcesses, workInProgressDTO));
+ offset, pageSize, finalOrderId, finalInputProject, finalSelectProcesses,finalTerminationVals, workInProgressDTO));
} else {
// 涓嶅垎缁�
dataList1Future = asyncExecutor.runAsync(() ->
reportMapper.workInProgressMpdataList1(
- offset, pageSize, finalOrderId, finalInputProject, finalSelectProcesses, laminating, workInProgressDTO));
+ offset, pageSize, finalOrderId, finalInputProject, finalSelectProcesses, laminating,finalTerminationVals, workInProgressDTO));
totalFuture = asyncExecutor.runAsync(() ->
reportMapper.workInProgressOrderFootSum(
- offset, pageSize, finalOrderId, finalInputProject, finalSelectProcesses, workInProgressDTO));
+ offset, pageSize, finalOrderId, finalInputProject, finalSelectProcesses,finalTerminationVals, workInProgressDTO));
}
// 绛夊緟鍏ㄩ儴浠诲姟瀹屾垚
@@ -666,70 +668,166 @@
return map;
}
- public Map<String, Object> productionScheduleSv(String orderId, List<Integer> columns) {
+ public Map<String, Object> productionScheduleSv(String orderId, List<String> columns) {
+
+
Map<String, Object> map = new HashMap<>();
//鑾峰彇琛ㄦ牸鍐呭鏁版嵁
- map.put("data", reportMapper.productionScheduleMp(orderId));
+ List<Map<String, String>> dataList = reportMapper.productionScheduleMp(orderId);
+
//鑾峰彇琛ㄥご宸ュ簭绛涢�夋暟鎹�
- List<Map<String, String>> processFilterList = orderProcessDetailMapper.filterOrderProcess(orderId);
- List<Map<String, String>> processList = processFilterList;
+ List<Map<String, String>> uniqueList = orderProcessDetailMapper.filterOrderProcess(orderId);
- 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);
+ Map<String,Integer> clos = new HashMap<>();
+ HashMap<String,HashMap<String,Map<String, Integer>>> rowCount = new HashMap<String,HashMap<String,Map<String, Integer>>>();
+ 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")
+ );
+
+ //鍒ゆ柇澶硅兌鍜屽す鑳跺悗宸ュ簭
+ //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"), 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("reportWorkQuantity."+uniqueList.get(i).get("process"));
+ }
+ }
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);
- });
+ HashMap<Integer,Map<String, Object>> getRowCountMap = new HashMap<>();
+ getRowCount.forEach(col -> {
+ Integer getRowCountOrderNumber = ((Number) col.get("order_number")).intValue();
+ getRowCountMap.put(getRowCountOrderNumber, col);
});
+ //寰幆缁撴灉
+ for (int i=0;i<dataList.size();i++ ) {
+ Integer orderNumber = Integer.parseInt(String.valueOf(dataList.get(i).get("order_number")));
+ Integer technologyNumber = Integer.parseInt(String.valueOf(dataList.get(i).get("technology_number")));
+ int finalI1 = i;
+ columns.forEach(col -> {
+ if(rowCount.get(col) == null){
+ rowCount.put(col, new HashMap<String,Map<String,Integer>>());
+ }
+ if(getRowCountMap.get(orderNumber) != null){
+ Map<String,Object> row = getRowCountMap.get(orderNumber);
+ Map<String, Integer> getRow = new HashMap<>();
+ //鍒ゆ柇褰撳墠姝ゆ 鏄惁涓虹涓�琛� 骞朵笖鐩稿悓搴忓彿
+ if(technologyNumber==1){
+ getRow.put("rowspan", ((Number) row.get("rowCount")).intValue());
+ getRow.put("colspan", 1);
+ }else{
+ getRow.put("rowspan", 0);
+ getRow.put("colspan", 0);
+ }
+ rowCount.get(col).put(finalI1+"_"+col, getRow);
+ }
+
+
+ });
+
+
+ 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("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)->{
+ String behindProcess = orderProcessDetailMapper.getBehindProcess(
+ dataList.get(finalI).get("processId"),
+ 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("processId"),
+ String.valueOf(dataList.get(finalI).get("order_number")),
+ String.valueOf(dataList.get(finalI).get("technology_number")),
+ behindProcess,1
+ );
+ 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 (rowCount.get("reportWorkQuantity."+key)==null){
+ rowCount.put("reportWorkQuantity."+key, new HashMap<String,Map<String,Integer>>());
+ }
+ Map<String, Integer> getRow = new HashMap<>();
+ if(min == Integer.parseInt(String.valueOf(dataList.get(i).get("technology_number"))) ){
+
+ // { row: 0, col: 1, rowspan: 3, colspan: 0},
+ //getRow.put("row", i );
+ getRow.put("rowspan", max-min+1);
+ getRow.put("colspan", 1);
+
+ }else{
+ getRow.put("rowspan", 0);
+ getRow.put("colspan", 0);
+ data.put(key,"0");
+ }
+ rowCount.get("reportWorkQuantity."+key).put(i+"_reportWorkQuantity."+key, getRow);
+ }
+ }
+ }
+ dataList.get(i).put("reportWorkQuantity",JSON.toJSONString(data));
+ dataList.get(i).put("reportWorkQuantityShow",JSON.toJSONString(dataShow));
+
+ }
+
+
+
+
+ map.put("data",dataList );
map.put("mergeCells", rowCount);
return map;
@@ -874,13 +972,17 @@
}
String inputVal= (String) dates.get("inputVal");
String project= (String) dates.get("project");
- if ("null".equals(inputVal)) {
+ String terminationVals= dates.get("terminationVals").toString();
+ if (inputVal==null) {
inputVal = "";
}
- if ("null".equals(project)) {
+ if (project==null) {
project = "";
}
- List<WorkInProgressDTO> dataList1 =reportMapper.exportWorkInProgressMp(process,inputVal,project);
+ if (terminationVals==null) {
+ terminationVals = "";
+ }
+ List<WorkInProgressDTO> dataList1 =reportMapper.exportWorkInProgressMp(process,inputVal,project,terminationVals);
List<WorkInProgressDTO> dataList2 =reportMapper.exportWorkInProgressMpdataList2(process);
mergeTeamsGroupsName(dataList1, dataList2);
@@ -1043,7 +1145,7 @@
public Map<String, Object> workInProgressCombinationSv(
Integer pageNum, Integer pageSize,
String orderId, String inputProject, String selectProcesses,
- String optionVal, WorkInProgressDTO workInProgressDTO) {
+ String optionVal,String terminationVal, WorkInProgressDTO workInProgressDTO) {
Integer offset = (pageNum - 1) * pageSize;
@@ -1055,6 +1157,9 @@
}
if ("null".equals(optionVal)) {
optionVal = "";
+ }
+ if ("null".equals(terminationVal)) {
+ terminationVal = "";
}
if ("all".equals(selectProcesses)) {
selectProcesses = "";
@@ -1072,17 +1177,16 @@
// 鏈�缁堟暟鎹泦鍚�
List<Map<String, Object>> resultList = new ArrayList<>();
-
if (!"".equals(selectProcesses)) {
laminating = reportingWorkMapper.getProcessLaminating(selectProcesses);
List<Map<String, Object>> singleResult =
- reportMapper.getWorkInProgressCombination(selectProcesses, laminating, optionVal);
+ reportMapper.getWorkInProgressCombination(selectProcesses, laminating, optionVal,terminationVal);
if (singleResult != null && !singleResult.isEmpty()) {
resultList.addAll(singleResult);
}
Map<String, Object> total =
- reportMapper.getWorkInProgressCombinationFootSum(selectProcesses, laminating, optionVal);
+ reportMapper.getWorkInProgressCombinationFootSum(selectProcesses, laminating, optionVal,terminationVal);
if (total != null) {
BigDecimal stockNum = (BigDecimal) total.get("stockNum");
BigDecimal stockArea = (BigDecimal) total.get("stockArea");
@@ -1100,14 +1204,14 @@
laminating = reportingWorkMapper.getProcessLaminating(process);
List<Map<String, Object>> singleResult =
- reportMapper.getWorkInProgressCombination(process, laminating, optionVal);
+ reportMapper.getWorkInProgressCombination(process, laminating, optionVal,terminationVal);
if (singleResult != null && !singleResult.isEmpty()) {
resultList.addAll(singleResult);
}
Map<String, Object> total =
- reportMapper.getWorkInProgressCombinationFootSum(process, laminating, optionVal);
+ reportMapper.getWorkInProgressCombinationFootSum(process, laminating, optionVal,terminationVal);
if (total != null) {
BigDecimal stockNum = (BigDecimal) total.get("stockNum");
BigDecimal stockArea = (BigDecimal) total.get("stockArea");
@@ -1139,11 +1243,15 @@
}
String inputVal= (String) dates.get("inputVal");
String project= (String) dates.get("project");
- if ("null".equals(inputVal)) {
+ String terminationVals= dates.get("terminationVals").toString();
+ if (inputVal==null) {
inputVal = "";
}
- if ("null".equals(project)) {
+ if (project==null) {
project = "";
+ }
+ if (terminationVals==null) {
+ terminationVals = "";
}
String laminating = "";
@@ -1157,7 +1265,7 @@
if (!"".equals(process)) {
laminating = reportingWorkMapper.getProcessLaminating(process);
List<WorkInProgressCombinationDTO> singleResult =
- reportMapper.exportWorkInProgressCombination(process, laminating, inputVal);
+ reportMapper.exportWorkInProgressCombination(process, laminating, inputVal,terminationVals);
if (singleResult != null && !singleResult.isEmpty()) {
resultList.addAll((Collection<? extends WorkInProgressCombinationDTO>) singleResult);
}
@@ -1168,7 +1276,7 @@
laminating = reportingWorkMapper.getProcessLaminating(processVal);
List<WorkInProgressCombinationDTO> singleResult =
- reportMapper.exportWorkInProgressCombination(processVal, laminating, inputVal);
+ reportMapper.exportWorkInProgressCombination(processVal, laminating, inputVal,terminationVals);
if (singleResult != null && !singleResult.isEmpty()) {
resultList.addAll((Collection<? extends WorkInProgressCombinationDTO>) singleResult);
@@ -1334,11 +1442,10 @@
dataList.get(i).put("reportWorkQuantityShow",JSON.toJSONString(dataShow));
}
-
+ Order order = orderMapper.selectOrderId(orderId);
map.put("mergeCells", rowCount);
-
map.put("data",dataList);
-
+ map.put("order",order);
return map;
}
--
Gitblit v1.8.0