Skip to content

M
mes
Commit f0480d14 authored by 温志超's avatar 温志超
Browse files
Options

更新报表查询

parent 71ce5294
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
mes/src/main/java/com/ximai/mes/report/controller/FeedbackController.java
View file @ f0480d14
...@@ -54,7 +54,7 @@ public class FeedbackController extends BaseController { ...@@ -54,7 +54,7 @@ public class FeedbackController extends BaseController {
if(feedbackResponse.getQuantityFeedback() != null if(feedbackResponse.getQuantityFeedback() != null
&& feedbackResponse.getQuantityFeedback().compareTo(BigDecimal.ZERO) != 0 && feedbackResponse.getQuantityFeedback().compareTo(BigDecimal.ZERO) != 0
&& feedbackResponse.getQuantityUnqualify()!= null ){ && feedbackResponse.getQuantityUnqualify()!= null ){
feedbackResponse.setQualificationRate(df.format((feedbackResponse.getQuantityQualify().divide(feedbackResponse.getQuantityFeedback(),2, RoundingMode.HALF_UP).doubleValue()))); feedbackResponse.setQualificationRate(df.format((feedbackResponse.getQuantityQualify().divide(feedbackResponse.getQuantityQualify().add(feedbackResponse.getQuantityUnqualify()),2, RoundingMode.HALF_UP).doubleValue())));
}else{ }else{
feedbackResponse.setQualificationRate("0.00%"); feedbackResponse.setQualificationRate("0.00%");
} }
...@@ -74,7 +74,7 @@ public class FeedbackController extends BaseController { ...@@ -74,7 +74,7 @@ public class FeedbackController extends BaseController {
if(feedbackResponse.getQuantityFeedback() != null if(feedbackResponse.getQuantityFeedback() != null
&& feedbackResponse.getQuantityFeedback().compareTo(BigDecimal.ZERO) != 0 && feedbackResponse.getQuantityFeedback().compareTo(BigDecimal.ZERO) != 0
&& feedbackResponse.getQuantityUnqualify()!= null ){ && feedbackResponse.getQuantityUnqualify()!= null ){
feedbackResponse.setQualificationRate(df.format((feedbackResponse.getQuantityQualify().divide(feedbackResponse.getQuantityFeedback(),2, RoundingMode.HALF_UP).doubleValue()))); feedbackResponse.setQualificationRate(df.format((feedbackResponse.getQuantityQualify().divide(feedbackResponse.getQuantityQualify().add(feedbackResponse.getQuantityUnqualify()),2, RoundingMode.HALF_UP).doubleValue())));
}else{ }else{
feedbackResponse.setQualificationRate("0.00%"); feedbackResponse.setQualificationRate("0.00%");
} }
...@@ -94,7 +94,7 @@ public class FeedbackController extends BaseController { ...@@ -94,7 +94,7 @@ public class FeedbackController extends BaseController {
if(feedbackResponse.getQuantityFeedback() != null if(feedbackResponse.getQuantityFeedback() != null
&& feedbackResponse.getQuantityFeedback().compareTo(BigDecimal.ZERO) != 0 && feedbackResponse.getQuantityFeedback().compareTo(BigDecimal.ZERO) != 0
&& feedbackResponse.getQuantityUnqualify()!= null ){ && feedbackResponse.getQuantityUnqualify()!= null ){
feedbackResponse.setQualificationRate(df.format((feedbackResponse.getQuantityQualify().divide(feedbackResponse.getQuantityFeedback(),2, RoundingMode.HALF_UP).doubleValue()))); feedbackResponse.setQualificationRate(df.format((feedbackResponse.getQuantityQualify().divide(feedbackResponse.getQuantityQualify().add(feedbackResponse.getQuantityUnqualify()),2, RoundingMode.HALF_UP).doubleValue())));
}else{ }else{
feedbackResponse.setQualificationRate("0.00%"); feedbackResponse.setQualificationRate("0.00%");
} }
...@@ -115,7 +115,7 @@ public class FeedbackController extends BaseController { ...@@ -115,7 +115,7 @@ public class FeedbackController extends BaseController {
if(feedbackResponse.getQuantityFeedback() != null if(feedbackResponse.getQuantityFeedback() != null
&& feedbackResponse.getQuantityFeedback().compareTo(BigDecimal.ZERO) != 0 && feedbackResponse.getQuantityFeedback().compareTo(BigDecimal.ZERO) != 0
&& feedbackResponse.getQuantityUnqualify()!= null ){ && feedbackResponse.getQuantityUnqualify()!= null ){
feedbackResponse.setQualificationRate(df.format((feedbackResponse.getQuantityQualify().divide(feedbackResponse.getQuantityFeedback(),2, RoundingMode.HALF_UP).doubleValue()))); feedbackResponse.setQualificationRate(df.format((feedbackResponse.getQuantityQualify().divide(feedbackResponse.getQuantityQualify().add(feedbackResponse.getQuantityUnqualify()),2, RoundingMode.HALF_UP).doubleValue())));
}else{ }else{
feedbackResponse.setQualificationRate("0.00%"); feedbackResponse.setQualificationRate("0.00%");
} }
...@@ -139,7 +139,7 @@ public class FeedbackController extends BaseController { ...@@ -139,7 +139,7 @@ public class FeedbackController extends BaseController {
if(feedbackResponse.getQuantityFeedback() != null if(feedbackResponse.getQuantityFeedback() != null
&& feedbackResponse.getQuantityFeedback().compareTo(BigDecimal.ZERO) != 0 && feedbackResponse.getQuantityFeedback().compareTo(BigDecimal.ZERO) != 0
&& feedbackResponse.getQuantityUnqualify()!= null ){ && feedbackResponse.getQuantityUnqualify()!= null ){
feedbackResponse.setQualificationRate(df.format((feedbackResponse.getQuantityQualify().divide(feedbackResponse.getQuantityFeedback(),2, RoundingMode.HALF_UP).doubleValue()))); feedbackResponse.setQualificationRate(df.format((feedbackResponse.getQuantityQualify().divide(feedbackResponse.getQuantityQualify().add(feedbackResponse.getQuantityUnqualify()),2, RoundingMode.HALF_UP).doubleValue())));
}else{ }else{
feedbackResponse.setQualificationRate("0.00%"); feedbackResponse.setQualificationRate("0.00%");
} }
...@@ -160,7 +160,7 @@ public class FeedbackController extends BaseController { ...@@ -160,7 +160,7 @@ public class FeedbackController extends BaseController {
if(feedbackResponse.getQuantityFeedback() != null if(feedbackResponse.getQuantityFeedback() != null
&& feedbackResponse.getQuantityFeedback().compareTo(BigDecimal.ZERO) != 0 && feedbackResponse.getQuantityFeedback().compareTo(BigDecimal.ZERO) != 0
&& feedbackResponse.getQuantityUnqualify()!= null ){ && feedbackResponse.getQuantityUnqualify()!= null ){
feedbackResponse.setQualificationRate(df.format((feedbackResponse.getQuantityQualify().divide(feedbackResponse.getQuantityFeedback(),2, RoundingMode.HALF_UP).doubleValue()))); feedbackResponse.setQualificationRate(df.format((feedbackResponse.getQuantityQualify().divide(feedbackResponse.getQuantityQualify().add(feedbackResponse.getQuantityUnqualify()),2, RoundingMode.HALF_UP).doubleValue())));
}else{ }else{
feedbackResponse.setQualificationRate("0.00%"); feedbackResponse.setQualificationRate("0.00%");
} }
...@@ -180,7 +180,7 @@ public class FeedbackController extends BaseController { ...@@ -180,7 +180,7 @@ public class FeedbackController extends BaseController {
if(feedbackResponse.getQuantityFeedback() != null if(feedbackResponse.getQuantityFeedback() != null
&& feedbackResponse.getQuantityFeedback().compareTo(BigDecimal.ZERO) != 0 && feedbackResponse.getQuantityFeedback().compareTo(BigDecimal.ZERO) != 0
&& feedbackResponse.getQuantityUnqualify()!= null ){ && feedbackResponse.getQuantityUnqualify()!= null ){
feedbackResponse.setQualificationRate(df.format((feedbackResponse.getQuantityQualify().divide(feedbackResponse.getQuantityFeedback(),2, RoundingMode.HALF_UP).doubleValue()))); feedbackResponse.setQualificationRate(df.format((feedbackResponse.getQuantityQualify().divide(feedbackResponse.getQuantityQualify().add(feedbackResponse.getQuantityUnqualify()),2, RoundingMode.HALF_UP).doubleValue())));
}else{ }else{
feedbackResponse.setQualificationRate("0.00%"); feedbackResponse.setQualificationRate("0.00%");
} }
......
mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml
View file @ f0480d14
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
mw.workunit_name, mw.workunit_name,
f.user_name, f.user_name,
f.nick_name, f.nick_name,
f.quantity, workunit.quantity,
f.quantity_qualify, f.quantity_qualify,
f.quantity_unqualify, f.quantity_unqualify,
f.quantity_feedback, f.quantity_feedback,
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
workorder.workorder_Code, workorder.workorder_Code,
workorder.product_Code, workorder.product_Code,
workorder.product_Name, workorder.product_Name,
sum(f.quantity) quantity, sum(workunit.quantity) quantity,
sum(f.quantity_qualify) quantity_qualify, sum(f.quantity_qualify) quantity_qualify,
sum(f.quantity_unqualify) quantity_unqualify, sum(f.quantity_unqualify) quantity_unqualify,
sum(f.quantity_feedback) quantity_feedback sum(f.quantity_feedback) quantity_feedback
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
select select
workstation.workshop_code, workstation.workshop_code,
workstation.workshop_name, workstation.workshop_name,
sum(f.quantity) quantity, sum(workunit.quantity) quantity,
sum(f.quantity_qualify) quantity_qualify, sum(f.quantity_qualify) quantity_qualify,
sum(f.quantity_unqualify) quantity_unqualify, sum(f.quantity_unqualify) quantity_unqualify,
sum(f.quantity_feedback) quantity_feedback sum(f.quantity_feedback) quantity_feedback
...@@ -331,7 +331,7 @@ ...@@ -331,7 +331,7 @@
select select
workstation.workstation_code, workstation.workstation_code,
workstation.workstation_name, workstation.workstation_name,
sum(f.quantity) quantity, sum(workunit.quantity) quantity,
sum(f.quantity_qualify) quantity_qualify, sum(f.quantity_qualify) quantity_qualify,
sum(f.quantity_unqualify) quantity_unqualify, sum(f.quantity_unqualify) quantity_unqualify,
sum(f.quantity_feedback) quantity_feedback sum(f.quantity_feedback) quantity_feedback
...@@ -376,7 +376,7 @@ ...@@ -376,7 +376,7 @@
select select
mw.workunit_code, mw.workunit_code,
mw.workunit_name, mw.workunit_name,
sum(f.quantity) quantity, sum(workunit.quantity) quantity,
sum(f.quantity_qualify) quantity_qualify, sum(f.quantity_qualify) quantity_qualify,
sum(f.quantity_unqualify) quantity_unqualify, sum(f.quantity_unqualify) quantity_unqualify,
sum(f.quantity_feedback) quantity_feedback sum(f.quantity_feedback) quantity_feedback
...@@ -421,7 +421,7 @@ ...@@ -421,7 +421,7 @@
select select
pt.process_code, pt.process_code,
pt.process_name, pt.process_name,
sum(f.quantity) quantity, sum(workunit.quantity) quantity,
sum(f.quantity_qualify) quantity_qualify, sum(f.quantity_qualify) quantity_qualify,
sum(f.quantity_unqualify) quantity_unqualify, sum(f.quantity_unqualify) quantity_unqualify,
sum(f.quantity_feedback) quantity_feedback sum(f.quantity_feedback) quantity_feedback
...@@ -466,7 +466,7 @@ ...@@ -466,7 +466,7 @@
select select
f.user_name, f.user_name,
f.nick_name, f.nick_name,
sum(f.quantity) quantity, sum(workunit.quantity) quantity,
sum(f.quantity_qualify) quantity_qualify, sum(f.quantity_qualify) quantity_qualify,
sum(f.quantity_unqualify) quantity_unqualify, sum(f.quantity_unqualify) quantity_unqualify,
sum(f.quantity_feedback) quantity_feedback sum(f.quantity_feedback) quantity_feedback
...@@ -526,7 +526,7 @@ ...@@ -526,7 +526,7 @@
select select
f.abnormal_reason, f.abnormal_reason,
f.abnormal_remark, f.abnormal_remark,
sum(f.quantity) quantity, sum(workunit.quantity) quantity,
sum(f.quantity_qualify) quantity_qualify, sum(f.quantity_qualify) quantity_qualify,
sum(f.quantity_unqualify) quantity_unqualify, sum(f.quantity_unqualify) quantity_unqualify,
sum(f.quantity_feedback) quantity_feedback sum(f.quantity_feedback) quantity_feedback
...@@ -561,7 +561,7 @@ ...@@ -561,7 +561,7 @@
<if test=" workstationName != null and workstationName != '' ">and workstation.workstation_name like '%${workstationName}%'</if> <if test=" workstationName != null and workstationName != '' ">and workstation.workstation_name like '%${workstationName}%'</if>
<if test=" workunitName != null and workunitName != '' ">and mw.workunit_name like '%${workunitName}%'</if> <if test=" workunitName != null and workunitName != '' ">and mw.workunit_name like '%${workunitName}%'</if>
<if test=" abnormalReason != null and abnormalReason != '' ">and f.abnormal_reason like '%${abnormalReason}%'</if> <if test=" abnormalReason != null and abnormalReason != '' ">and f.abnormal_reason like '%${abnormalReason}%'</if>
<if test="defectStatus != null">f.quantity_unqualify > 0 </if> <if test="defectStatus != null"> and f.quantity_unqualify > 0 </if>
</where> </where>
group by group by
f.abnormal_reason, f.abnormal_reason,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment