li.shaoyi 3 tahun lalu
induk
melakukan
dd759995d1

+ 1 - 1
ERMCP/PCWEB/Menu_v6/pcweb_menu_qyfg.json

@@ -1620,7 +1620,7 @@
                                 "remark": ""
                             },
                             {
-                                "label": "关闭计划",
+                                "label": "关闭",
                                 "rulekey": "client_pc_web_qiyefengguan_plan_running_close",
                                 "code": "close",
                                 "isshow": true,

+ 73 - 77
ERMCP/PCWEB/TableSql/fxgl_v3_pcweb_table_define.sql

@@ -2923,117 +2923,115 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_financing_manage_reference_m
 -- 套期 -- 敞口监控
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_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_hedgeditem_exposure', 'undefined', '套期商品', '0', 10, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_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_hedgeditem_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_hedgeditem_exposure', 'undefined', '现货总量', '0', 30, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure', 'spotqty', '现货总量', '0', 30, 1, 1, '', '', 'spotqty', 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_hedgeditem_exposure', 'undefined', '被套期现货量', '0', 40, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure', 'hedgespotqty', '被套期现货量', '0', 40, 1, 1, '', '', 'hedgespotqty', 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_hedgeditem_exposure', 'undefined', '套期计划量', '0', 50, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure', 'hedgeplanqty', '套期计划量', '0', 50, 1, 1, '', '', 'hedgeplanqty', 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_hedgeditem_exposure', 'undefined', '期货套期量', '0', 60, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure', 'futureqty', '期货套期量', '0', 60, 1, 1, '', '', 'futureqty', 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_hedgeditem_exposure', 'undefined', '总敞口量', '0', 70, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure', 'totalexposure', '总敞口量', '0', 70, 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_hedgeditem_exposure', 'undefined', '总敞口变动量', '0', 80, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure', 'totalexposurechange', '总敞口变动量', '0', 80, 1, 1, '', '', 'totalexposurechange', 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_hedgeditem_exposure', 'undefined', '总期现比例', '0', 90, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure', 'spratio', '总期现比例', '0', 90, 1, 1, '', '', 'spratio', 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_hedgeditem_exposure', 'undefined', '套期敞口量', '0', 10, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure', 'hedgedtotalexposure', '套期敞口量', '0', 10, 1, 1, '', '', 'hedgedtotalexposure', 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_hedgeditem_exposure', 'undefined', '被套期敞口变动量', '0', 110, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure', 'hedgedtotalexposourechange', '被套期敞口变动量', '0', 110, 1, 1, '', '', 'hedgedtotalexposourechange', 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_hedgeditem_exposure', 'undefined', '套期期现比例', '0', 120, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure', 'hedgedspratio', '套期期现比例', '0', 120, 1, 1, '', '', 'hedgedspratio', 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_hedgeditem_exposure', 'undefined', '现货变动量', '0', 130, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure', 'spotqtychange', '现货变动量', '0', 130, 1, 1, '', '', 'spotqtychange', 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_hedgeditem_exposure', 'undefined', '计划变动量', '0', 140, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure', 'hedgeplanqtychange', '计划变动量', '0', 140, 1, 1, '', '', 'hedgeplanqtychange', 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_hedgeditem_exposure', 'undefined', '期货变动量', '0', 150, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure', 'futureqtychange', '期货变动量', '0', 150, 1, 1, '', '', 'futureqtychange', 0, 0, '');
 
 -- 套期 -- 敞口监控 -- 期货持仓明细
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_exposure_position_details', 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_hedgeditem_exposure_position_details', 'undefined', '套期工具', '0', 10, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_position_details', 'ordertype', '套期工具', '0', 10, 1, 1, '', '', 'ordertype', 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_hedgeditem_exposure_position_details', 'goodscode', '期货合约', '0', 20, 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_hedgeditem_exposure_position_details', 'undefined', '方向', '0', 30, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_position_details', 'curqty', '持仓数量', '0', 40, 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_hedgeditem_exposure_position_details', 'undefined', '持仓数量', '0', 40, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_position_details', 'ydqty', '期初持仓量', '0', 50, 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_hedgeditem_exposure_position_details', 'undefined', '期初持仓量', '0', 50, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_position_details', 'diffqty', '持仓变动量', '0', 60, 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_hedgeditem_exposure_position_details', 'undefined', '持仓变动量', '0', 60, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_position_details', 'middlegoodsname', '套期商品', '0', 70, 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_hedgeditem_exposure_position_details', 'undefined', '套期商品', '0', 70, 1, 1, '', '', 'undefined', 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_hedgeditem_exposure_position_details', 'undefined', '期货套期量', '0', 80, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_position_details', 'curhedgeqty', '期货套期量', '0', 80, 1, 1, '', '', 'curhedgeqty', 0, 0, '');
 
 -- 套期 -- 敞口监控 -- 现货变动明细
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_exposure_spot_details', 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_hedgeditem_exposure_spot_details', 'undefined', '日期时间', '0', 10, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_spot_details', 'tradedate', '日期时间', '0', 10, 1, 1, '', '', 'tradedate', 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_hedgeditem_exposure_spot_details', 'undefined', '执行类型', '0', 20, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_spot_details', 'exetype', '执行类型', '0', 20, 1, 1, '', '', 'exetype', 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_hedgeditem_exposure_spot_details', 'undefined', '对手方', '0', 30, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_spot_details', 'customerusername', '对手方', '0', 30, 1, 1, '', '', 'customerusername', 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_hedgeditem_exposure_spot_details', '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_hedgeditem_exposure_spot_details', 'undefined', '期间变化量', '0', 50, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_spot_details', 'logvalue', '期间变化量', '0', 50, 1, 1, '', '', 'logvalue', 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_hedgeditem_exposure_spot_details', 'undefined', '套期商品变化量', '0', 60, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_spot_details', 'middlegoodschange', '套期商品变化量', '0', 60, 1, 1, '', '', 'middlegoodschange', 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_hedgeditem_exposure_spot_details', 'undefined', '编号', '0', 70, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_spot_details', 'contractno', '编号', '0', 70, 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_hedgeditem_exposure_spot_details', 'undefined', '套期主体', '0', 80, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_spot_details', 'accountname', '套期主体', '0', 80, 1, 1, '', '', 'accountname', 0, 0, '');
 
 -- 套期 -- 敞口监控 -- 计划变动明细
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_exposure_plan_details', 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_hedgeditem_exposure_plan_details', 'undefined', '日期时间', '0', 10, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_plan_details', 'createtime', '日期时间', '0', 10, 1, 1, '', '', 'createtime', 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_hedgeditem_exposure_plan_details', 'undefined', '计划类型', '0', 20, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_plan_details', 'hedgedtype', '计划类型', '0', 20, 1, 1, '', '', 'hedgedtype', 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_hedgeditem_exposure_plan_details', 'undefined', '现货商品', '0', 30, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_plan_details', '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_hedgeditem_exposure_plan_details', 'enumdicname', '单位', '0', 40, 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_hedgeditem_exposure_plan_details', 'undefined', '未执行现货量', '0', 50, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_plan_details', 'unexeqty', '未执行现货量', '0', 50, 1, 1, '', '', 'unexeqty', 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_hedgeditem_exposure_plan_details', 'undefined', '期间变化量', '0', 60, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_plan_details', 'relatedqty', '期间变化量', '0', 60, 1, 1, '', '', 'relatedqty', 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_hedgeditem_exposure_plan_details', 'undefined', '套期商品变化量', '0', 70, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_plan_details', 'middlegoodschange', '套期商品变化量', '0', 70, 1, 1, '', '', 'middlegoodschange', 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_hedgeditem_exposure_plan_details', 'undefined', '编号', '0', 80, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_plan_details', 'hedgeplanno', '编号', '0', 80, 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_hedgeditem_exposure_plan_details', 'undefined', '套期主体', '0', 90, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_plan_details', 'accountname', '套期主体', '0', 90, 1, 1, '', '', 'accountname', 0, 0, '');
 
 -- 套期 -- 敞口监控 -- 期货变动明细
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_exposure_futures_details', 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_hedgeditem_exposure_futures_details', 'undefined', '日期时间', '0', 10, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_futures_details', 'createtime', '日期时间', '0', 10, 1, 1, '', '', 'createtime', 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_hedgeditem_exposure_futures_details', 'undefined', '套期工具', '0', 20, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_futures_details', 'ordertype', '套期工具', '0', 20, 1, 1, '', '', 'ordertype', 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_hedgeditem_exposure_futures_details', 'goodscode', '期货合约', '0', 30, 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_hedgeditem_exposure_futures_details', 'undefined', '方向', '0', 40, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_futures_details', 'buyorsell', '方向', '0', 40, 1, 1, '', '', 'buyorsell', 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_hedgeditem_exposure_futures_details', 'undefined', '价格', '0', 50, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_futures_details', 'tradeprice', '价格', '0', 50, 1, 1, '', '', 'tradeprice', 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_hedgeditem_exposure_futures_details', 'undefined', '数量', '0', 60, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_futures_details', 'relatedlot', '数量', '0', 60, 1, 1, '', '', 'relatedlot', 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_hedgeditem_exposure_futures_details', 'undefined', '金额', '0', 70, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_futures_details', 'amount', '金额', '0', 70, 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_hedgeditem_exposure_futures_details', 'undefined', '套期商品变化量', '0', 80, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_futures_details', 'convertratiochange', '套期商品变化量', '0', 80, 1, 1, '', '', 'convertratiochange', 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_hedgeditem_exposure_futures_details', 'undefined', '成交单号', '0', 90, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_futures_details', 'tradeid', '成交单号', '200', 90, 1, 1, '', '', 'tradeid', 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_hedgeditem_exposure_futures_details', 'undefined', '套期主体', '0', 100, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_futures_details', 'accountname', '套期主体', '0', 100, 1, 1, '', '', 'accountname', 0, 0, '');
 
 -- 套期 -- 套期交易 -- 执行中 --
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_trade_running', 2, '套期-套期交易', '', 'web端-套期-套期交易-执行中');
@@ -3042,41 +3040,39 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', '
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'hedgedtype', '套期类型', '0', 20, 1, 1, '', '', 'hedgedtype', 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_hedgeditem_trade_running', 'undefined', '套期主体', '0', 30, 1, 1, '', '', 'undefined', 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_hedgeditem_trade_running', 'undefined', '现货商品', '0', 40, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'accountname', '套期主体', '0', 30, 1, 1, '', '', 'accountname', 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_hedgeditem_trade_running', 'undefined', '未执行现货量', '0', 50, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', '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_hedgeditem_trade_running', 'undefined', '套期商品', '0', 60, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'unexeqty', '未执行现货量', '0', 50, 1, 1, '', '', 'unexeqty', 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_hedgeditem_trade_running', 'undefined', '未执行套期量', '0', 70, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'middlegoodsname', '套期商品', '0', 60, 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_hedgeditem_trade_running', 'undefined', '期货套期量', '0', 80, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'unexehedgeqty', '未执行套期量', '0', 70, 1, 1, '', '', 'unexehedgeqty', 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_hedgeditem_trade_running', 'undefined', '期现敞口量', '0', 90, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'futurehedgeqty', '期货套期量', '0', 80, 1, 1, '', '', 'futurehedgeqty', 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_hedgeditem_trade_running', 'undefined', '期货实际损益', '0', 10, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'hiexpsoure', '期现敞口量', '0', 90, 1, 1, '', '', 'hiexpsoure', 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_hedgeditem_trade_running', 'undefined', '期货实际变动', '0', 110, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'futurehedgepl', '期货实际损益', '0', 100, 1, 1, '', '', 'futurehedgepl', 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_hedgeditem_trade_running', 'undefined', '期货套期损益', '0', 120, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'futurehedgeplchange', '期货实际变动', '0', 110, 1, 1, '', '', 'futurehedgeplchange', 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_hedgeditem_trade_running', 'undefined', '期货套期变动', '0', 130, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'futurepl', '期货套期损益', '0', 120, 1, 1, '', '', 'futurepl', 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_hedgeditem_trade_running', 'undefined', '现货实际损益', '0', 140, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'futureplchange', '期货套期变动', '0', 130, 1, 1, '', '', 'futureplchange', 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_hedgeditem_trade_running', 'undefined', '现货实际变动', '0', 150, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'spothedgepl', '现货实际损益', '0', 140, 1, 1, '', '', 'spothedgepl', 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_hedgeditem_trade_running', 'undefined', '现货套期损益', '0', 160, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'spothedgeplchange', '现货实际变动', '0', 150, 1, 1, '', '', 'spothedgeplchange', 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_hedgeditem_trade_running', 'undefined', '现货套期变动', '0', 170, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'spotpl', '现货套期损益', '0', 160, 1, 1, '', '', 'spotpl', 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_hedgeditem_trade_running', 'undefined', '计划开始日期', '0', 180, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'spotplchange', '现货套期变动', '0', 170, 1, 1, '', '', 'spotplchange', 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_hedgeditem_trade_running', 'undefined', '计划结束日期', '0', 190, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'planstartdate', '计划开始日期', '0', 180, 1, 1, '', '', 'planstartdate', 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_hedgeditem_trade_running', 'undefined', '计划结束日期', '0', 200, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', 'planenddate', '计划结束日期', '0', 190, 1, 1, '', '', 'planenddate', 0, 0, '');
 
 -- 套期 -- 套期交易 -- 已完成 --
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_trade_finish', 2, '套期-套期交易', '', 'web端-套期-套期交易-已完成');
@@ -3202,7 +3198,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_futures_det
 -- 套期 -- 套期交易 -- 外部未成交单 --
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_futures_out', 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_hedgeditem_futures_out', 'index', '序号', '60', 10, 1, 1, '', '', 'index', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_futures_out', 'index', '序号', '80', 10, 1, 1, '', '', 'index', 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_hedgeditem_futures_out', 'undefined', '外部成交单号', '200', 20, 1, 1, '', '', 'undefined', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -3223,7 +3219,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_futures_out', 'un
 -- 套期 -- 套期交易 -- 内部未关联成交单 --
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_futures_in', 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_hedgeditem_futures_in', 'index', '序号', '60', 10, 1, 1, '', '', 'index', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_futures_in', 'index', '序号', '80', 10, 1, 1, '', '', 'index', 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_hedgeditem_futures_in', 'tradetime', '成交时间', '200', 20, 1, 1, '', '', 'tradetime', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -3252,9 +3248,9 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_futures_in_relati
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_futures_in_relation', '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_hedgeditem_futures_in_relation', 'undefined', '项目现货量', '0', 40, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_futures_in_relation', 'unexespotqty', '项目现货量', '0', 40, 1, 1, '', '', 'unexespotqty', 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_hedgeditem_futures_in_relation', 'undefined', '应套保数量', '0', 50, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_futures_in_relation', 'unexehedgeqty', '应套保数量', '0', 50, 1, 1, '', '', 'unexehedgeqty', 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_hedgeditem_futures_in_relation', 'futurehedgeqty', '已关联数量', '0', 60, 1, 1, '', '', 'futurehedgeqty', 0, 0, '');
 
@@ -3309,13 +3305,13 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_plan', 'hedg
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_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_hedgeditem_spot_plan', 'contracttype', '类型', '0', 30, 1, 1, '', '', 'contracttype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_plan', 'producttype', '类型', '0', 30, 1, 1, '', '', 'producttype', 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_hedgeditem_spot_plan', 'currencyname', '结算币种', '0', 40, 1, 1, '', '', 'currencyname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_plan', 'enumdicname', '结算币种', '0', 40, 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_hedgeditem_spot_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_hedgeditem_spot_plan', 'tradeusername', '交易用户', '0', 60, 1, 1, '', '', 'tradeusername', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_plan', 'accountname', '交易用户', '0', 60, 1, 1, '', '', 'accountname', 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_hedgeditem_spot_plan', 'hedgeplanstatus', '状态', '0', 70, 1, 1, '', '', 'hedgeplanstatus', 0, 0, '');
 
@@ -3324,15 +3320,15 @@ insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) valu
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_plan_relation', 'hedgeditemnum', '项目编号', '0', 10, 1, 1, '', '', 'hedgeditemnum', 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_hedgeditem_spot_plan_relation', 'undefined', '项目名称', '0', 20, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_plan_relation', 'hedgeditemname', '项目名称', '0', 20, 1, 1, '', '', 'hedgeditemname', 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_hedgeditem_spot_plan_relation', 'undefined', '计划开始', '0', 30, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_plan_relation', 'planstartdate', '计划开始', '0', 30, 1, 1, '', '', 'planstartdate', 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_hedgeditem_spot_plan_relation', 'undefined', '计划结束', '0', 40, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_plan_relation', 'planenddate', '计划结束', '0', 40, 1, 1, '', '', 'planenddate', 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_hedgeditem_spot_plan_relation', 'undefined', '套期主体', '0', 50, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_plan_relation', 'accountname', '套期主体', '0', 50, 1, 1, '', '', 'accountname', 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_hedgeditem_spot_plan_relation', 'undefined', '套期类型', '0', 60, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_plan_relation', 'hedgedtype', '套期类型', '0', 60, 1, 1, '', '', 'hedgedtype', 0, 0, '');
 
 -- 统计报表 -- 套期项目报表 --
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_report', 2, '统计报表-套期项目报表', '', 'web端-统计报表-套期项目报表');