流程卡打印明细界面添加楼号，报工新增界面添加楼号

chenlu

2025-08-11 32486d62f7ad21cef2ad2042de3bae75aac7e3b8

流程卡打印明细界面添加楼号，报工新增界面添加楼号

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -416,6 +416,7 @@
            selectDetailProcessCard:"流程卡明细查询"

        },
        buildingNumber:'楼号',
        longSide:'长边',
        shortSide:'短边',
        printCompound:'需要同架的层',

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

@@ -370,6 +370,14 @@
      , sortable: true
    },
    {
      field: 'building_number',
      title: t('processCard.buildingNumber'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged, width: 120
      , sortable: true
    },
    {
      field: 'width',
      title: t('order.width'),
      filters: [{data: ''}],

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

@@ -2489,7 +2489,8 @@
               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01'))                  AS glassNumber,
               od.order_number,
               od.width,
               od.height
               od.height,
               od.building_number
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
@@ -2528,7 +2529,8 @@
                JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')) AS S02,
                JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S03')) AS S03,
                JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')) AS S04,
                JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S05')) AS S05
                JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S05')) AS S05,
                od.building_number
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and

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

@@ -140,7 +140,9 @@
            odpd.reporting_work_num as completed,
            odpd.broken_num as onceBroken,
            if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交
            od.other_columns
        if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')!='',
            ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),''),
            od.building_number) as s01Value
        FROM
            sd.order_detail AS od
        LEFT JOIN sd.order_glass_detail AS ogd
@@ -206,7 +208,9 @@
        ogd.`group`,
        if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交
        od.other_columns,
        ogd.id as 'glassId',IFNULL(rws.reviewed_state,0) as reviewed_state
        ogd.id as 'glassId',IFNULL(rws.reviewed_state,0) as reviewed_state,if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')!='',
        ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),''),
        od.building_number) as s01Value

        FROM
        sd.order_detail AS od