流程卡上根据下单时是否录入批次显示该字段，流程卡打印查询界面层数显示不正确问题，次破报表添加批次字段，流程卡右上角层号和二维码层号统一

chenlu

2025-07-18 f41114d43c1132c04b228fd1612042ea158d974b

流程卡上根据下单时是否录入批次显示该字段，流程卡打印查询界面层数显示不正确问题，次破报表添加批次字段，流程卡右上角层号和二维码层号统一

 north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue

@@ -104,11 +104,12 @@
const handleGetQRCode = async () => {
  let technologyNumber=''
  for (let i = 0; i < produceList.value.length; i++) {
    if (produceList.value[i].detail[0].qrcode!="" && produceList.value[i].detail[0].qrcode!=null){
       technologyNumber = produceList.value[i].detail[0].qrcode.toString(); // 转换为字符串以便处理每个字符,合并标签
    }else {
    console.log(produceList.value[i].detail[0])
    // if (produceList.value[i].detail[0].qrcode!="" && produceList.value[i].detail[0].qrcode!=null){
    //    technologyNumber = produceList.value[i].detail[0].qrcode.toString(); // 转换为字符串以便处理每个字符,合并标签
    // }else {
       technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 转换为字符串以便处理每个字符
    }
    // }
    produceList.value[i].detail[0]["qrcodeList"] = []; // 初始化一个空数组用来存储 QR Code
    if (compound == null  ){
      const processId = produceList.value[i].detail[0].process_id;
@@ -306,7 +307,8 @@
        <td class="tdNowrap">客户名称：</td>
        <td colspan="2">{{ items.customer_name }}</td>
        <td class="tdNowrap">项目名称：</td>
        <td colspan="4" style="min-width: 250px;">{{ items.project }}</td>
        <td v-if="name=='洛阳北方玻璃技术股份有限公司'" colspan="4" style="min-width: 250px;">{{ items.projectBatch }}</td>
        <td v-else colspan="4" style="min-width: 250px;">{{ items.project }}</td>
        <td class="tdNowrap">工艺流程：</td>
        <td :colspan="2+item.processList.length*2"  style="width: 500px">{{ items.process }}</td>
      </tr>

 north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue

@@ -244,6 +244,7 @@
      showOverflow: "ellipsis",
      filters:[{ data: '' }],slots: { filter: 'num1_filter' }
    },
    {field: 'batch', width: 90, title: t('order.batch')},
    {
      field: 'processId', width: 130, title: t('processCard.processId'), filters:[{ data: '' }],slots: { filter: 'num1_filter' }
    },

 north-glass-erp/src/main/java/com/example/erp/dto/pp/DamageReportDTO.java

@@ -13,6 +13,8 @@
    private String orderId;
    @ExcelProperty("项目名称")
    private String project;
    @ExcelProperty("批次")
    private String batch;
    @ExcelProperty("流程卡号")
    private String processId;
    @ExcelProperty("订单序号")

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

@@ -619,7 +619,7 @@
                                   left join sd.basic_data as bd on bd.nickname='stepC'
                                   where ogds.order_id = #{orderId}
                                     and LOCATE(bd.basic_name, ogds.process) > 0
                                   GROUP BY order_id, order_number, ogds.group) as ogdss
                                   GROUP BY order_id, order_number, ogds.group,bd.basic_name LIMIT 1) as ogdss
                                  on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
               where fc.order_id = #{orderId}
               GROUP BY fc.process_id, ogdss.technology_number
@@ -662,7 +662,7 @@
                                                                                  ogds.technology_number
                                            left join sd.basic_data as bd on bd.nickname='stepD'
                                   where ogds.order_id = #{orderId}
                                   GROUP BY order_id, order_number) as ogdss
                                   GROUP BY order_id, order_number,bd.basic_name LIMIT 1) as ogdss
                                  on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
               where fc.order_id = #{orderId}
               GROUP BY fc.process_id
@@ -670,7 +670,7 @@
        where process is not null
          and process != ""
        GROUP BY order_id, process_id, technology_number, process
        order by order_id, process_id, length(technology_number)) as result
        order by order_id, process_id, length(technology_number),technology_number) as result
        LEFT JOIN (SELECT * from flow_card GROUP BY process_id,technology_number) as fcc
        on result.process_id = fcc.process_id and result.technology_number = fcc.technology_number
    </select>
@@ -2419,6 +2419,7 @@

    <select id="getPrimaryListLimt">
        select o.customer_name,
               if(o.batch!="",CONCAT(o.project,'(',o.batch,')'),o.project) as projectBatch,
               o.project,
               #{process}                                         process,
               od.edging_type,

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

@@ -92,6 +92,7 @@
        <result column="area" property="area"/>
        <result column="breakage_quantity" property="breakageQuantity"/>
        <result column="project" property="project"/>
        <result column="batch" property="batch"/>
        <result column="process_id" property="processId"/>
        <result column="order_number" property="orderNumber"/>
        <result column="technology_number" property="technologyNumber"/>
@@ -566,6 +567,7 @@
        SELECT
        o.order_id,
        o.project,
        o.batch,
        rw.process_id,
        dd.order_number,
        dd.technology_number,
@@ -995,6 +997,7 @@
    <select id="exportDamageReportMp">
        SELECT o.order_id,
               o.project,
               o.batch,
               rw.process_id,
               dd.order_number,
               dd.technology_number,