From 01c08f1464263c27aa86d4d1ce67fc0967f4120c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 六月 2024 12:02:26 +0800
Subject: [PATCH] 提交工程标签打印
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 69d3e53..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,8 +262,11 @@
}
}
- 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()) {
@@ -272,7 +282,7 @@
}
map.put("data", list);
- return map;
+ return map;*/
}
public Map<String, Object> printFlowCardDetailsSv(String processId, String technologyNumber, FlowCard flowCard) {
--
Gitblit v1.8.0