更新报表查询

mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml

@@ -188,7 +188,7 @@
             workunit.quantity,
             f.quantity_qualify,
             f.quantity_unqualify,
-            f.quantity_feedback,
+            (f.quantity_qualify + f.quantity_unqualify) as quantity_feedback,
             f.abnormal_reason,
             f.machine_time,
             f.feedback_time,
@@ -240,7 +240,7 @@
         sum(workunit.quantity) quantity,
         sum(f.quantity_qualify) quantity_qualify,
         sum(f.quantity_unqualify) quantity_unqualify,
-        sum(f.quantity_feedback) quantity_feedback
+        sum(f.quantity_qualify) + sum(f.quantity_unqualify) quantity_feedback
         from pro_feedback f
         left join pro_task_workunit workunit on workunit.task_id = f.task_id
         left join pro_task pt on f.task_id = pt.task_id
@@ -290,7 +290,7 @@
         sum(workunit.quantity) quantity,
         sum(f.quantity_qualify) quantity_qualify,
         sum(f.quantity_unqualify) quantity_unqualify,
-        sum(f.quantity_feedback) quantity_feedback
+        sum(f.quantity_qualify) +  sum(f.quantity_unqualify) quantity_feedback
         from pro_feedback f
         left join pro_task_workunit workunit on workunit.task_id = f.task_id
         left join pro_task pt on f.task_id = pt.task_id
@@ -335,7 +335,7 @@
         sum(workunit.quantity) quantity,
         sum(f.quantity_qualify) quantity_qualify,
         sum(f.quantity_unqualify) quantity_unqualify,
-        sum(f.quantity_feedback) quantity_feedback
+        sum(f.quantity_qualify) +  sum(f.quantity_unqualify) quantity_feedback
         from pro_feedback f
         left join pro_task_workunit workunit on workunit.task_id = f.task_id
         left join pro_task pt on f.task_id = pt.task_id
@@ -380,7 +380,7 @@
         sum(workunit.quantity) quantity,
         sum(f.quantity_qualify) quantity_qualify,
         sum(f.quantity_unqualify) quantity_unqualify,
-        sum(f.quantity_feedback) quantity_feedback
+        sum(f.quantity_qualify) +  sum(f.quantity_unqualify) quantity_feedback
         from pro_feedback f
         left join pro_task_workunit workunit on workunit.task_id = f.task_id
         left join pro_task pt on f.task_id = pt.task_id
@@ -425,7 +425,7 @@
         sum(workunit.quantity) quantity,
         sum(f.quantity_qualify) quantity_qualify,
         sum(f.quantity_unqualify) quantity_unqualify,
-        sum(f.quantity_feedback) quantity_feedback
+        sum(f.quantity_qualify) +  sum(f.quantity_unqualify) quantity_feedback
         from pro_feedback f
         left join pro_task_workunit workunit on workunit.task_id = f.task_id
         left join pro_task pt on f.task_id = pt.task_id
@@ -470,7 +470,7 @@
         sum(workunit.quantity) quantity,
         sum(f.quantity_qualify) quantity_qualify,
         sum(f.quantity_unqualify) quantity_unqualify,
-        sum(f.quantity_feedback) quantity_feedback
+        sum(f.quantity_qualify) +  sum(f.quantity_unqualify) quantity_feedback
         from pro_feedback f
         left join pro_task_workunit workunit on workunit.task_id = f.task_id
         left join pro_task pt on f.task_id = pt.task_id
@@ -531,7 +531,7 @@
         sum(workunit.quantity) quantity,
         sum(f.quantity_qualify) quantity_qualify,
         sum(f.quantity_unqualify) quantity_unqualify,
-        sum(f.quantity_feedback) quantity_feedback
+        sum(f.quantity_qualify) +  sum(f.quantity_unqualify) quantity_feedback
         from pro_feedback f
         left join pro_task_workunit workunit on workunit.task_id = f.task_id
         left join pro_task pt on f.task_id = pt.task_id

mes/src/main/resources/mapper/pro/proWorkOrder/ProWorkorderMapper.xml

@@ -262,10 +262,11 @@
         pw.in_drawing_no,
         pw.erp_create_time,
         pw.erp_update_time ,
-        sum(fe.quantity_qualify + fe.quantity_unqualify) as quantity_produced
+        case task.is_last_process when 0  THEN 0 ELSE sum(fe.quantity_qualify + fe.quantity_unqualify)  END  as quantity_produced
         FROM
         pro_workorder pw
         LEFT JOIN pro_feedback fe ON fe.workorder_id = pw.workorder_id
+        left join pro_task task on task.task_id = fe.task_id
         <where>
             <if test="workorderCode != null  and workorderCode != ''">and  pw.workorder_code  = #{workorderCode}</if>
             <if test="productId != null ">and pw.product_id = #{productId}</if>