From b3a97af490f86a1bf6ca07173c6f89c399ecb68e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 27 六月 2024 11:40:52 +0800
Subject: [PATCH] 删除注释
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 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 5e1ed14..e62b2cf 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
@@ -21,6 +21,7 @@
import java.io.StringReader;
import java.sql.Date;
+import java.time.LocalDate;
import java.util.*;
import static com.example.erp.service.sd.OrderService.getOrderProcessDetails;
@@ -210,6 +211,12 @@
return map;
}
+ public Object selectPrintFlowCard(Date selectTime1, Date selectTime2) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.selectPrintFlowCard(selectTime1, selectTime2));
+ return map;
+ }
+
public Object selectPrintSv(String orderId, FlowCard flowCard) {
Map<String, Object> map = new HashMap<>();
map.put("data", flowCardMapper.selectPrintMp(orderId, flowCard));
@@ -255,19 +262,27 @@
}
}
- public Map<String, Object> getSelectPrintLabelSv(Map<String, Object> object) {
+ public Map<String, Object> getSelectPrintLabelSv(String projectNo) {
Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.getPrintLabel(projectNo));
+ return map;
+ /* 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) {
- Integer count=flowCard.getQuantity();
- for (int i = 0; i < count; i++) {
- map.put("data", flowCardMapper.getPrintLabel(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
- System.out.println(flowCardMapper.getPrintLabel(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
- }
+ // Integer count=flowCardMapper.getPrintLabelCount(flowCard.getProcessId(), flowCard.getTechnologyNumber());
+ Map<String, Object> itemmap = new HashMap<>();
+ // for (int i = 0; i < count; i++) {
+ itemmap.put("data", flowCardMapper.getPrintLabel(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
+ list.add(itemmap);
+ //}
+
}
}
- return map;
+
+ map.put("data", list);
+ return map;*/
}
public Map<String, Object> printFlowCardDetailsSv(String processId, String technologyNumber, FlowCard flowCard) {
@@ -293,12 +308,16 @@
List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
if (!flowCardList.isEmpty()) {
for (FlowCard flowCard : flowCardList) {
- map.put("data", flowCardMapper.getPrintCustomData(flowCard.getOrderId(),flowCard.getOrderNumber()));
- map.put("quantity", flowCard.getQuantity());
+
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber()));
+ list.add(itemmap);
+
+
}
}
-
- map.put("title", flowCardMapper.getPrintTitle(type));
+ map.put("data", list);
+ map.put("title", flowCardMapper.getPrintTitle(type));
return map;
}
--
Gitblit v1.8.0