Просмотр исходного кода

update

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
5309acb571

+ 4 - 1
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -501,7 +501,8 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		    	try {
 		    		//设计表头
 		    		String[] comment = {"订单编号", "合同编号","客户名称","订单部门","订单负责人","签单日期","下单日期", 
-							"签单金额(万元)", "已开票金额(万元)", "已收金额(万元)","最近收款(万元)","最近收款时间","结算状态","订单流程","是否特批"};
+							"签单金额(万元)", "已开票金额(万元)", "已收金额(万元)","总成本(万元)","已付成本(万元)",
+							"最近收款(万元)","最近收款时间","结算状态","订单流程","是否特批"};
 		    		String fileName = "收款结算列表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
 		    		XSSFWorkbook wb =exportTemplateInfoS(comment,"收款结算",list,0);
 		    		//根据列表编写文档
@@ -717,6 +718,8 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 					case "签单金额(万元)":o=ob.getSignTotalAmount().toString();break;
 					case "已开票金额(万元)":o=ob.getInvoiceAmount().toString();break;
 					case "已收金额(万元)":o=ob.getActuallyTotalAmount().toString();break;
+					case "总成本(万元)":o=ob.getCostAmount().toString();break;
+					case "已付成本(万元)":o=ob.getPaymentAmount().toString();break;
 					case "最近收款(万元)":o=ob.getFinalReceivables().toString();break;
 					case "最近收款时间":o=ob.getFinalReceivablesTime();break;
 					case "结算状态":o=LiquidationNewState.getValueByCode(ob.getLiquidationStatus());break;