wilson
/
Jtem-java
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

66

master
ruanqi 2 years ago
parent
ba96de9198
commit
40049504b4
2 changed files with 24 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 40
      src/main/java/com/jtem/modules/board/service/impl/BoardServiceImpl.java
  2. 8
      src/main/resources/mapper/board/BoardMapper.xml

40
src/main/java/com/jtem/modules/board/service/impl/BoardServiceImpl.java
View File

@ -53,18 +53,18 @@ public class BoardServiceImpl implements BoardService {
List<SOSRoutingBoardData> list =boardMapper.SORoutingBoard(inData);
double number=list.size();
int pageIndex=inData.getNumber();
int maxPage=(int)Math.ceil(number/12);
int maxPage=(int)Math.ceil(number/14);
if(pageIndex>maxPage){
pageIndex=1;
}
List<SOSRoutingBoardData> result =new ArrayList<>();
if(pageIndex<maxPage){
for(int i=0;i<12;i++){
result.add(list.get((pageIndex-1)*12+i));
for(int i=0;i<14;i++){
result.add(list.get((pageIndex-1)*14+i));
}
}else {
for(int i=0;(pageIndex-1)*12+i<number;i++){
result.add(list.get((pageIndex-1)*12+i));
for(int i=0;(pageIndex-1)*14+i<number;i++){
result.add(list.get((pageIndex-1)*14+i));
}
}
@ -72,18 +72,18 @@ public class BoardServiceImpl implements BoardService {
List<AbnormalFeedBackOutData> list2 =boardMapper.abnormalBoardList(inData);
double number2=list2.size();
int pageIndex2=inData.getNumber2();
int maxPage2=(int)Math.ceil(number2/5);
int maxPage2=(int)Math.ceil(number2/3);
if(pageIndex2>maxPage2){
pageIndex2=1;
}
List<AbnormalFeedBackOutData> result2 =new ArrayList<>();
if(pageIndex2<maxPage2){
for(int i=0;i<5;i++){
result2.add(list2.get((pageIndex2-1)*5+i));
for(int i=0;i<3;i++){
result2.add(list2.get((pageIndex2-1)*3+i));
}
}else {
for(int i=0;(pageIndex2-1)*5+i<number2;i++){
result2.add(list2.get((pageIndex2-1)*5+i));
for(int i=0;(pageIndex2-1)*3+i<number2;i++){
result2.add(list2.get((pageIndex2-1)*3+i));
}
}
@ -138,18 +138,18 @@ public class BoardServiceImpl implements BoardService {
List<ShopOrderBoardOutData> list =boardMapper.shopOrderBoard(inData);
double number=list.size();
int pageIndex=inData.getNumber();
int maxPage=(int)Math.ceil(number/12);
int maxPage=(int)Math.ceil(number/14);
if(pageIndex>maxPage){
pageIndex=1;
}
List<ShopOrderBoardOutData> result =new ArrayList<>();
if(pageIndex<maxPage){
for(int i=0;i<12;i++){
result.add(list.get((pageIndex-1)*12+i));
for(int i=0;i<14;i++){
result.add(list.get((pageIndex-1)*14+i));
}
}else {
for(int i=0;(pageIndex-1)*12+i<number;i++){
result.add(list.get((pageIndex-1)*12+i));
for(int i=0;(pageIndex-1)*14+i<number;i++){
result.add(list.get((pageIndex-1)*14+i));
}
}
@ -157,18 +157,18 @@ public class BoardServiceImpl implements BoardService {
List<AbnormalFeedBackOutData> list2 =boardMapper.abnormalBoardList(inData);
double number2=list2.size();
int pageIndex2=inData.getNumber2();
int maxPage2=(int)Math.ceil(number2/5);
int maxPage2=(int)Math.ceil(number2/3);
if(pageIndex2>maxPage2){
pageIndex2=1;
}
List<AbnormalFeedBackOutData> result2 =new ArrayList<>();
if(pageIndex2<maxPage2){
for(int i=0;i<5;i++){
result2.add(list2.get((pageIndex2-1)*5+i));
for(int i=0;i<3;i++){
result2.add(list2.get((pageIndex2-1)*3+i));
}
}else {
for(int i=0;(pageIndex2-1)*5+i<number2;i++){
result2.add(list2.get((pageIndex2-1)*5+i));
for(int i=0;(pageIndex2-1)*3+i<number2;i++){
result2.add(list2.get((pageIndex2-1)*3+i));
}
}
Map<String, Object> map = new HashMap<>();

8
src/main/resources/mapper/board/BoardMapper.xml
View File

@ -39,7 +39,7 @@
SELECT Site,OrderNo,NeedDate,PartNo,dbo.Get_PartDesc(site,partNo) partDesc,LotSize,Round(FinishedQty,2) FinishedQty,Round(FinishedQty/LotSize*100.0,1) as percentQty
,CustomerID,dbo.Get_CustomerDesc(Site,CustomerID) CustomerDesc,ReceiveDate
FROM ShopOrder
where status='已关闭' and ReceiveDate>=#{startDate} and #{endDate}>=ReceiveDate and MaterialSplitFlag='N'
where ( (status != '已计划' and status != '已取消' and status != '已关闭' and GetDate()> PlanStartDate ) or ( status = '已关闭' and ReceiveDate>= DateAdd(dd,-7,GetDate()) and #{endDate}>=ReceiveDate) )and MaterialSplitFlag='N'
</select>
@ -88,7 +88,7 @@
from
(
select PL.ProLineNo AS resourceId ,R.Site,isnull(Round(SUM(SR.QtyRequired),3),0) as QtyRequired,isnull(Round(SUM(SR.QtyReported),3),0) as QtyReported,isnull(Round(SUM(SR.QtyApprove),3),0) as QtyApprove,
PL.ProLineDesc as resourceDesc,isnull(Round(Round(SUM(SR.QtyRequired),3)-Round(SUM(SR.QtyReported),3),3),0) as QtyUnReported
PL.ProLineDesc as resourceDesc,isnull(Round(Round(SUM( case when 0> SR.QtyRequired-SR.QtyReported then 0 else SR.QtyRequired-SR.QtyReported end ),3),3),0) as QtyUnReported
from WorkCenter R
LEFT JOIN SOScheduledRouting SR on SR.Site=R.Site and SR.S_WorkCenterNo=R.WorkCenterNo
left join ProductionLine PL on PL.site =R.site and PL.ProLineNo=R.ProLineNo
@ -106,11 +106,11 @@
</select>
<select id="getNewScheduledPieList" resultType="com.jtem.modules.board.entity.PieBoardData">
select Round(SUM(SR.QtyRequired),3) as qty1,Round(SUM(SR.QtyRequired),3)-Round(SUM(SR.QtyReported),3) as qty4,Round(SUM(SR.QtyApprove),3) as qty2,
select Round(SUM(SR.QtyRequired),3) as qty1,Round(SUM(case when 0> SR.QtyRequired-SR.QtyReported then 0 else SR.QtyRequired-SR.QtyReported end),3) as qty4,Round(SUM(SR.QtyApprove),3) as qty2,
Round(SUM(SR.QtyReported),3) -Round(SUM(SR.QtyApprove),3) as qty3,100 as per1,
Round(Round(SUM(SR.QtyApprove),3) *100 /case when Round(SUM(SR.QtyRequired),3) =0 then 1 else Round(SUM(SR.QtyRequired),3) end ,1) as per2,
Round((Round(SUM(SR.QtyReported),3) -Round(SUM(SR.QtyApprove),3) ) *100 /case when Round(SUM(SR.QtyRequired),3) =0 then 1 else Round(SUM(SR.QtyRequired),3) end ,1) as per3,
Round((Round(SUM(SR.QtyRequired),3) -Round(SUM(SR.QtyReported),3) ) *100 /case when Round(SUM(SR.QtyRequired),3) =0 then 1 else Round(SUM(SR.QtyRequired),3) end ,1) as per4
Round((Round(SUM( case when 0> SR.QtyRequired-SR.QtyReported then 0 else SR.QtyRequired-SR.QtyReported end),3) ) *100 /case when Round(SUM(SR.QtyRequired),3) =0 then 1 else Round(SUM(SR.QtyRequired),3) end ,1) as per4
from SOScheduledRouting SR
where SR.S_ScheduledDate>DATEADD(dd, -7,#{date}) and #{date}>=SR.S_ScheduledDate and SR.ClosedFlag='Y'

Write Preview
Loading…
Cancel
Save