From ca014b7e7ed13cf155c8a62296ea1a9fb64942da Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 17 六月 2024 09:17:42 +0800
Subject: [PATCH] 自定义标签打印功能部分代码
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 533d2f8..5e1ed14 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
@@ -6,15 +6,20 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.pp.PrintSetup;
import com.example.erp.entity.pp.ProductionScheduling;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.entity.sd.OrderProcessDetail;
import com.example.erp.mapper.pp.FlowCardMapper;
import com.example.erp.mapper.sd.OrderGlassDetailMapper;
import com.example.erp.mapper.sd.OrderProcessDetailMapper;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jdk.nashorn.internal.parser.JSONParser;
import org.springframework.stereotype.Service;
+
+
+import java.io.StringReader;
import java.sql.Date;
import java.util.*;
@@ -208,6 +213,7 @@
public Object selectPrintSv(String orderId, FlowCard flowCard) {
Map<String, Object> map = new HashMap<>();
map.put("data", flowCardMapper.selectPrintMp(orderId, flowCard));
+ map.put("type", flowCardMapper.selectType());
return map;
}
@@ -257,11 +263,10 @@
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()));
+ System.out.println(flowCardMapper.getPrintLabel(flowCard.getProcessId(), flowCard.getTechnologyNumber()));
}
}
}
-
return map;
}
@@ -282,6 +287,27 @@
}
+ public Map<String, Object> getSelectPrintCustomLabelSv(String type, 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.put("data", flowCardMapper.getPrintCustomData(flowCard.getOrderId(),flowCard.getOrderNumber()));
+ map.put("quantity", flowCard.getQuantity());
+ }
+ }
+
+ map.put("title", flowCardMapper.getPrintTitle(type));
+ return map;
+ }
+
+ public Object getCustomLabelDetailSv(String name, String form, String id, FlowCard flowCard) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", flowCardMapper.getCustomLabelDetailMp(name, form,id, flowCard));
+ return map;
+ }
+
}
--
Gitblit v1.8.0