From 25cc86fd8a2fb3b2bb6b385cba0adaf89ff3dcdc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 十二月 2025 16:39:32 +0800
Subject: [PATCH] 流程卡进度打印部分代码
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index 738d9e2..1e40d95 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -33,7 +33,6 @@
import java.io.IOException;
-import java.sql.Date;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@@ -465,6 +464,7 @@
}
}
+ itemmap.put("processName",processName);
}
@@ -903,13 +903,16 @@
List<Map<String, Object>> processList = flowCardMapper.getProcessList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
//宸ュ簭鍒楄〃
List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();
+ itemmap.put("count", flowCardMapper.countFlowCard(flowCard.getOrderId()));
itemmap.put("processList", processList);
itemmap.put("processNameList", processNameList);
// itemmap.put("numberList", numberList);
list.add(itemmap);
}
+
}
+
map.put("data", list);
//鍒濆鍖栧��
printLike = null;
@@ -1354,11 +1357,13 @@
}
//灏嗗師鏉ュ凡鎶ュ伐鐨勬暟鎹洿鏂�
if (resultList != null && !resultList.isEmpty()) {
- for (OrderProcessDetail d : resultList) {
- flowCardMapper.updateOrderProcessDetail(d.getProcessId(),d.getOrderNumber(),d.getTechnologyNumber(),
- d.getReportingWorkNumCount(),d.getReportingWorkNum(),d.getBrokenNum(),d.getProcess());
-
+ for (String number : numberList) {
+ for (OrderProcessDetail d : resultList) {
+ flowCardMapper.updateOrderProcessDetail(d.getProcessId(),number,d.getTechnologyNumber(),
+ d.getReportingWorkNumCount(),d.getReportingWorkNum(),d.getBrokenNum(),d.getProcess());
+ }
}
+
}
return true;
@@ -1758,6 +1763,58 @@
}
+ public boolean getNewProcessSv(String processId, String orderNumber, String technologyNumber, List<String> orderProcess) {
+
+ // 鑾峰彇鏈�鏂版姤宸ュ伐搴�
+ List<Map<String, Object>> newProcess = flowCardMapper.getNewProcessMp(processId, orderNumber, technologyNumber);
+
+ if (newProcess == null || newProcess.isEmpty()) {
+ return false; // 鎵句笉鍒版爣鍑嗗��
+ }
+
+ // 鏈�鏂板伐搴忔帓搴忓彿
+ int standardSort = Integer.parseInt(newProcess.get(0).get("sort").toString());
+
+ // 寰幆 orderProcess 鐨勬瘡涓�涓伐搴忥紝鏌ヨ瀹冧滑鐨� sort
+ for (String processName : orderProcess) {
+ Map<String, Object> data = flowCardMapper.getProcessInfo(processName);
+
+ if (data == null) {
+ return false; // 宸ュ簭鏌ヤ笉鍒�
+ }
+ int orderSort = Integer.parseInt(data.get("sort").toString());
+ // orderSort 蹇呴』 > standardSort
+ if (orderSort <= standardSort) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public Map<String, Object> PrintProgressProcessCardSv(List<String> selectDate, List<String> columns) {
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(15).toString();
+ if(selectDate !=null && selectDate.size()==2){
+ if(!selectDate.get(0).isEmpty()){
+ startDate = selectDate.get(0);
+ }
+ if(!selectDate.get(1).isEmpty()){
+ endDate = selectDate.get(1);
+ }
+ }
+ Map<String, Object> map = new HashMap<>();
+ //鑾峰彇琛ㄦ牸鍐呭鏁版嵁
+ List<Map<String, String>> dataList = flowCardMapper.PrintProgressProcessCardData(startDate, endDate);
+ //鑾峰彇琛ㄥご宸ュ簭绛涢�夋暟鎹�
+ List<Map<String, String>> uniqueList = flowCardMapper.OrderProcess();
+ map.put("title", uniqueList);
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
+ map.put("data",dataList );
+ return map;
+ }
}
--
Gitblit v1.8.0