|
@@ -439,24 +439,27 @@ public class StationClassStructureController extends BaseController
|
|
|
StationClassStructure classStructure= new StationClassStructure();
|
|
|
classStructure.setClassStructureNo(no);
|
|
|
List<StationClassStructure> list= stationClassStructureService.listOilStructure(classStructure);
|
|
|
+ //支付方式汇总数据
|
|
|
+ List<StationClassStructure> paylist= stationClassStructureService.listPayStructure(classStructure);
|
|
|
//查询出小票数据
|
|
|
String content;
|
|
|
content = "<CB>班结小票</CB><BR>";
|
|
|
content += "--------------------------------<BR>";
|
|
|
- if(list!=null && list.size()>0){
|
|
|
+ if(list!=null && list.size()>0 && paylist !=null && paylist.size()>0){
|
|
|
if(list.get(0).getClassStartDate()!=null){
|
|
|
content += "开始时间:"+dateFormat.format(list.get(0).getClassStartDate())+" <BR>";
|
|
|
}else{
|
|
|
content += "开始时间: <BR>";
|
|
|
}
|
|
|
content += "班结时间:"+dateFormat.format(list.get(0).getClassStructureDate())+" <BR>";
|
|
|
- content += "油品 升数 金额 单数 优惠 <BR>";
|
|
|
+ content += "油品 笔 升数 金额<BR>";
|
|
|
content += "--------------------------------<BR>";
|
|
|
|
|
|
BigDecimal sumAmt = new BigDecimal(0);
|
|
|
BigDecimal liters = new BigDecimal(0);
|
|
|
BigDecimal coupon = new BigDecimal(0);
|
|
|
BigDecimal ysAmt = new BigDecimal(0);
|
|
|
+ BigDecimal dzAmt = new BigDecimal(0);
|
|
|
int num = 0;
|
|
|
int pageNum=0;
|
|
|
for(StationClassStructure str : list){
|
|
@@ -471,13 +474,17 @@ public class StationClassStructureController extends BaseController
|
|
|
if( str.getReceivableAmt()==null){
|
|
|
str.setReceivableAmt(BigDecimal.valueOf(0));
|
|
|
}
|
|
|
+ //到款金额
|
|
|
+ if( str.getReceivedAmt()==null){
|
|
|
+ str.setReceivedAmt(BigDecimal.valueOf(0));
|
|
|
+ }
|
|
|
if( str.getDiscountAmt()==null){
|
|
|
str.setDiscountAmt(BigDecimal.valueOf(0));
|
|
|
}
|
|
|
if( str.getOrderNo()==null){
|
|
|
str.setOrderNo(String.valueOf(0));
|
|
|
}
|
|
|
- content += str.getOilName()+" "+str.getOrderLiters()+" "+str.getAmt()+" "+str.getOrderNo()+" "+str.getDiscountAmt()+ " <BR>";
|
|
|
+ content += str.getOilName()+" "+str.getOrderNo()+" "+str.getOrderLiters()+" "+str.getReceivableAmt()+"<BR>";
|
|
|
if(str.getAmt()!=null){
|
|
|
sumAmt=sumAmt.add(str.getAmt());
|
|
|
}
|
|
@@ -496,24 +503,37 @@ public class StationClassStructureController extends BaseController
|
|
|
if(str.getPrintNum()!=null){
|
|
|
pageNum += str.getPrintNum();
|
|
|
}
|
|
|
+ if(str.getReceivedAmt()!=null){
|
|
|
+ dzAmt = dzAmt.add(str.getReceivedAmt());
|
|
|
+ }
|
|
|
}
|
|
|
content += "--------------------------------<BR>";
|
|
|
- content += "合计 "+liters+" "+sumAmt+" "+num+" "+coupon+"<BR>";
|
|
|
+ content += "合计 "+num +" "+liters +" "+sumAmt+"<BR>";
|
|
|
+ content += " <BR>";
|
|
|
+ //按支付方式
|
|
|
+ content += "支付方式 笔 升数 金额 <BR>";
|
|
|
+ for(StationClassStructure sc : paylist){
|
|
|
+ content += sc.getPayType()+" "+sc.getOrderNo()+" "+sc.getOrderLiters()+" "+sc.getReceivableAmt()+"<BR>";
|
|
|
+ }
|
|
|
content += "小票张数: "+pageNum+" 张<BR>";
|
|
|
content += "班结金额: "+ysAmt+" 元<BR>";
|
|
|
content += "优惠总额: "+coupon+" 元<BR>";
|
|
|
content += "实际支付: "+sumAmt+" 元<BR>";
|
|
|
+ content += "到款金额: "+dzAmt+"元<BR>";
|
|
|
content += "班结人: "+list.get(0).getClassStructureMan()+"<BR>";
|
|
|
}else{
|
|
|
content += "开始时间: <BR>";
|
|
|
content += "班结时间: <BR>";
|
|
|
- content += "油站 升数 金额 单数 优惠 <BR>";
|
|
|
+ content += "油站 笔 升数 金额 <BR>";
|
|
|
content += "--------------------------------<BR>";
|
|
|
content += "合计 <BR>";
|
|
|
+ content += " <BR>";
|
|
|
+ content += "支付方式 笔 升数 金额<BR>";
|
|
|
content += "小票张数:<BR>";
|
|
|
content += "班结金额:<BR>";
|
|
|
content += "优惠总额:<BR>";
|
|
|
content += "实际支付: <BR>";
|
|
|
+ content += "到款金额: <BR>";
|
|
|
content += "班结人:<BR>";
|
|
|
}
|
|
|
content += "<BR>";
|