north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -549,14 +549,14 @@
               ogd.glass_child,
               ogd.child_width,
               ogd.child_height,
               fc.quantity,
               fc.quantity - ifnull(fc.termination_quantity,0) as quantity,
               ROUND(ogd.child_width * ogd.child_height / 1000000, 2)               as childArea,
               ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as actualArea,
               ROUND(ogd.child_width * ogd.child_height * (fc.quantity- ifnull(fc.termination_quantity,0)) / 1000000, 2) as actualArea,
               odpd.reporting_work_num                                              as completeNum,
               ROUND(ogd.child_width * ogd.child_height * odpd.reporting_work_num / 1000000,
                     2)                                                             as completeArea,
               fc.quantity - odpd.reporting_work_num                                as incompleteNum,
               ROUND(ogd.child_width * ogd.child_height * (fc.quantity - odpd.reporting_work_num) / 1000000,
               fc.quantity - odpd.reporting_work_num - ifnull(fc.termination_quantity,0)      as incompleteNum,
               ROUND(ogd.child_width * ogd.child_height * (fc.quantity - odpd.reporting_work_num- ifnull(fc.termination_quantity,0)) / 1000000,
                     2)                                                             as incompleteArea,
               od.product_name
@@ -583,6 +583,7 @@
          and position(#{orderId} in od.order_id)
          and position(#{inputProject} in o.project)
          and GREATEST(fc.quantity - odpd.reporting_work_num, 0)>0
          and fc.quantity-ifnull(fc.termination_quantity,0)>0
        group by fc.process_id, fc.order_number, fc.technology_number
        order by fc.process_id, fc.order_number, fc.technology_number