修改可编辑标签打印时，同序号不同架时，标签过滤逻辑

chenlu

2025-04-30 e95d796495feedd1ca4535ca3617b937188701cc

修改可编辑标签打印时，同序号不同架时，标签过滤逻辑

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue

@@ -166,7 +166,7 @@
      <div v-if="item.customer_name!==undefined" class="row1" >
<!--钢化版图序号，钢化版图里的顺序-->
<!--        <div class="cell" v-if="item.heat_layout_id!==undefined">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>-->
        <span>{{ item.customer_name }}</span>&nbsp;
        <span style="font-size: 12px;">{{ item.customer_name }}</span>&nbsp;
        <span v-if="company.showDeliveryCreator">{{ item.order_id }}</span>&nbsp;
        <span v-if="!company.showDeliveryCreator">{{ item.process_id }}</span>&nbsp;
        <template v-if="company.showDeliveryCreator">

 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -814,16 +814,17 @@
        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 orderId = flowCard.getOrderId();
                    String processId = flowCard.getProcessId();
                    String orderNumber = flowCard.getOrderNumber().toString();
                    String uniqueKey = processId + "|" + orderNumber;  // 用特殊字符连接防止冲突
                       if (processId!=null){
                           // 检查是否已经处理过该 processId，如果处理过则跳过
                           if (processedProcessIds.contains(processId) && processedProcessIds.contains(orderNumber)) {
                           if (processedKeys.contains(uniqueKey)) {
                               continue;
                           }
                           Map<String, Object> itemmap = new HashMap<>();
@@ -831,8 +832,7 @@
                           list.add(itemmap);

                           // 将该 processId 加入已处理集合
                           processedProcessIds.add(processId);
                           processedProcessIds.add(orderNumber);
                           processedKeys.add(uniqueKey);
                       } else{

                           Map<String, Object> itemmap = new HashMap<>();

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -2455,7 +2455,7 @@
                              ogd.technology_number = fc.technology_number
        where fc.process_id = #{processId}
          and fc.order_number = #{orderNumber}
        group by od.order_number, width, height
        group by fc.process_id,od.order_number, width, height
        order by fc.process_id
    </select>