From 37fce1a5a19d25453eb7481ce56eb71423e72af1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 25 四月 2024 11:43:47 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 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 86ca4da..981e4d7 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
@@ -14,6 +14,7 @@
import org.springframework.stereotype.Service;
import java.sql.Date;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -194,14 +195,14 @@
}
public Object selectPrintFlowCardSv(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard) {
- if("null".equals(orderId)){
- orderId="";
+ if ("null".equals(orderId)) {
+ orderId = "";
}
- if("null".equals(project)){
- project="";
+ if ("null".equals(project)) {
+ 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, flowCard));
return map;
}
@@ -210,4 +211,28 @@
map.put("data", flowCardMapper.selectPrintMp(orderId, flowCard));
return map;
}
+
+ public Map<String, Object> getSelectPrintingSv(Map<String, Object> object) {
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ //娴佺▼鍗¤〃澶磋〃灏炬暟鎹�
+ itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
+ //娴佺▼鍗℃槑缁嗘暟鎹�
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
+ //宸ヨ壓娴佺▼
+ List<Map<String, Object>> processList = flowCardMapper.getProcessList(flowCard.getProcessId(), flowCard.getTechnologyNumber());
+ itemmap.put("detailList", detailList);
+ itemmap.put("processList", processList);
+ list.add(itemmap);
+
+
+ }
+ }
+ map.put("data", list);
+ return map;
+ }
}
--
Gitblit v1.8.0