From aa3bd3741b94f50f0c1d7e3a137bb681d7421294 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 03 三月 2025 09:59:21 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 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 6d86d1f..057678f 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
@@ -219,7 +219,7 @@
return map;
}
- public Object selectPrintFlowCardSv(Date selectTime1, Date selectTime2, String orderId, String project, String userId, FlowCard flowCard) {
+ public Object selectPrintFlowCardSv(Date selectTime1, Date selectTime2, String orderId, String project, String userId, Integer state, FlowCard flowCard) {
if ("null".equals(orderId)) {
orderId = "";
}
@@ -227,7 +227,7 @@
project = "";
}
Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.selectPrintFlowCardMp(selectTime1, selectTime2, orderId, project, flowCard));
+ map.put("data", flowCardMapper.selectPrintFlowCardMp(selectTime1, selectTime2, orderId, project,state, flowCard));
String roleId = flowCardMapper.selectUserMp(userId);
map.put("user", roleId);
return map;
@@ -776,10 +776,12 @@
if (!flowCardList.isEmpty()) {
for (FlowCard flowCard : flowCardList) {
Map<String, Object> itemmap = new HashMap<>();
- if (type == 1) {
+ if (type == 1) {//鏄庣粏鎵撳嵃
itemmap.put("detail", flowCardMapper.selectPrintDetailsMp(flowCard.getOrderId()));
- } else if (type == 2) {
+ } else if (type == 2) {//鏄庣粏鍒嗘灦鎵撳嵃
itemmap.put("detail", flowCardMapper.selectPrintDetailsMp1(flowCard.getOrderId()));
+ }else if (type == 3) {//璁㈠崟鎵撳嵃
+ itemmap.put("detail", flowCardMapper.selectPrintDetailsMp2(flowCard.getOrderId()));
}
list.add(itemmap);
@@ -799,20 +801,28 @@
if (lableType != 2) {//鎴愬搧鏍囩
for (FlowCard flowCard : flowCardList) {
+ String orderId = flowCard.getOrderId();
String processId = flowCard.getProcessId();
String orderNumber = flowCard.getOrderNumber().toString();
+ if (processId!=null){
+ // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
+ if (processedProcessIds.contains(processId) && processedProcessIds.contains(orderNumber)) {
+ continue;
+ }
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getPrintCustomDataDetails(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getPrintQuantity()));
+ list.add(itemmap);
- // 妫�鏌ユ槸鍚﹀凡缁忓鐞嗚繃璇� processId锛屽鏋滃鐞嗚繃鍒欒烦杩�
- if (processedProcessIds.contains(processId) && processedProcessIds.contains(orderNumber)) {
- continue;
- }
- Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getPrintCustomDataDetails(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getPrintQuantity()));
- list.add(itemmap);
+ // 灏嗚 processId 鍔犲叆宸插鐞嗛泦鍚�
+ processedProcessIds.add(processId);
+ processedProcessIds.add(orderNumber);
+ } else{
- // 灏嗚 processId 鍔犲叆宸插鐞嗛泦鍚�
- processedProcessIds.add(processId);
- processedProcessIds.add(orderNumber);
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getPrintOrderDataDetails(flowCard.getOrderId(), flowCard.getOrderNumber(), flowCard.getPrintQuantity()));
+ list.add(itemmap);
+ }
+
}
} else {//灏忕墖鏍囩
for (FlowCard flowCard : flowCardList) {
--
Gitblit v1.8.0