| | |
| | | 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()) { |
| | | Set<String> processedProcessIds = new HashSet<>(); // ç¨æ¥åæ¾å·²å¤çè¿ç processId |
| | | Set<String> processedKeys = new HashSet<>(); |
| | | for (FlowCard flowCard : flowCardList) { |
| | | String processId = flowCard.getProcessId(); |
| | | Integer orderNumber = flowCard.getOrderNumber(); |
| | | String uniqueKey = processId + "|" + orderNumber; // ç¨ç¹æ®åç¬¦è¿æ¥é²æ¢å²çª |
| | | Map<String, Object> itemmap = new HashMap<>(); |
| | | //æµç¨å¡è¡¨å¤´è¡¨å°¾æ°æ® |
| | | //æ¯å¦ä¼ å
¥å并屿° |
| | |
| | | } else { |
| | | if (merge.equals("1") && flowCard.getMerge().equals(1)) { |
| | | // æ£æ¥æ¯å¦å·²ç»å¤çè¿è¯¥ processIdï¼å¦æå¤çè¿åè·³è¿ |
| | | if (processedProcessIds.contains(flowCard.getProcessId())) { |
| | | if (processedKeys.contains(uniqueKey)) { |
| | | continue; |
| | | } |
| | | // å°è¯¥ processId å å
¥å·²å¤çéå |
| | | processedProcessIds.add(flowCard.getProcessId()); |
| | | processedKeys.add(uniqueKey); |
| | | itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId())); |
| | | |
| | | List<Map<String, Object>> detailList = flowCardMapper.getDetailListMerge(flowCard.getProcessId(), flowCard.getProcess()); |
| | |
| | | } |
| | | List<FlowCard> flowCardList = flowCardMapper.getFlowCardListPrintProject(printProject); |
| | | if (!flowCardList.isEmpty()) { |
| | | Set<String> processedProcessIds = new HashSet<>(); // ç¨æ¥åæ¾å·²å¤çè¿ç processId |
| | | Set<String> processedKeys = new HashSet<>(); |
| | | |
| | | for (FlowCard flowCard : flowCardList) { |
| | | Map<String, Object> itemmap = new HashMap<>(); |
| | | |
| | | |
| | | String processId = flowCard.getProcessId(); |
| | | Integer orderNumber = flowCard.getOrderNumber(); |
| | | String uniqueKey = processId + "|" + orderNumber; // ç¨ç¹æ®åç¬¦è¿æ¥é²æ¢å²çª |
| | | //æ¯å¦å
å«åå² |
| | | //boolean containsCutting = flowCard.getProcess().contains("åå²"); |
| | | String processSub = flowCard.getProcess().substring(0, 2); |
| | |
| | | if (flowCard.getPatchState().equals(0)) { |
| | | if (merge.equals("1") && flowCard.getMerge().equals(1)) { |
| | | // æ£æ¥æ¯å¦å·²ç»å¤çè¿è¯¥ processIdï¼å¦æå¤çè¿åè·³è¿ |
| | | if (processedProcessIds.contains(flowCard.getProcessId())) { |
| | | if (processedKeys.contains(uniqueKey)) { |
| | | continue; |
| | | } |
| | | // å°è¯¥ processId å å
¥å·²å¤çéå |
| | | processedProcessIds.add(flowCard.getProcessId()); |
| | | processedKeys.add(uniqueKey); |
| | | itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()), flowCard.getGlassChild(), flowCard.getProcess(), flowCard.getOrderId())); |
| | | |
| | | List<Map<String, Object>> detailList = flowCardMapper.getDetailListMerge(flowCard.getProcessId(), flowCard.getProcess()); |
| | |
| | | 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()) { |
| | | Set<String> processedProcessIds = new HashSet<>(); // ç¨æ¥åæ¾å·²å¤çè¿ç processId |
| | | |
| | | Set<String> processedKeys = new HashSet<>(); |
| | | if (lableType != 2) {//æåæ ç¾ |
| | | for (FlowCard flowCard : flowCardList) { |
| | | String processId = flowCard.getProcessId(); |
| | | |
| | | Integer orderNumber = flowCard.getOrderNumber(); |
| | | String uniqueKey = processId + "|" + orderNumber; // ç¨ç¹æ®åç¬¦è¿æ¥é²æ¢å²çª |
| | | // æ£æ¥æ¯å¦å·²ç»å¤çè¿è¯¥ processIdï¼å¦æå¤çè¿åè·³è¿ |
| | | if (processedProcessIds.contains(processId)) { |
| | | if (processedKeys.contains(uniqueKey)) { |
| | | continue; |
| | | } |
| | | Map<String, Object> itemmap = new HashMap<>(); |
| | |
| | | list.add(itemmap); |
| | | |
| | | // å°è¯¥ processId å å
¥å·²å¤çéå |
| | | processedProcessIds.add(processId); |
| | | processedKeys.add(uniqueKey); |
| | | } |
| | | } else {//å°çæ ç¾ |
| | | for (FlowCard flowCard : flowCardList) { |
| | |
| | | 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()) { |
| | | Set<String> processedProcessIds = new HashSet<>(); // ç¨æ¥åæ¾å·²å¤çè¿ç processId |
| | | |
| | | Set<String> processedKeys = new HashSet<>(); |
| | | if (lableType != 2) {//æåæ ç¾ |
| | | for (FlowCard flowCard : flowCardList) { |
| | | String processId = flowCard.getProcessId(); |
| | | Integer orderNumber = flowCard.getOrderNumber(); |
| | | String uniqueKey = processId + "|" + orderNumber; // ç¨ç¹æ®åç¬¦è¿æ¥é²æ¢å²çª |
| | | |
| | | // æ£æ¥æ¯å¦å·²ç»å¤çè¿è¯¥ processIdï¼å¦æå¤çè¿åè·³è¿ |
| | | if (processedProcessIds.contains(processId)) { |
| | | if (processedKeys.contains(uniqueKey)) { |
| | | continue; |
| | | } |
| | | Map<String, Object> itemmap = new HashMap<>(); |
| | |
| | | list.add(itemmap); |
| | | |
| | | // å°è¯¥ processId å å
¥å·²å¤çéå |
| | | processedProcessIds.add(processId); |
| | | processedKeys.add(uniqueKey); |
| | | } |
| | | } else {//å°çæ ç¾ |
| | | for (FlowCard flowCard : flowCardList) { |
| | |
| | | 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()) { |
| | | Set<String> processedProcessIds = new HashSet<>(); // ç¨æ¥åæ¾å·²å¤çè¿ç processId |
| | | for (FlowCard flowCard : flowCardList) { |
| | | Map<String, Object> itemmap = new HashMap<>(); |
| | | //æ¯å¦æ¯å·¥ç¨æç»æå° |