Sfoglia il codice sorgente

订单导出增加合同编号

xuefy 4 anni fa
parent
commit
d881dc6681

+ 2 - 2
adm/src/main/java/com/minpay/guomao/ordermanage/action/OrderManageAction.java

@@ -2092,11 +2092,11 @@ public class OrderManageAction implements IMINAction {
 		
 		String exportExcel = "";
 		if(conType.equals("00")){//采购
-			exportExcel = "合同性质#contractType,          供货单位          #sellerName,    订单名称     #orderName,提单号#tidanhao,调整库存#kucun,合同月开始时间#startDate,合同月结束时间#endDate,结算期#contranctMonth,采购日期#entryTime,产品名称#productName,规格#standardName,品牌#brandName,";
+			exportExcel = "合同性质#contractType,          供货单位          #sellerName,合同编号#contractNo,订单名称     #orderName,提单号#tidanhao,调整库存#kucun,合同月开始时间#startDate,合同月结束时间#endDate,结算期#contranctMonth,采购日期#entryTime,产品名称#productName,规格#standardName,品牌#brandName,";
 			exportExcel += "货物形式#hwType,货源地#huoyuandi,区域#region,仓库名称#warehouseName,计划量#weight,实际单价#realPrice,预付单价#predictPrice,预付款#yufukuan,付款结清#fukuanjieqing,";
 			exportExcel += "到货时间#entryTime,到货数量#detailWeight,发票单价#fapiaoPrice,预收发票#yushoufapiao,发票数量#fapiaoshuliang,票据结清#piaojujieqing,是否开票#invoiceOrNot,备注#remarks";
 		} else {//销售
-			exportExcel = "合同性质#contractType,          采购单位          #buyerName,    订单名称     #orderName,提单号#tidanhao,调整库存#kucun,合同月开始时间#startDate,合同月结束时间#endDate,结算期#contranctMonth,销售日期#entryTime,产品名称#productName,规格#standardName,品牌#brandName,";
+			exportExcel = "合同性质#contractType,          采购单位          #buyerName,合同编号#contractNo,订单名称     #orderName,提单号#tidanhao,调整库存#kucun,合同月开始时间#startDate,合同月结束时间#endDate,结算期#contranctMonth,销售日期#entryTime,产品名称#productName,规格#standardName,品牌#brandName,";
 			exportExcel += "货物形式#hwType,货源地#huoyuandi,区域#region,仓库名称#warehouseName,计划量#weight,实际单价#realPrice,预付单价#predictPrice,预收款#yufukuan,收款结清#fukuanjieqing,";
 			exportExcel += "配货时间#entryTime,配货数量#detailWeight,预开发票单价#fapiaoPrice,发票单价#fpPrice,预开发票#yushoufapiao,发票金额#fapiaoshuliang,票据结清#piaojujieqing,是否开票#invoiceOrNot,备注#remarks";
 		}