From a8378db2feef3b08edc0a6594bec187051d3b754 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 13:32:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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 1a0998f..b1ba51e 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
@@ -464,6 +464,7 @@
}
}
+ itemmap.put("processName",processName);
}
@@ -740,7 +741,11 @@
Map<String, Object> itemmap = new HashMap<>();
Integer sumQuantity = flowCardMapper.getSumQuantity(flowCard.getOrderId());
- List<Map<String, Object>> details = flowCardMapper.getPrintCustomData(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getPrintQuantity());
+ Integer printQuantity = flowCard.getPrintQuantity();
+ if (printQuantity==null){
+ printQuantity=0;
+ }
+ List<Map<String, Object>> details = flowCardMapper.getPrintCustomData(flowCard.getProcessId(), flowCard.getOrderNumber(), printQuantity);
for (Map<String, Object> detail : details) {
detail.put("sumQuantity", sumQuantity);
@@ -902,13 +907,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;
@@ -1786,6 +1794,31 @@
}
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