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

修改

master
ruanqi 2 years ago
parent
35526f827a
commit
e44e9ac443
3 changed files with 84 additions and 63 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. 32
      src/main/java/com/jianteng/modules/board/entity/SOSRoutingBoardData.java
  2. 100
      src/main/java/com/jianteng/modules/board/service/impl/BoardServiceImpl.java
  3. 15
      src/main/resources/mapper/board/BoardMapper.xml

32
src/main/java/com/jianteng/modules/board/entity/SOSRoutingBoardData.java
View File

@ -2,11 +2,15 @@ package com.jianteng.modules.board.entity;
import com.jianteng.modules.Schedule.entity.SOScheduledRoutingOutData;
import java.math.BigDecimal;
public class SOSRoutingBoardData extends SOScheduledRoutingOutData {
private String lastLineName;
private String lastRequireQty;
private String lastReportQty;
private BigDecimal lastRequireQty;
private BigDecimal lastReportQty;
private String lastSeqNoDoing;
private String operationDesc;
private String lastOperationDesc;
public String getLastLineName() {
return lastLineName;
}
@ -15,19 +19,19 @@ public class SOSRoutingBoardData extends SOScheduledRoutingOutData {
this.lastLineName = lastLineName;
}
public String getLastRequireQty() {
public BigDecimal getLastRequireQty() {
return lastRequireQty;
}
public void setLastRequireQty(String lastRequireQty) {
public void setLastRequireQty(BigDecimal lastRequireQty) {
this.lastRequireQty = lastRequireQty;
}
public String getLastReportQty() {
public BigDecimal getLastReportQty() {
return lastReportQty;
}
public void setLastReportQty(String lastReportQty) {
public void setLastReportQty(BigDecimal lastReportQty) {
this.lastReportQty = lastReportQty;
}
@ -38,4 +42,20 @@ public class SOSRoutingBoardData extends SOScheduledRoutingOutData {
public void setLastSeqNoDoing(String lastSeqNoDoing) {
this.lastSeqNoDoing = lastSeqNoDoing;
}
public String getOperationDesc() {
return operationDesc;
}
public void setOperationDesc(String operationDesc) {
this.operationDesc = operationDesc;
}
public String getLastOperationDesc() {
return lastOperationDesc;
}
public void setLastOperationDesc(String lastOperationDesc) {
this.lastOperationDesc = lastOperationDesc;
}
}

100
src/main/java/com/jianteng/modules/board/service/impl/BoardServiceImpl.java
View File

@ -53,48 +53,48 @@ 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/14);
int maxPage=(int)Math.ceil(number/18);
if(pageIndex>maxPage){
pageIndex=1;
}
List<SOSRoutingBoardData> result =new ArrayList<>();
if(pageIndex<maxPage){
for(int i=0;i<14;i++){
result.add(list.get((pageIndex-1)*14+i));
for(int i=0;i<18;i++){
result.add(list.get((pageIndex-1)*18+i));
}
}else {
for(int i=0;(pageIndex-1)*14+i<number;i++){
result.add(list.get((pageIndex-1)*14+i));
for(int i=0;(pageIndex-1)*18+i<number;i++){
result.add(list.get((pageIndex-1)*18+i));
}
}
List<AbnormalFeedBackOutData> list2 =boardMapper.abnormalBoardList(inData);
double number2=list2.size();
int pageIndex2=inData.getNumber2();
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<3;i++){
result2.add(list2.get((pageIndex2-1)*3+i));
}
}else {
for(int i=0;(pageIndex2-1)*3+i<number2;i++){
result2.add(list2.get((pageIndex2-1)*3+i));
}
}
// List<AbnormalFeedBackOutData> list2 =boardMapper.abnormalBoardList(inData);
// double number2=list2.size();
// int pageIndex2=inData.getNumber2();
// 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<3;i++){
// result2.add(list2.get((pageIndex2-1)*3+i));
// }
// }else {
// for(int i=0;(pageIndex2-1)*3+i<number2;i++){
// result2.add(list2.get((pageIndex2-1)*3+i));
// }
// }
Map<String, Object> map = new HashMap<>();
map.put("maxPage", maxPage);
map.put("rows", result);
map.put("total",result.size());
map.put("maxPage2", maxPage2);
map.put("rows2", result2);
map.put("total2",result2.size());
// map.put("maxPage2", maxPage2);
// map.put("rows2", result2);
// map.put("total2",result2.size());
return map;
}
@ -138,47 +138,47 @@ 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/14);
int maxPage=(int)Math.ceil(number/18);
if(pageIndex>maxPage){
pageIndex=1;
}
List<ShopOrderBoardOutData> result =new ArrayList<>();
if(pageIndex<maxPage){
for(int i=0;i<14;i++){
result.add(list.get((pageIndex-1)*14+i));
for(int i=0;i<18;i++){
result.add(list.get((pageIndex-1)*18+i));
}
}else {
for(int i=0;(pageIndex-1)*14+i<number;i++){
result.add(list.get((pageIndex-1)*14+i));
for(int i=0;(pageIndex-1)*18+i<number;i++){
result.add(list.get((pageIndex-1)*18+i));
}
}
List<AbnormalFeedBackOutData> list2 =boardMapper.abnormalBoardList(inData);
double number2=list2.size();
int pageIndex2=inData.getNumber2();
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<3;i++){
result2.add(list2.get((pageIndex2-1)*3+i));
}
}else {
for(int i=0;(pageIndex2-1)*3+i<number2;i++){
result2.add(list2.get((pageIndex2-1)*3+i));
}
}
// List<AbnormalFeedBackOutData> list2 =boardMapper.abnormalBoardList(inData);
// double number2=list2.size();
// int pageIndex2=inData.getNumber2();
// 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<3;i++){
// result2.add(list2.get((pageIndex2-1)*3+i));
// }
// }else {
// for(int i=0;(pageIndex2-1)*3+i<number2;i++){
// result2.add(list2.get((pageIndex2-1)*3+i));
// }
// }
Map<String, Object> map = new HashMap<>();
map.put("maxPage", maxPage);
map.put("rows", result);
map.put("total",result.size());
map.put("maxPage2", maxPage2);
map.put("rows2", result2);
map.put("total2",result2.size());
// map.put("maxPage2", maxPage2);
// map.put("rows2", result2);
// map.put("total2",result2.size());
return map;
}

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

@ -6,10 +6,11 @@
select a.Site,a.OrderNo,a.ItemNo,a.SeqNo,a.QtyRequired,a.QtyReported,a.QtyApprove,a.ClosedFlag,
a.OutWorkFlag,a.S_ScheduledDate,a.S_ResourceID,a.S_ShiftNo,
a.S_WorkCenterNo,a.mat_issueflag,a.partNo,b.QtyRequired lastRequireQty,b.QtyReported lastReportQty,
dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(b.site,b.WorkCenterNo)) lastLineName,
dbo.get_lastStartingSeqNo(a.Site,a.OrderNo,a.ItemNo) lastSeqNoDoing
from SOScheduledRouting a left join v_SORouting b on a.Site=b.Site and a.OrderNo=b.OrderNo
and b.ItemNo=dbo.Get_SORouting_PreviousOperationItemNo(a.Site,a.OrderNo,a.ItemNo)
dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(b.site,b.S_WorkCenterNo)) lastLineName,
a.previousSeqNo lastSeqNoDoing,c.operationDesc,d.operationDesc as lastOperationDesc
from SOScheduledRouting a left join SOScheduledRouting b on a.Site=b.Site and a.previousSeqNo=b.SeqNo
left join v_sorouting c on a.Site=c.Site and a.OrderNo=c.OrderNo and a.ItemNo=c.ItemNo
left join v_sorouting d on b.Site=d.Site and b.OrderNo=d.OrderNo and b.ItemNo=d.ItemNo
<where>
and a.ClosedFlag='N'
<if test="text1 != null and text1 != ''">
@ -21,9 +22,9 @@
<select id="abnormalBoardListWithLine" resultType="com.jianteng.modules.Schedule.entity.AbnormalFeedBackOutData">
select a.Site,a.OrderNo,a.SeqNo,a.AbnormalCode,b.AbnormalDesc abnormalDesc,a.AbnormalRemark,a.FeedbackBy,a.FeedbackDate,a.Status,a.processingResult,
dbo.Get_OperatorDesc(a.Site,sos.operatorId) OperatorDesc,dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(a.site,sos.S_WorkCenterNo)) ProductionLineDesc,
a.id,dbo.Get_Part_SpecDesc(sos.site,sos.PartNo) partDesc,sos.partNo from AbnormalFeedBack a left join AbnormalItem b on a.AbnormalCode=b.AbnormalCode
left join SOScheduledRouting sos on sos.seqNo=a.seqNo
dbo.Get_OperatorDesc(a.Site,sos.operatorId) OperatorDesc,dbo.Get_ProductionLineDesc(a.Site,dbo.Get_WorkCenter_ProLineNo(a.site,sos.S_WorkCenterNo)) ProductionLineDesc,
a.id,dbo.Get_Part_SpecDesc(sos.site,sos.PartNo) partDesc,sos.partNo from AbnormalFeedBack a left join AbnormalItem b on a.AbnormalCode=b.AbnormalCode
left join SOScheduledRouting sos on sos.seqNo=a.seqNo
<!-- left join user_work_center uwc on sos.site=uwc.site and sos.S_WorkCenterNo =uwc.WorkCenterNo and uwc.userId=#{userId}-->
<where>
<!-- and uwc.WorkCenterNo is not null-->

Write Preview
Loading…
Cancel
Save