From 02f278480f7cdf0c31182e5550d38c2c1e6808b0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 27 六月 2024 08:50:02 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java |   69 +++++++++++++++++++++++++++++-----
 1 files changed, 58 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 fa75b6f..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
@@ -12,13 +12,17 @@
 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.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDate;
+import java.util.*;
 
 import static com.example.erp.service.sd.OrderService.getOrderProcessDetails;
 
@@ -207,9 +211,16 @@
         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));
+        map.put("type", flowCardMapper.selectType());
         return map;
     }
 
@@ -251,20 +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) {
@@ -282,4 +300,33 @@
         }
         return true;
     }
+
+
+    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<String, Object> itemmap = new HashMap<>();
+                    itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber()));
+                    list.add(itemmap);
+
+
+            }
+        }
+        map.put("data", list);
+        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