diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportInfo.jsp
new file mode 100644
index 000000000..9563cacb8
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportInfo.jsp
@@ -0,0 +1,27 @@
+<%@page import="com.itextpdf.text.log.SysoCounter"%>
+<%@ page contentType="text/html; charset=GBK"%><%@
+include
+ file="/Frame/resources/include/include_begin_info.jspf"%>
+<%
+ String sPrevUrl = CurPage.getParameter("PrevUrl");
+ if(sPrevUrl == null) sPrevUrl = "/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportlist.jsp";
+ String sTempletNo = "TradeOrderInfo";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ dwTemp.ReadOnly = "0";//只读模式
+ dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID"));
+
+ String sButtons[][] = {
+ {"true", "All", "Button", "保存","保存所有修改", "saveRecord()", "", "", "", ""},
+ };
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportlist.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportlist.jsp
new file mode 100644
index 000000000..50999d59f
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBImportPage/TheTradeOrderReportImportlist.jsp
@@ -0,0 +1,115 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%>
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List01;Describe=定义页面属性;]~*/%>
+<%
+ String PG_TITLE = "深圳-交易订单"; // 浏览器窗口标题 PG_TITLE
+ //商用车
+%>
+<%
+ ASObjectModel doTemp = new ASObjectModel("TradeOrderList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.MultiSelect = true; //多选
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(30);
+ dwTemp.genHTMLObjectWindow("");
+%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List04;Describe=定义按钮;]~*/%>
+<%
+ String sButtons[][] = {
+ //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ //{"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"},
+ {"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""},
+ {"true","","Button","excel导入","excel导入","importExcel()","","","","btn_icon_import"},
+ {"true","","Button","模版下载","模版下载","DiscountDownload()","","","","btn_icon_down",""},
+ /* {"true","All","Button","生成租金计划","生成租金计划","createPlan()","","","","btn_icon_generate"},
+ {"true","All","Button","测试拷贝","测试拷贝","copyPath()","","","","btn_icon_generate"}, */
+ };
+%>
+<%/*~END~*/%>
+<%/*~BEGIN~不可编辑区~[Editable=false;CodeAreaID=List05;Describe=主体页面;]~*/%>
+<%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
+
+<%/*~END~*/%>
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List07;Describe=自定义函数;]~*/%>
+
+<%/*~END~*/%>
+<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List08;Describe=页面装载时，进行初始化;]~*/%>
+
+<%/*~END~*/%>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 69ee7df72..2fcc83888 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -5285,7 +5285,7 @@
-
+
@@ -5336,6 +5336,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src_jbo/jbo/com/tenwa/lease/comm/SZ_TRADE_ORDER.java b/src_jbo/jbo/com/tenwa/lease/comm/SZ_TRADE_ORDER.java
new file mode 100644
index 000000000..0160f0fa4
--- /dev/null
+++ b/src_jbo/jbo/com/tenwa/lease/comm/SZ_TRADE_ORDER.java
@@ -0,0 +1,112 @@
+package jbo.com.tenwa.lease.comm;
+
+import java.lang.String;
+
+/**
+* 深圳交易订单报表 - JBO命名常量类
+* Note: This file is generated by ADE tools, dont modify it.
+
+*/
+public interface SZ_TRADE_ORDER{
+ /**
+ * 深圳交易订单报表
+ * 代表本类映射的BizObjectClass
+ */
+ public static final String CLASS_NAME = "jbo.com.tenwa.lease.comm.SZ_TRADE_ORDER";
+ /**
+ * 标识 STRING(32)
+ */
+ public static final String id = "id";
+ /**
+ * 生成日期 STRING(32)
+ */
+ public static final String creation_date = "creation_date";
+ /**
+ * 总记录数 STRING(32)
+ */
+ public static final String total_number_records = "total_number_records";
+ /**
+ * 订单总金额 STRING(32)
+ */
+ public static final String total_amount_order = "total_amount_order";
+ /**
+ * 支付金额总数 STRING(32)
+ */
+ public static final String Total_amount_paid = "Total_amount_paid";
+ /**
+ * 保留域01 STRING(50)
+ */
+ public static final String keep_domain_one = "keep_domain_one";
+ /**
+ * 保留域02 STRING(50)
+ */
+ public static final String keep_domain_two = "keep_domain_two";
+ /**
+ * 支付渠道 STRING(50)
+ */
+ public static final String payment_channel = "payment_channel";
+ /**
+ * 网银订单号 STRING(50)
+ */
+ public static final String Ebank_order_number = "Ebank_order_number";
+ /**
+ * 商户订单号 STRING(50)
+ */
+ public static final String merchants_order_number = "merchants_order_number";
+ /**
+ * 交易日期 STRING(32)
+ */
+ public static final String Transaction_date = "Transaction_date";
+ /**
+ * 订单金额 STRING(32)
+ */
+ public static final String order_amount = "order_amount";
+ /**
+ * 货币名称 STRING(32)
+ */
+ public static final String currency_name = "currency_name";
+ /**
+ * 订单状态 STRING(50)
+ */
+ public static final String order_type = "order_type";
+ /**
+ * 支付金额 STRING(32)
+ */
+ public static final String Pay_amount = "Pay_amount";
+ /**
+ * 银行代码（发卡行） STRING(50)
+ */
+ public static final String bank_code = "bank_code";
+ /**
+ * 银联支付单号 STRING(50)
+ */
+ public static final String Unionpay_payment_order = "Unionpay_payment_order";
+ /**
+ * 系统流水号 STRING(50)
+ */
+ public static final String System_serial_number = "System_serial_number";
+ /**
+ * 登记人 STRING(32)
+ */
+ public static final String INPUTUSERID = "INPUTUSERID";
+ /**
+ * 登记部门 STRING(32)
+ */
+ public static final String INPUTORGID = "INPUTORGID";
+ /**
+ * 登记时间 STRING(32)
+ */
+ public static final String INPUTTIME = "INPUTTIME";
+ /**
+ * 更新人 STRING(32)
+ */
+ public static final String UPDATEUSERID = "UPDATEUSERID";
+ /**
+ * 更新部门 STRING(32)
+ */
+ public static final String UPDATEORGID = "UPDATEORGID";
+ /**
+ * 更新日期 STRING(32)
+ */
+ public static final String UPDATETIME = "UPDATETIME";
+}
\ No newline at end of file
diff --git a/src_tenwa/com/tenwa/apzl/comm/TheTradeOrderImport.java b/src_tenwa/com/tenwa/apzl/comm/TheTradeOrderImport.java
new file mode 100644
index 000000000..fcdb5467d
--- /dev/null
+++ b/src_tenwa/com/tenwa/apzl/comm/TheTradeOrderImport.java
@@ -0,0 +1,82 @@
+package com.tenwa.apzl.comm;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.awe.util.SqlObject;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.context.ASUser;
+import com.amarsoft.dict.als.cache.CacheLoaderFactory;
+import com.tenwa.comm.exception.BusinessException;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+import com.tenwa.officetempalte.importcallback.impl.BaseImportExcelCallBack;
+
+public class TheTradeOrderImport extends BaseImportExcelCallBack{
+
+
+ @Override
+ public void run(ASUser CurUser, BizObject importObject,Map model, Integer rowIndex, JBOTransaction tx,Transaction Sqlca) throws Exception {
+ }
+
+ @Override
+ public void runBefore(ASUser CurUser, Map model, List importObjects, JBOTransaction tx,Transaction Sqlca) throws Exception {
+ Transaction Sqlca1 = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
+ /**
+ * 定义全局变量
+ */
+ String error=""; // 错误描述
+ boolean flag=false; // 错误描述
+ String Ebank_order_number=null; // 导入的网银订单号
+ String merchants_order_number=null; // 导入的商户订单号
+ String System_serial_number=null; // 导入的系统流水号
+ String sql1=""; // 原有的数据
+ /**
+ * 校验本次Excel是否有重复的
+ */
+
+ /**
+ * 校验本次导入数据在导入表是否已有
+ */
+ List> list = new ArrayList>();
+ Map map = new HashMap();
+ List arrayList = new ArrayList();
+ for(BizObject bo:importObjects){
+ Ebank_order_number=bo.getAttribute("Ebank_order_number").getString();
+ merchants_order_number=bo.getAttribute("merchants_order_number").getString();
+ System_serial_number=bo.getAttribute("System_serial_number").getString();
+ arrayList.add(Ebank_order_number);
+ // 通过本次excel中的数据查询导入的表, 判断是否重复
+ sql1="SELECT Ebank_order_number FROM sz_trade_order WHERE Ebank_order_number='"+Ebank_order_number+"' AND merchants_order_number='"+merchants_order_number+"' AND System_serial_number='"+System_serial_number+"'";
+ List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql1, null);
+ // 有结果集, 说明重复
+ if(dataList.size()>0){
+ error=",【网银订单号: "+Ebank_order_number+", 商户订单号: "+merchants_order_number+", 系统流水号 : "+System_serial_number+"】";
+ flag=true;
+ }
+ }
+ if(flag) {
+ error = error.substring(1);
+ throw new BusinessException(error+"已存在 ！");
+ }
+ long count = arrayList.stream().distinct().count();
+ boolean isRepeat = count < arrayList.size();
+ if(isRepeat){
+ Set set = new HashSet<>();
+ Set exist = new HashSet<>();
+ for (String s : arrayList) {
+ if (set.contains(s)) {
+ exist.add(s);
+ } else {
+ set.add(s);
+ }
+ }
+ throw new BusinessException("，excl中的网银订单号:"+String.join(", ", exist)+"重复。");
+ }
+ }
+}