guoyuji
2024-12-03 68d7be0814e89ef811c2e7c435dff7af64ea60c1
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -382,6 +382,8 @@
            map.put("data", flowCardMapper.getPrintLabel(projectNo));
        } else if (Objects.equals(type, "2")) {
            map.put("data", flowCardMapper.getPrintLabel2(projectNo));
        } else if (Objects.equals(type, "3")) {
            map.put("data", flowCardMapper.getPrintLabel3(projectNo));
        }
        return map;
@@ -823,7 +825,7 @@
        return map;
    }
    public Map<String, Object> getPrintCustomDataProjectNoDetailSv(String type, Map<String, Object> object) {
    public Map<String, Object> getPrintCustomDataProjectNoDetailSv(String type, Integer detailType, 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);
@@ -831,7 +833,18 @@
            Set<String> processedProcessIds = new HashSet<>();  // 用来存放已处理过的 processId
                for (FlowCard flowCard : flowCardList) {
                    Map<String, Object> itemmap = new HashMap<>();
                    itemmap.put("data", flowCardMapper.getPrintCustomDataProjectDetail(flowCard.getProjectNo(),flowCard.getStockId()));
                    if (detailType==0){
                        itemmap.put("data", flowCardMapper.getPrintCustomDataProjectDetail(flowCard.getProjectNo(),flowCard.getStockId()));
                    }
                    else if (detailType==1) {
                        itemmap.put("data", flowCardMapper.getPrintCustomDataProject(flowCard.getProjectNo()));
                    }
                    else  {
                        itemmap.put("data", flowCardMapper.getPrintCustomDataProject(flowCard.getProjectNo()));
                    }
                    list.add(itemmap);
                }
        }