#2932

ERMCP/PCWEB/TableSql/fxgl_v3_pcweb_table_define.sql

@@ -11,88 +11,75 @@ delete from TableDefine t where t.tabletype = 2;
 -- 现货合同
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_delivery', 2, '现货合同', '', 'web端-现货合同');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'contracctstatus', '状态', '120', 10, 1, 1, '', '', 'contracctstatus', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'contractno', '合同编号', '250', 10, 1, 1, '', '', 'contractno', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'contractno', '合同编号', '250', 20, 1, 1, '', '', 'contractno', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'negative', '对手方', '250', 20, 1, 1, '', '', 'negative', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'contracttype', '类型', '120', 30, 1, 1, '', '', 'contracttype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'wrstandardname', '商品', '120', 30, 1, 1, '', '', 'wrstandardname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'negative', '对手方', '250', 40, 1, 1, '', '', 'negative', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'biztype', '业务类型', '120', 40, 1, 1, '', '', 'biztype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'qty', '合同量', '120', 50, 1, 1, '', '', 'qty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'pricetype', '定价类型', '120', 50, 1, 1, '', '', 'pricetype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'deliverygoodsname', '现货品种', '120', 60, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'currencyname', '结算币种', '120', 60, 1, 1, '', '', 'currencyname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'wrstandardname', '商品', '120', 70, 1, 1, '', '', 'wrstandardname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'price', '价格', '120', 70, 1, 1, '', '', 'price', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'biztype', '业务类型', '120', 80, 1, 1, '', '', 'biztype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'pricemove', '升贴水', '120', 80, 1, 1, '', '', 'pricemove', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'pricetype', '定价类型', '120', 100, 1, 1, '', '', 'pricetype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'qty', '合同量', '120', 90, 1, 1, '', '', 'qty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'goodsname', '点价合约', '120', 110, 1, 1, '', '', 'goodscode', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'amount', '金额', '120', 100, 1, 1, '', '', 'amount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'price', '价格', '120', 120, 1, 1, '', '', 'price', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'margin', '保证金', '120', 110, 1, 1, '', '', 'margin', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'pricemove', '升贴水', '120', 130, 1, 1, '', '', 'pricemove', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'saleusername', '业务员', '300', 120, 1, 1, '', '', 'saleusername', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'amount', '金额', '120', 140, 1, 1, '', '', 'amount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'merusername', '跟单员', '300', 130, 1, 1, '', '', 'merusername', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'margin', '保证金', '120', 150, 1, 1, '', '', 'margin', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'startdate', '点价期', '200', 160, 1, 1, '', '', 'startdate', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'deliverystartdate', '交收期', '200', 170, 1, 1, '', '', 'deliverystartdate', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'saleusername', '业务员', '300', 180, 1, 1, '', '', 'saleusername', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'merusername', '跟单员', '300', 190, 1, 1, '', '', 'merusername', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'tradeusername', '交易用户', '300', 190, 1, 1, '', '', 'tradeusername', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'currencyname', '结算币种', '120', 200, 1, 1, '', '', 'currencyname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'contracctstatus', '状态', '120', 140, 1, 1, '', '', 'contracctstatus', 0, 0, '');
 
 -- 合同待审核
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_delivery_dsh', 2, '现货合同', '', 'web端-现货合同');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'contractno', '合同编号', '250', 20, 1, 1, '', '', 'contractno', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'contractno', '合同编号', '250', 10, 1, 1, '', '', 'contractno', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'contracttype', '类型', '120', 30, 1, 1, '', '', 'contracttype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'contracttype', '类型', '120', 20, 1, 1, '', '', 'contracttype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'negative', '对手方', '250', 40, 1, 1, '', '', 'negative', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'negative', '对手方', '250', 30, 1, 1, '', '', 'negative', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'subjectname', '交易主体', '120', 50, 1, 1, '', '', 'subjectname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'subjectname', '交易主体', '120', 40, 1, 1, '', '', 'subjectname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'qty', '合同量', '120', 50, 1, 1, '', '', 'qty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'wrstandardname', '商品', '120', 50, 1, 1, '', '', 'wrstandardname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'deliverygoodsname', '现货品种', '120', 60, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'biztype', '业务类型', '120', 60, 1, 1, '', '', 'biztype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'wrstandardname', '商品', '120', 70, 1, 1, '', '', 'wrstandardname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'pricetype', '定价类型', '120', 70, 1, 1, '', '', 'pricetype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'biztype', '业务类型', '120', 80, 1, 1, '', '', 'biztype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'currencyname', '结算币种', '120', 80, 1, 1, '', '', 'currencyname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'pricetype', '定价类型', '120', 100, 1, 1, '', '', 'pricetype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'price', '价格', '120', 90, 1, 1, '', '', 'price', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'goodsname', '点价合约', '120', 110, 1, 1, '', '', 'goodscode', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'pricemove', '升贴水', '120', 100, 1, 1, '', '', 'pricemove', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'price', '价格', '120', 120, 1, 1, '', '', 'price', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'qty', '合同量', '120', 110, 1, 1, '', '', 'qty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'pricemove', '升贴水', '120', 130, 1, 1, '', '', 'pricemove', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'amount', '金额', '120', 120, 1, 1, '', '', 'amount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'amount', '金额', '120', 140, 1, 1, '', '', 'amount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'margin', '保证金', '120', 130, 1, 1, '', '', 'margin', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'margin', '保证金', '120', 150, 1, 1, '', '', 'margin', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'saleusername', '业务员', '300', 140, 1, 1, '', '', 'saleusername', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'startdate', '点价期', '200', 160, 1, 1, '', '', 'startdate', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'merusername', '跟单员', '300', 150, 1, 1, '', '', 'merusername', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'deliverystartdate', '交收期', '200', 170, 1, 1, '', '', 'deliverystartdate', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'goodsname', '点价合约', '120', 160, 1, 1, '', '', 'goodscode', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'saleusername', '业务员', '300', 180, 1, 1, '', '', 'saleusername', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'startdate', '点价期', '200', 170, 1, 1, '', '', 'startdate', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'merusername', '跟单员', '300', 190, 1, 1, '', '', 'merusername', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'deliverystartdate', '交收期', '200', 180, 1, 1, '', '', 'deliverystartdate', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'tradeusername', '交易用户', '300', 190, 1, 1, '', '', 'tradeusername', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_dsh', 'currencyname', '结算币种', '120', 200, 1, 1, '', '', 'currencyname', 0, 0, '');
+
 
 -- 合同已审核
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_delivery_ysh', 2, '现货合同', '', 'web端-现货合同');
@@ -107,66 +94,62 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'negative', '
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'subjectname', '交易主体', '120', 50, 1, 1, '', '', 'subjectname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'qty', '合同量', '120', 50, 1, 1, '', '', 'qty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'wrstandardname', '商品', '120', 60, 1, 1, '', '', 'wrstandardname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'deliverygoodsname', '现货品种', '120', 60, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'biztype', '业务类型', '120', 70, 1, 1, '', '', 'biztype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'wrstandardname', '商品', '120', 70, 1, 1, '', '', 'wrstandardname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'pricetype', '定价类型', '120', 80, 1, 1, '', '', 'pricetype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'biztype', '业务类型', '120', 80, 1, 1, '', '', 'biztype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'currencyname', '结算币种', '120', 90, 1, 1, '', '', 'currencyname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'convertfactor', '标仓系数', '0', 180, 1, 1, '', '', 'convertfactor', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'price', '价格', '120', 100, 1, 1, '', '', 'price', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'pricetype', '定价类型', '120', 100, 1, 1, '', '', 'pricetype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'pricemove', '升贴水', '120', 110, 1, 1, '', '', 'pricemove', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'goodsname', '点价合约', '120', 110, 1, 1, '', '', 'goodscode', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'qty', '合同量', '120', 120, 1, 1, '', '', 'qty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'price', '价格', '120', 120, 1, 1, '', '', 'price', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'amount', '金额', '120', 130, 1, 1, '', '', 'amount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'pricemove', '升贴水', '120', 130, 1, 1, '', '', 'pricemove', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'margin', '保证金', '120', 140, 1, 1, '', '', 'margin', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'amount', '金额', '120', 140, 1, 1, '', '', 'amount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'saleusername', '业务员', '300', 150, 1, 1, '', '', 'saleusername', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'margin', '保证金', '120', 150, 1, 1, '', '', 'margin', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'merusername', '跟单员', '300', 160, 1, 1, '', '', 'merusername', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'startdate', '点价期', '200', 160, 1, 1, '', '', 'startdate', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'goodsname', '点价合约', '120', 170, 1, 1, '', '', 'goodscode', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'deliverystartdate', '交收期', '200', 170, 1, 1, '', '', 'deliverystartdate', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'startdate', '点价期', '200', 180, 1, 1, '', '', 'startdate', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'saleusername', '业务员', '300', 180, 1, 1, '', '', 'saleusername', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'deliverystartdate', '交收期', '200', 190, 1, 1, '', '', 'deliverystartdate', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'merusername', '跟单员', '300', 190, 1, 1, '', '', 'merusername', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'tradeusername', '交易用户', '300', 190, 1, 1, '', '', 'tradeusername', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'currencyname', '结算币种', '120', 200, 1, 1, '', '', 'currencyname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery_ysh', 'tradeusername', '交易用户', '300', 200, 1, 1, '', '', 'tradeusername', 0, 0, '');
 
 -- 客户资料
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_userinfo', 2, '客户资料', '', 'web端-客户资料');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'status', '状态', '0', 10, 1, 1, '', '', 'status', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'customername', '客户名称', '0', 10, 1, 1, '', '', 'customername', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'userinfotype', '客户类型', '0', 20, 1, 1, '', '', 'userinfotype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'nickname', '客户简称', '0', 20, 1, 1, '', '', 'nickname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'nickname', '客户简称', '0', 30, 1, 1, '', '', 'nickname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'userinfotype', '客户类型', '0', 30, 1, 1, '', '', 'userinfotype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'customername', '客户名称', '0', 40, 1, 1, '', '', 'customername', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'contactname', '联系人', '0', 40, 1, 1, '', '', 'contactname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'cardtype', '证件类型', '0', 50, 1, 1, '', '', 'cardtype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'mobile', '手机号码', '0', 50, 1, 1, '', '', 'mobile', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'cardnum', '证件号码', '0', 60, 1, 1, '', '', 'cardnum', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'status', '状态', '0', 60, 1, 1, '', '', 'status', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'contactname', '联系人', '0', 70, 1, 1, '', '', 'contactname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'cardtype', '证件类型', '0', 70, 1, 1, '', '', 'cardtype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'mobile', '手机号码', '0', 80, 1, 1, '', '', 'mobile', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'cardnum', '证件号码', '0', 80, 1, 1, '', '', 'cardnum', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'email', '邮箱', '0', 90, 1, 1, '', '', 'email', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'attachment1', '证件照', '0', 90, 1, 1, '', '', 'attachment1', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'legalpersonname', '法定代表人', '0', 100, 1, 1, '', '', 'legalpersonname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'taxpayernum', '纳税人识别号', '0', 110, 1, 1, '', '', 'taxpayernum', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'attachment1', '证件照', '0', 130, 1, 1, '', '', 'attachment1', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'email', '邮箱', '0', 120, 1, 1, '', '', 'email', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'address', '地址', '0', 130, 1, 1, '', '', 'address', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -175,91 +158,95 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'remark', '备注
 -- 仓库信息
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_warehouse', 2, '仓库信息', '', 'web端-仓库信息');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse', 'warehousestatus', '状态', '0', 10, 1, 1, '', '', 'warehousestatus', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse', 'warehousename', '仓库名称', '0', 10, 1, 1, '', '', 'warehousename', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse', 'warehousecode', '仓库简称', '0', 20, 1, 1, '', '', 'warehousecode', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse', 'warehousetype', '仓库类型', '0', 30, 1, 1, '', '', 'warehousetype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse', 'warehousename', '仓库名称', '0', 40, 1, 1, '', '', 'warehousename', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse', 'warehousestatus', '状态', '0', 40, 1, 1, '', '', 'warehousestatus', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse', 'contactname', '联系人', '0', 50, 1, 1, '', '', 'contactname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse', 'contactnum', '联系电话', '0', 60, 1, 1, '', '', 'contactnum', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse', 'address', '详细地址', '0', 70, 1, 1, '', '', 'address', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse', 'provinceid', '所在地区', '0', 70, 1, 1, '', '', 'provinceid', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse', 'address', '详细地址', '0', 80, 1, 1, '', '', 'address', 0, 0, '');
 
 -- 采购合同--待点价
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_purchase_pointprice', 2, '采购_待点价', '', 'web端-采购-待点价');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'nickname', '销售方', '200', 10, 1, 1, '', '', 'nickname,', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'contractno', '合同编号', '0', 20, 1, 1, '', '', 'contractno', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'contractno', '合同编号', '0', 10, 1, 1, '', '', 'contractno', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'deliverygoodsname', '现货品种', '0', 30, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'nickname', '销售方', '0', 20, 1, 1, '', '', 'nickname,', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'wrstandardname', '商品', '200', 40, 1, 1, '', '', 'wrstandardname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'wrstandardname', '商品', '0', 30, 1, 1, '', '', 'wrstandardname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'goodsid', '点价类型', '0', 40, 1, 1, '', '', 'goodsid', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'biztype', '业务类型', '0', 40, 1, 1, '', '', 'biztype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'goodsname', '点价合约', '0', 50, 1, 1, '', '', 'goodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'goodsid', '点价类型', '0', 50, 1, 1, '', '', 'goodsid', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'pricemove', '升贴水', '0', 60, 1, 1, '', '', 'pricemove', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'pricetype', '定价类型', '0', 60, 1, 1, '', '', 'pricetype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'qty', '合同量', '0', 70, 1, 1, '', '', 'qty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'currencyname', '结算币种', '0', 70, 1, 1, '', '', 'currencyname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'unpricedqty', '未定价量', '0', 80, 1, 1, '', '', 'unpricedqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'pricedavg', '均价', '0', 80, 1, 1, '', '', 'pricedavg', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'pricedqty', '已定价量', '0', 90, 1, 1, '', '', 'pricedqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'pricemove', '升贴水', '0', 90, 1, 1, '', '', 'pricemove', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'unsureqty', '未交收量', '0', 100, 1, 1, '', '', 'unsureqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'qty', '合同量', '0', 100, 1, 1, '', '', 'qty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'payamount', '已付款额', '0', 110, 1, 1, '', '', 'payamount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'pricedamount', '金额', '0', 110, 1, 1, '', '', 'pricedamount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'unpayamount', '应付款额', '0', 120, 1, 1, '', '', 'unpayamount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'unpricedqty', '未定价量', '0', 120, 1, 1, '', '', 'unpricedqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'invoiceamount', '已收票额', '0', 130, 1, 1, '', '', 'invoiceamount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'pricedqty', '已定价量', '0', 130, 1, 1, '', '', 'pricedqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'daikaiamount', '应收票额', '0', 140, 1, 1, '', '', 'unpayamount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'goodsname', '点价合约', '0', 140, 1, 1, '', '', 'goodsname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'startdate,enddate', '点价期', '200', 160, 1, 1, '', '', 'startdate,enddate', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'deliverystartdate,deliveryenddate', '交收期', '200', 150, 1, 1, '', '', 'deliverystartdate,deliveryenddate', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'startdate,enddate', '点价期', '0', 150, 1, 1, '', '', 'startdate,enddate', 0, 0, '');
 
 -- 采购合同--履约结算
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_purchase_settle', 2, '采购_履约交收', '', 'web端-采购-履约交收');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'nickname', '销售方', '200', 10, 1, 1, '', '', 'nickname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'contractno', '合同编号 ', '0', 10, 1, 1, '', '', 'contractno', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'nickname', '销售方', '0', 20, 1, 1, '', '', 'nickname', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'wrstandardname', '商品', '0', 30, 1, 1, '', '', 'wrstandardname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'contractno', '合同编号 ', '0', 20, 1, 1, '', '', 'contractno', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'biztype', '业务类型', '0', 40, 1, 1, '', '', 'biztype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'deliverygoodsname', '现货品种', '0', 30, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'goodsid', '点价类型', '0', 50, 1, 1, '', '', 'goodsid', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'wrstandardname', '商品', '200', 40, 1, 1, '', '', 'wrstandardname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'pricetype', '定价类型', '0', 60, 1, 1, '', '', 'pricetype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'qty', '合同量', '0', 50, 1, 1, '', '', 'qty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'currencyname', '结算币种', '0', 70, 1, 1, '', '', 'currencyname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'unpricedqty', '未定价量', '0', 60, 1, 1, '', '', 'unpricedqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'price', '价格', '0', 80, 1, 1, '', '', 'price', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'pricedqty', '已定价量', '0', 70, 1, 1, '', '', 'pricedqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'qty', '合同量', '0', 90, 1, 1, '', '', 'qty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'unsureqty', '未交收量', '0', 80, 1, 1, '', '', 'unsureqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'pricedamount', '金额', '0', 100, 1, 1, '', '', 'pricedamount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'payamount', '已付款额', '0', 90, 1, 1, '', '', 'payamount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'margin', '保证金', '0', 110, 1, 1, '', '', 'margin', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'unpayamount', '应付款额', '0', 100, 1, 1, '', '', 'unpayamount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'pricedqty', '已定价量', '0', 120, 1, 1, '', '', 'pricedqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'invoiceamount', '已收票额', '0', 110, 1, 1, '', '', 'invoiceamount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'reckonrealqty', '已交收量', '0', 130, 1, 1, '', '', 'reckonrealqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'daikaiamount', '应收票额', '0', 120, 1, 1, '', '', 'daikaiAmount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'orireckonrealqty', '应交收量', '0', 140, 1, 1, '', '', 'orireckonrealqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'startdate,enddate', '点价期', '200', 140, 1, 1, '', '', 'startdate,enddate', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'payamount', '已付款额', '0', 160, 1, 1, '', '', 'payamount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'deliverystartdate,deliveryenddate', '交收期 ', '200', 130, 1, 1, '', '', 'deliverystartdate,deliveryenddate', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'unpayamount', '应付款额', '0', 170, 1, 1, '', '', 'unpayamount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'goodsname', '点价合约', '0', 160, 1, 1, '', '', 'goodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'invoiceamount', '已收票额', '0', 180, 1, 1, '', '', 'invoiceamount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'pricemove', '升贴水 ', '0', 170, 1, 1, '', '', 'pricemove', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'daikaiamount', '应收票额', '0', 190, 1, 1, '', '', 'daikaiAmount', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'deliverystartdate,deliveryenddate', '交收期 ', '200', 200, 1, 1, '', '', 'deliverystartdate,deliveryenddate', 0, 0, '');
 
 -- 采购合同--全部
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_purchase_all', 2, '采购_全部', '', 'web端-采购-全部');
@@ -301,74 +288,76 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_all', 'deliverystar
 -- 销售--待点价
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_sales_pointprice', 2, '销售_待点价', '', 'web端-销售-待点价');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'nickname', '采购方', '200', 10, 1, 1, '', '', 'nickname', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'contractno', '合同编号', '0', 20, 1, 1, '', '', 'contractno', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'contractno', '合同编号', '0', 10, 1, 1, '', '', 'contractno', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'deliverygoodsname', '现货品种', '0', 30, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'nickname', '采购方', '0', 20, 1, 1, '', '', 'nickname,', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'wrstandardname', '商品', '200', 40, 1, 1, '', '', 'wrstandardname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'wrstandardname', '商品', '0', 30, 1, 1, '', '', 'wrstandardname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'goodsid', '点价类型', '0', 40, 1, 1, '', '', 'goodsid', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'biztype', '业务类型', '0', 40, 1, 1, '', '', 'biztype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'goodsname', '点价合约', '0', 50, 1, 1, '', '', 'goodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'goodsid', '点价类型', '0', 50, 1, 1, '', '', 'goodsid', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'pricemove', '升贴水', '0', 60, 1, 1, '', '', 'pricemove', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'pricetype', '定价类型', '0', 60, 1, 1, '', '', 'pricetype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'qty', '合同量', '0', 70, 1, 1, '', '', 'qty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'currencyname', '结算币种', '0', 70, 1, 1, '', '', 'currencyname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'unpricedqty', '未定价量', '0', 80, 1, 1, '', '', 'unpricedqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'pricedavg', '均价', '0', 80, 1, 1, '', '', 'pricedavg', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'pricedqty', '已定价量', '0', 90, 1, 1, '', '', 'pricedqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'pricemove', '升贴水', '0', 90, 1, 1, '', '', 'pricemove', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'unsureqty', '未交收量', '0', 100, 1, 1, '', '', 'unsureqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'qty', '合同量', '0', 100, 1, 1, '', '', 'qty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'payamount', '已收款额', '0', 110, 1, 1, '', '', 'payamount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'pricedamount', '金额', '0', 110, 1, 1, '', '', 'pricedamount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'unpayamount', '待收款额', '0', 120, 1, 1, '', '', 'unpayAmount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'unpricedqty', '未定价量', '0', 120, 1, 1, '', '', 'unpricedqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'invoiceamount', '已开票额', '0', 130, 1, 1, '', '', 'invoiceamount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'pricedqty', '已定价量', '0', 130, 1, 1, '', '', 'pricedqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'daikaiamount', '应开票额', '0', 140, 1, 1, '', '', 'daikaiamount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'goodsname', '点价合约', '0', 140, 1, 1, '', '', 'goodsname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'startdate,enddate', '点价期', '200', 160, 1, 1, '', '', 'startdate,enddate', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'deliverystartdate,deliveryenddate', '交收期', '200', 150, 1, 1, '', '', 'deliverystartdate,deliveryenddate', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'startdate,enddate', '点价期', '0', 150, 1, 1, '', '', 'startdate,enddate', 0, 0, '');
 
 -- 销售--履约交收
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_sales_settle', 2, '销售_履约交收', '', 'web端-销售-履约交收');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'nickname', '采购方', '200', 10, 1, 1, '', '', 'nickname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'contractno', '合同编号 ', '0', 10, 1, 1, '', '', 'contractno', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'nickname', '采购方', '0', 20, 1, 1, '', '', 'nickname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'contractno', '合同编号', '0', 20, 1, 1, '', '', 'contractno', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'wrstandardname', '商品', '0', 30, 1, 1, '', '', 'wrstandardname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'deliverygoodsname', '现货品种', '0', 30, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'biztype', '业务类型', '0', 40, 1, 1, '', '', 'biztype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'wrstandardname', '商品', '200', 40, 1, 1, '', '', 'wrstandardname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'goodsid', '点价类型', '0', 50, 1, 1, '', '', 'goodsid', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'qty', '合同量', '0', 50, 1, 1, '', '', 'qty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'pricetype', '定价类型', '0', 60, 1, 1, '', '', 'pricetype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'unpricedqty', '未定价量', '0', 60, 1, 1, '', '', 'unpricedqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'currencyname', '结算币种', '0', 70, 1, 1, '', '', 'currencyname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'pricedqty', '已定价量', '0', 70, 1, 1, '', '', 'pricedqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'price', '价格', '0', 80, 1, 1, '', '', 'price', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'unsureqty', '未交收量', '0', 80, 1, 1, '', '', 'unsureqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'qty', '合同量', '0', 90, 1, 1, '', '', 'qty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'payamount', '已收款额', '0', 90, 1, 1, '', '', 'payamount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'pricedamount', '金额', '0', 100, 1, 1, '', '', 'pricedamount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'unpayamount', '待收款额', '0', 100, 1, 1, '', '', 'unpayAmount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'margin', '保证金', '0', 110, 1, 1, '', '', 'margin', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'invoiceamount', '已开票额', '0', 110, 1, 1, '', '', 'invoiceamount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'pricedqty', '已定价量', '0', 120, 1, 1, '', '', 'pricedqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'daikaiamount', '应开票额', '0', 120, 1, 1, '', '', 'daikaiamount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'reckonrealqty', '已交收量', '0', 130, 1, 1, '', '', 'reckonrealqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'startdate,enddate', '点价期', '200', 140, 1, 1, '', '', 'startdate,enddate', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'orireckonrealqty', '应交收量', '0', 140, 1, 1, '', '', 'orireckonrealqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'deliverystartdate,deliveryenddate', '交收期 ', '200', 130, 1, 1, '', '', 'deliverystartdate,deliveryenddate', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'payamount', '已付款额', '0', 160, 1, 1, '', '', 'payamount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'goodsname', '点价合约', '0', 160, 1, 1, '', '', 'goodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'unpayamount', '应付款额', '0', 170, 1, 1, '', '', 'unpayamount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'pricemove', '升贴水 ', '0', 170, 1, 1, '', '', 'pricemove', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'invoiceamount', '已收票额', '0', 180, 1, 1, '', '', 'invoiceamount', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'daikaiamount', '应收票额', '0', 190, 1, 1, '', '', 'daikaiAmount', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_settle', 'deliverystartdate,deliveryenddate', '交收期 ', '200', 200, 1, 1, '', '', 'deliverystartdate,deliveryenddate', 0, 0, '');
 
 -- 销售--全部
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_sales_all', 2, '销售_全部', '', 'web端-销售-全部');
@@ -410,80 +399,82 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_all', 'deliverystartda
 -- 敞口--实时敞口
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_exposure', 2, '实时敞口', '', 'web端-实时敞口');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'MiddleGoodsName', '套保品种/代码', '0', 10, 1, 1, '', '', 'MiddleGoodsName', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'MiddleGoodsName', '套保品种', '0', 10, 1, 1, '', '', 'MiddleGoodsName', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'TotalSpotQty', '现货总量', '0', 30, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'TotalSpotQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'enumdicname', '单位', '0', 20, 1, 1, '', '', 'enumdicname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffSpotQty', '现货总量变动量', '150', 40, 1, 1, '', '', 'DiffSpotQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'TotalExposure', '总敞口', '0', 30, 1, 1, '', '', 'TotalExposure', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'hedgeqty', '套保量', '0', 50, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'hedgeqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffQty', '总敞口变动量', '150', 40, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffQty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'arbitrageqty', '套利量', '0', 60, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'arbitrageqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'NeedHedgeExposoure', '套保敞口', '0', 50, 1, 1, '', '', 'NeedHedgeExposoure', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffHedgeQty', '套保变动量', '0', 70, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffHedgeQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffExposoureQty', '套保敞口变动量', '150', 60, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffExposoureQty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffArbitrageQty', '套利变动量', '0', 80, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffArbitrageQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'TotalNeedHedgeQty', '现货应套保总量', '150', 70, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'TotalNeedHedgeQty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'MiddleGoodsHedgeRatio', '套保比例', '0', 90, 1, 1, '', 'FromatterPercent', 'MiddleGoodsHedgeRatio', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffSpotHedgeQty', '现货应套保总量变动量', '200', 80, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffSpotHedgeQty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'needarbitrageratio', '套利比例', '0', 100, 1, 1, '', 'FromatterPercent', 'needarbitrageratio', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'TotalFutureQty', '期货总量', '0', 90, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'TotalFutureQty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'needhedgeqty', '应套保量', '0', 110, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'needhedgeqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffFutuQty', '期货总量变动量', '0', 100, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffFutuQty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'needarbitrageqty', '应套利量', '0', 120, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'needarbitrageqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'TotalSpotQty', '现货总量', '0', 110, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'TotalSpotQty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'TotalNeedHedgeQty', '现货应套保总量', '150', 130, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'TotalNeedHedgeQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffSpotQty', '现货总量变动量', '150', 120, 1, 1, '', '', 'DiffSpotQty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffSpotHedgeQty', '现货应套保总量变动量', '200', 140, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffSpotHedgeQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'hedgeqty', '套保量', '0', 130, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'hedgeqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'TotalFutureQty', '期货总量', '0', 150, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'TotalFutureQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffHedgeQty', '套保变动量', '0', 140, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffHedgeQty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffFutuQty', '期货总量变动量', '0', 160, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffFutuQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'MiddleGoodsHedgeRatio', '套保比例', '0', 150, 1, 1, '', 'FromatterPercent', 'MiddleGoodsHedgeRatio', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'NeedHedgeExposoure', '套保敞口', '0', 170, 1, 1, '', '', 'NeedHedgeExposoure', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'needhedgeqty', '应套保量', '0', 160, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'needhedgeqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffExposoureQty', '套保敞口变动量', '150', 180, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffExposoureQty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'arbitrageqty', '套利量', '0', 170, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'arbitrageqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'TotalExposure', '总敞口', '0', 190, 1, 1, '', '', 'TotalExposure', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffArbitrageQty', '套利变动量', '0', 180, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffArbitrageQty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffQty', '总敞口变动量', '150', 200, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'diffQty', 0, 0, '');
-
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'needarbitrageratio', '套利比例', '0', 190, 1, 1, '', 'FromatterPercent', 'needarbitrageratio', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'needarbitrageqty', '应套利量', '0', 200, 1, 1, '', 'FormatterUnit,ENUMDICNAME', 'needarbitrageqty', 0, 0, '');
 
 -- 实时敞口--现货明细
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_exposure_detail', 2, '实时敞口--现货明细', '', 'web端--实时敞口--现货明细');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'middlegoodsname', '套保品种/代码', '250', 10, 1, 1, '', '', 'middlegoodsname', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'createtime', '时间', '0', 20, 1, 1, '', '', 'createtime', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'relateNo', '合同（计划）编号 ', '0', 70, 1, 1, '', '', 'relateNo', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'contracttype', '类型', '0', 30, 1, 1, '', '', 'contracttype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'middlegoodsname', '套保品种', '250', 10, 1, 1, '', '', 'middlegoodsname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'wrstandardname', '现货商品', '0', 40, 1, 1, '', '', 'wrstandardname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'contracttype', '类型', '0', 30, 1, 1, '', '', 'contracttype', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'qty', '现货商品变动量', '0', 50, 1, 1, '', 'FormatterUnit,enumdicname', 'qty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'changeQty', '套保品种变动量', '0', 60, 1, 1, '', 'FormatterUnit,enumdicname', 'changeQty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'relateNo', '合同（计划）编号 ', '0', 70, 1, 1, '', '', 'relateNo', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'convertfactor', '折算系数', '0', 80, 1, 1, '', '', 'convertfactor', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'createtime', '时间', '0', 20, 1, 1, '', '', 'createtime', 0, 0, '');
 
 -- 实时敞口--期货明细
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_exposure_futures_detail', 2, '实时敞口--期货明细', '', 'web端--实时敞口--期货明细');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_futures_detail', 'goodsname', '期货合约/代码 ', '0', 10, 1, 1, '', '', 'goodsname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_futures_detail', 'ydqty', '昨日持仓', '0', 30, 1, 1, '', '', 'ydqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_futures_detail', 'curqty', '当前持仓', '0', 50, 1, 1, '', '', 'curqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_futures_detail', 'diffqty', '持仓变动量', '0', 40, 1, 1, '', '', 'diffqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_futures_detail', 'curqty', '当前持仓', '0', 50, 1, 1, '', '', 'curqty', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_futures_detail', 'diffhedgeqty', '套保品种变动量', '0', 60, 1, 1, '', '', 'diffhedgeqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_futures_detail', 'agreeunit', '合约单位', '0', 70, 1, 1, '', '', 'agreeunit', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_futures_detail', 'convertratio', '期货品种系数 ', '0', 80, 1, 1, '', '', 'convertratio', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_futures_detail', 'ydqty', '昨日持仓', '0', 30, 1, 1, '', '', 'ydqty', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_futures_detail', 'agreeunit', '合约单位', '0', 70, 1, 1, '', '', 'agreeunit', 0, 0, '');
+
 
 -- 敞口--现货头寸
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_exposure_spotposition', 2, '敞口--现货头寸', '', 'web端--敞口--现货头寸');
@@ -625,44 +616,42 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_report_fincial_month', 'coll
 -- 业务审核-点价
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_business_aduit_dj', 2, '业务审核-点价', '', 'web端-业务审核-点价');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'applystatus', '状态', '0', 10, 1, 1, '', '', 'contractstatus', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'contractno', '合同编号', '0', 10, 1, 1, '', '', 'contractno', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'contracttype', '合同类型', '0', 20, 1, 1, '', '', 'contracttype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'buyusernameOrsellusername', '对手方', '0', 30, 1, 1, '', '', 'buyusernameOrsellusername', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'contractno', '合同编号', '0', 40, 1, 1, '', '', 'contractno', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'goodsname', '商品', '0', 40, 1, 1, '', '', 'goodsname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'deliverygoodsname', '现货品种', '0', 50, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'pricetype', '点价类型', '0', 50, 1, 1, '', '', 'pricetype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'pricetype', '点价类型', '0', 60, 1, 1, '', '', 'pricetype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'goodsname', '点价合约', '0', 60, 1, 1, '', '', 'goodsname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'goodsname', '点价合约', '0', 70, 1, 1, '', '', 'goodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'pricedPrice', '点价价格', '0', 70, 1, 1, '', '', 'pricedPrice', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'pricedPrice', '点价价格', '0', 80, 1, 1, '', '', 'pricedPrice', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'pricemove', '升贴水', '0', 80, 1, 1, '', '', 'pricemove', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'pricemove', '升贴水', '0', 90, 1, 1, '', '', 'pricemove', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'pricedQty', '点价数量', '0', 90, 1, 1, '', '', 'applyname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'pricedQty', '点价数量', '0', 100, 1, 1, '', '', 'applyname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'amount', '点价金额', '0', 100, 1, 1, '', '', 'amount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'amount', '点价金额', '0', 110, 1, 1, '', '', 'amount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'applyname', '登记人', '0', 110, 1, 1, '', '', 'contractstatus', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'applytime', '登记时间', '0', 120, 1, 1, '', '', 'audittime', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'applyname', '登记人', '0', 130, 1, 1, '', '', 'contractstatus', 0, 0, '');
 
 -- 业务审核-点价-已审核
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_business_aduit_ydj', 2, '业务审核-点价', '', 'web端-业务审核-点价');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'applystatus', '状态', '0', 10, 1, 1, '', '', 'contractstatus', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'contracttype', '合同类型', '0', 20, 1, 1, '', '', 'contracttype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'contractno', '合同编号', '0', 20, 1, 1, '', '', 'contractno', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'buyusernameOrsellusername', '对手方', '0', 30, 1, 1, '', '', 'buyusernameOrsellusername', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'contracttype', '合同类型', '0', 30, 1, 1, '', '', 'contracttype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'contractno', '合同编号', '0', 40, 1, 1, '', '', 'contractno', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'buyusernameOrsellusername', '对手方', '0', 40, 1, 1, '', '', 'buyusernameOrsellusername', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'deliverygoodsname', '现货品种', '0', 50, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'goodsname', '商品', '0', 50, 1, 1, '', '', 'goodsname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'pricetype', '点价类型', '0', 60, 1, 1, '', '', 'pricetype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -676,55 +665,53 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'priced
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'amount', '点价金额', '0', 110, 1, 1, '', '', 'amount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'applytime', '登记时间', '0', 120, 1, 1, '', '', 'audittime', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'applyname', '登记人', '0', 120, 1, 1, '', '', 'contractstatus', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'applyname', '登记人', '0', 130, 1, 1, '', '', 'contractstatus', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'applytime', '登记时间', '0', 130, 1, 1, '', '', 'audittime', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'audittime', '审核时间', '0', 130, 1, 1, '', '', 'audittime', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'auditid', '审核人', '0', 140, 1, 1, '', '', 'auditid', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'auditid', '审核人', '0', 130, 1, 1, '', '', 'auditid', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'audittime', '审核时间', '0', 150, 1, 1, '', '', 'audittime', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'auditremark', '审核意见', '0', 130, 1, 1, '', '', 'auditremark', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', 'auditremark', '审核意见', '0', 160, 1, 1, '', '', 'auditremark', 0, 0, '');
 
 -- 业务审核-交收
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_business_aduit_js', 2, '业务审核-交收', '', 'web端-业务审核-交收');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'applystatus', '状态', '0', 10, 1, 1, '', '', 'applystatus', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'contractno', '合同编号', '0', 10, 1, 1, '', '', 'contractno', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'contracttype', '合同类型', '0', 20, 1, 1, '', '', 'contracttype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'buyusernameOrsellusername', '对手方', '0', 30, 1, 1, '', '', 'buyusernameOrsellusername', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'contractno', '合同编号', '0', 40, 1, 1, '', '', 'contractno', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'goodsname', '商品', '0', 40, 1, 1, '', '', 'goodsname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'deliverygoodsname', '现货品种', '0', 50, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'operateapplytype', '点价类型', '0', 50, 1, 1, '', '', 'operateapplytype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'operateapplytype', '点价类型', '0', 60, 1, 1, '', '', 'operateapplytype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'reckonrealqty', '交收量', '0', 60, 1, 1, '', '', 'reckonrealqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'reckonrealqty', '交收量', '0', 70, 1, 1, '', '', 'reckonrealqty', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'reckonotheramount', '其它费用', '0', 70, 1, 1, '', '', 'reckonotheramount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'reckonotheramount', '其它费用', '0', 80, 1, 1, '', '', 'reckonotheramount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'addmargin||decmargin', '调整保证金', '0', 80, 1, 1, '', '', 'addmargin||decmargin', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'addmargin||decmargin', '调整保证金', '0', 90, 1, 1, '', '', 'addmargin||decmargin', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'reckonadjustamount', '调整金额', '0', 90, 1, 1, '', '', 'reckonadjustamount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'reckonadjustamount', '调整金额', '0', 100, 1, 1, '', '', 'reckonadjustamount', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'applyname', '登记人', '0', 100, 1, 1, '', '', 'auditname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'applytime', '登记时间', '0', 110, 1, 1, '', '', 'audittime', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'applyname', '登记人', '0', 120, 1, 1, '', '', 'auditname', 0, 0, '');
 
 -- 业务审核-交收-已审核
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_business_aduit_yjs', 2, '业务审核-交收', '', 'web端-业务审核-交收');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'applystatus', '状态', '0', 10, 1, 1, '', '', 'applystatus', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'contractno', '合同编号', '0', 40, 1, 1, '', '', 'contractno', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'contracttype', '合同类型', '0', 20, 1, 1, '', '', 'contracttype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'buyusernameOrsellusername', '对手方', '0', 30, 1, 1, '', '', 'buyusernameOrsellusername', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'contractno', '合同编号', '0', 40, 1, 1, '', '', 'contractno', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'deliverygoodsname', '现货品种', '0', 50, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'goodsname', '商品', '0', 40, 1, 1, '', '', 'goodsname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'operateapplytype', '点价类型', '0', 60, 1, 1, '', '', 'operateapplytype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -736,17 +723,16 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'addmar
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'reckonadjustamount', '调整金额', '0', 100, 1, 1, '', '', 'reckonadjustamount', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'applytime', '登记时间', '0', 110, 1, 1, '', '', 'audittime', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'applyname', '登记人', '0', 120, 1, 1, '', '', 'auditname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'audittime', '审核时间', '0', 130, 1, 1, '', '', 'audittime', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'applytime', '登记时间', '0', 110, 1, 1, '', '', 'audittime', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'auditid', '审核人', '0', 130, 1, 1, '', '', 'auditid', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'audittime', '审核时间', '0', 130, 1, 1, '', '', 'audittime', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'auditremark', '审核意见', '0', 130, 1, 1, '', '', 'auditremark', 0, 0, '');
 
-
 -- 财务审核-发票
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_fincial_aduit_fp', 2, '业务审核-发票', '', 'web端-业务审核-发票');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -1061,22 +1047,17 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_stock_manage_applylog', 'use
 -- 业务 - 计划 -
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedging_plan', 2, '业务-套保计划', '', 'web端-业务-套保计划');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'hedgeplanstatus', '状态', '0', 10, 1, 1, '', '', 'hedgeplanstatus', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'hedgeplanno', '计划名称', '0', 10, 1, 1, '', '', 'hedgeplanno', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'hedgeplanno', '计划名称', '0', 20, 1, 1, '', '', 'hedgeplanno', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'wrstandardname', '商品', '0', 20, 1, 1, '', '', 'wrstandardname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'contracttype', '类型', '0', 30, 1, 1, '', '', 'contracttype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'deliverygoodsname', '现货品种', '0', 40, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'currencyname', '结算币种', '0', 40, 1, 1, '', '', 'currencyname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'wrstandardname', '商品', '0', 50, 1, 1, '', '', 'wrstandardname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'planqty', '计划量', '0', 50, 1, 1, '', '', 'planqty', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'planqty', '计划量', '0', 70, 1, 1, '', '', 'planqty', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'tradeusername', '交易用户', '0', 80, 1, 1, '', '', 'tradeusername', 0, 0, '');
-insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'remark', '备注', '0', 100, 1, 1, '', '', 'remark', 0, 0, '');
-
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'hedgeplanstatus', '状态', '0', 60, 1, 1, '', '', 'hedgeplanstatus', 0, 0, '');
 
 -- 查询-库存查询-当前库存
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_current_inventory', 2, '库存查询-当前库存', '', 'web端-库存查询-当前库存');