ERP_override.git

			@@ -618,6 +618,7 @@


			public Map<String, Object> getSelectPrintCustomLabelSv(String type, Integer lableType, Map<String, Object> object) {
			String isRepeat = object.get("isRepeat").toString();
			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);
			@@ -629,12 +630,15 @@
			String processId = flowCard.getProcessId();
			Integer orderNumber = flowCard.getOrderNumber();
			String uniqueKey = processId + "\|" + orderNumber; // 用特殊字符连接防止冲突
			// 检查是否已经处理过该 processId，如果处理过则跳过
			if (processedKeys.contains(uniqueKey)) {
			continue;
			if (isRepeat=="false"){//根据mse传过来的值判断是否去除重复
			// 检查是否已经处理过该 processId，如果处理过则跳过
			if (processedKeys.contains(uniqueKey)) {
			continue;
			}
			}

			Map<String, Object> itemmap = new HashMap<>();
			itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(), flowCard.getOrderNumber()));
			itemmap.put("data", flowCardMapper.getPrintCustomData(flowCard.getProcessId(), flowCard.getOrderNumber(), flowCard.getPrintQuantity()));
			list.add(itemmap);

			// 将该 processId 加入已处理集合
			@@ -643,7 +647,27 @@
			} else {//小片标签
			for (FlowCard flowCard : flowCardList) {
			Map<String, Object> itemmap = new HashMap<>();
			itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(flowCard.getProcessId(), flowCard.getTechnologyNumber(), flowCard.getProcess(),flowCard.getOrderNumber()));
			String orderNumber = "";
			if (flowCard.getOrderNumber() != null) {
			orderNumber = String.valueOf(flowCard.getOrderNumber());
			}
			// 判断是否为非空字符串
			if (orderNumber != null && !orderNumber.trim().isEmpty()) {

			itemmap.put("data", flowCardMapper.getPrintCustomDataSemi(
			flowCard.getProcessId(),
			flowCard.getTechnologyNumber(),
			flowCard.getProcess(),
			flowCard.getOrderNumber()
			));
			} else {

			itemmap.put("data", flowCardMapper.getPrintCustomDataSemiTj(
			flowCard.getProcessId(),
			flowCard.getTechnologyNumber(),
			flowCard.getProcess()
			));
			}
			list.add(itemmap);
			}
			}