From eb20b4f4070dce879da84a38270ba4ca973eb0b1 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 13 八月 2024 17:30:22 +0800
Subject: [PATCH] 添加成品便签按编号打印，合并流程卡显示一个二维码、单片名称添加连接符号
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 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 6cfe16c..39e758f 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
@@ -200,7 +200,7 @@
return map;
}
- public Object selectPrintFlowCardSv(Date selectTime1, Date selectTime2, String orderId, String project, FlowCard flowCard) {
+ public Object selectPrintFlowCardSv(Date selectTime1, Date selectTime2, String orderId, String project,String userId, FlowCard flowCard) {
if ("null".equals(orderId)) {
orderId = "";
}
@@ -209,6 +209,8 @@
}
Map<String, Object> map = new HashMap<>();
map.put("data", flowCardMapper.selectPrintFlowCardMp(selectTime1, selectTime2, orderId, project, flowCard));
+ String roleId=flowCardMapper.selectUserMp(userId);
+ map.put("user",roleId );
return map;
}
@@ -577,6 +579,48 @@
printLike=null;
return map;
}
+
+ public Object selectPrintDetailsSv(Map<String, Object> object, String inquiryMode) {
+ 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.selectPrintDetailsMp(flowCard.getOrderId()));
+ list.add(itemmap);
+ }
+ }
+ map.put("data", list);
+ map.put("type", flowCardMapper.selectType());
+ return map;
+ }
+
+ public Map<String, Object> getSelectPrintCustomLabelDetailsSv(String type, Integer lableType, 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()) {
+
+ if (lableType != 2){
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getPrintCustomDataDetails(flowCard.getProcessId(),flowCard.getOrderNumber()));
+ list.add(itemmap);
+ }
+ }
+ else{
+ for (FlowCard flowCard : flowCardList) {
+ Map<String, Object> itemmap = new HashMap<>();
+ itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getProcess()));
+ list.add(itemmap);
+ }
+ }
+ }
+ map.put("data", list);
+ map.put("title", flowCardMapper.getPrintTitle(type));
+ return map;
+ }
}
--
Gitblit v1.8.0