From a12834e87a110fbf1414e24eb574f2e87b29e03c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 11 八月 2025 09:10:01 +0800
Subject: [PATCH] 提交装箱打印添加批次
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 113 +++++++++++++++++++++++++++-----------------------------
1 files changed, 54 insertions(+), 59 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 a6cbc14..f7c785f 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
@@ -20,6 +20,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
+import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.sql.Date;
import java.time.LocalDate;
@@ -48,7 +49,6 @@
//涓婂伐搴忔姤宸ョ彮缁�
private void mergeTeamsGroupsName( List<WorkInProgressDTO> dataList1,List<WorkInProgressDTO> dataList2) {
-
for (WorkInProgressDTO dto1 : dataList1) {
//鏍规嵁褰撳墠宸ュ簭鑾峰彇 鏄惁涓哄崟鐗囥�佸す鑳躲�佹垨鑰呭叏閮�
BasicData basicData = basicDataMapper.
@@ -72,7 +72,7 @@
.eq("glass_sort",dto1.getTechnologyNumber())
);
dto1.setGlassName(productDetail.getDetail());
-
+ //basicData.getNickname().equals("stepC")
}else if(basicData.getNickname().equals("stepC")){
OrderGlassDetail orderGlassDetailGroup = orderGlassDetailMapper
.selectOne(new QueryWrapper<OrderGlassDetail>()
@@ -142,46 +142,8 @@
//鑾峰彇琛ㄥご宸ュ簭绛涢�夋暟鎹�
- 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<>();
for (int i=0;i<uniqueList.size();i++){
@@ -193,25 +155,27 @@
.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"), 15+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);
}
}
- List<Map<String, Integer>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
+ 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", row.get("RowNum"));
+ getRow.put("row", ((Number) row.get("RowNum")).intValue());
getRow.put("col", col);
- getRow.put("rowspan", row.get("rowCount"));
+ getRow.put("rowspan", ((Number) row.get("rowCount")).intValue());
getRow.put("colspan", 0);
rowCount.add(getRow);
});
@@ -222,18 +186,19 @@
Map<String, String> data = JSON.parseObject(dataList.get(i).get("reportWorkQuantity"),
new TypeReference<Map<String, String>>() {
});
+ 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){
- 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"))
- );
+
if(min == Integer.parseInt(String.valueOf(dataList.get(i).get("technology_number"))) ){
Map<String, Integer> getRow = new HashMap<>();
// { row: 0, col: 1, rowspan: 3, colspan: 0},
@@ -297,6 +262,7 @@
if (selectProcesses.equals("鍏ㄩ儴")){
selectProcesses="";
}
+ String laminating = reportMapper.getLaminating(selectProcesses);
Map<String, Object> map = new HashMap<>();
List<WorkInProgressDTO> dataList2 =reportMapper.workInProgressMpdataList2(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO);
if (optionVal.equals("1")){
@@ -321,7 +287,7 @@
} else {
//娌℃湁閫夋嫨鍒嗙粍
//map.put("data", reportMapper.workInProgressMp(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
- List<WorkInProgressDTO> dataList1 =reportMapper.workInProgressMpdataList1(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO);
+ List<WorkInProgressDTO> dataList1 =reportMapper.workInProgressMpdataList1(offset, pageSize, orderId, inputProject, selectProcesses,laminating, workInProgressDTO);
mergeTeamsGroupsName(dataList1, dataList2);
map.put("data",dataList1);
//map.put("total", reportMapper.workInProgressTotal(offset, pageSize, orderId, inputProject, selectProcesses, workInProgressDTO));
@@ -425,15 +391,15 @@
map.put("title", uniqueList);
- List<Map<String, Integer>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
+ 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", row.get("RowNum"));
+ getRow.put("row", ((Number) row.get("RowNum")).intValue());
getRow.put("col", col);
- getRow.put("rowspan", row.get("rowCount"));
+ getRow.put("rowspan", ((Number) row.get("rowCount")).intValue());
getRow.put("colspan", 0);
rowCount.add(getRow);
});
@@ -647,7 +613,25 @@
process="";
}
String laminating = reportMapper.getLaminating(process);
- return reportMapper.exportTeamOutputMp(date,process,laminating);
+ List<TeamOutputDTO> list = reportMapper.exportTeamOutputMp(date, process, laminating);
+
+ // 娓呮礂姣忎釜 TeamOutputDTO 瀹炰緥鐨� String 瀛楁锛堝幓闄ゅ墠鍚庣┖鏍硷級
+ for (TeamOutputDTO dto : list) {
+ for (Field field : dto.getClass().getDeclaredFields()) {
+ field.setAccessible(true);
+ try {
+ Object value = field.get(dto);
+ if (value instanceof String) {
+ String trimmed = ((String) value).trim();
+ field.set(dto, trimmed);
+ }
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ return list;
}
public Map<String, Object> workInProgressCombinationSv(
@@ -788,4 +772,15 @@
return resultList;
}
+
+ public Object processCardProgressCollectSv(String orderId, List<Integer> columns) {
+ Map<String, Object> map = new HashMap<>();
+ //鑾峰彇琛ㄦ牸鍐呭鏁版嵁
+ List<Map<String, String>> dataList = reportMapper.processCardProgressCollectMp(orderId);
+ //鑾峰彇琛ㄥご宸ュ簭绛涢�夋暟鎹�
+ List<Map<String, String>> uniqueList = orderProcessDetailMapper.filterOrderProcess(orderId);
+
+ map.put("title", uniqueList);
+ return null;
+ }
}
--
Gitblit v1.8.0