update

ERMCP/PCWEB/Menu_v6/pcweb_menu_qyfg.json

@@ -1051,9 +1051,9 @@
             },
             {
                 "title": "套期项目关联",
-                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_relation",
-                "code": "hedgeditem_relation",
-                "path": "hedgeditem_relation",
+                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot",
+                "code": "hedgeditem_spot",
+                "path": "hedgeditem_spot",
                 "component": "Main",
                 "sort": 4,
                 "isshow": true,
@@ -1062,10 +1062,10 @@
                 "children": [
                     {
                         "title": "未关联采购合同",
-                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_relation_purchase",
-                        "code": "hedgeditem_relation_purchase",
-                        "path": "hedgeditem_relation_purchase",
-                        "component": "views/hedgeditem/relation/contract/index.vue",
+                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_purchase",
+                        "code": "hedgeditem_spot_purchase",
+                        "path": "hedgeditem_spot_purchase",
+                        "component": "views/hedgeditem/spot/contract/index.vue",
                         "sort": 1,
                         "isshow": true,
                         "url": "",
@@ -1073,7 +1073,7 @@
                         "auth": [
                             {
                                 "label": "关联项目",
-                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_relation_purchase_bind",
+                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_purchase_bind",
                                 "code": "bind",
                                 "isshow": true,
                                 "remark": ""
@@ -1089,10 +1089,10 @@
                     },
                     {
                         "title": "未关联销售合同",
-                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_relation_sell",
-                        "code": "hedgeditem_relation_sell",
-                        "path": "hedgeditem_relation_sell",
-                        "component": "views/hedgeditem/relation/contract/index.vue",
+                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_sell",
+                        "code": "hedgeditem_spot_sell",
+                        "path": "hedgeditem_spot_sell",
+                        "component": "views/hedgeditem/spot/contract/index.vue",
                         "sort": 2,
                         "isshow": true,
                         "url": "",
@@ -1100,7 +1100,7 @@
                         "auth": [
                             {
                                 "label": "关联项目",
-                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_relation_sell_bind",
+                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_sell_bind",
                                 "code": "bind",
                                 "isshow": true,
                                 "remark": ""
@@ -1116,10 +1116,10 @@
                     },
                     {
                         "title": "未关联购销计划",
-                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_relation_plan",
-                        "code": "hedgeditem_relation_plan",
-                        "path": "hedgeditem_relation_plan",
-                        "component": "views/hedgeditem/relation/plan/index.vue",
+                        "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_plan",
+                        "code": "hedgeditem_spot_plan",
+                        "path": "hedgeditem_spot_plan",
+                        "component": "views/hedgeditem/spot/plan/index.vue",
                         "sort": 3,
                         "isshow": true,
                         "url": "",
@@ -1127,7 +1127,7 @@
                         "auth": [
                             {
                                 "label": "关联项目",
-                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_relation_plan_bind",
+                                "rulekey": "client_pc_web_qiyefengguan_hedgeditem_spot_plan_bind",
                                 "code": "bind",
                                 "isshow": true,
                                 "remark": ""
@@ -3694,7 +3694,7 @@
         "path": "/platinum_signing",
         "component": "Layout",
         "sort": 100,
-        "isshow": true,
+        "isshow": false,
         "children": [
             {
                 "title": "签单设置",

ERMCP/PCWEB/TableSql/fxgl_v3_pcweb_table_define.sql

@@ -2925,7 +2925,7 @@ 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_exposure', 'undefined', '套期商品', '0', 10, 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', 'undefined', '单位', '0', 20, 1, 1, '', '', 'undefined', 0, 0, '');
+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, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -2958,7 +2958,7 @@ 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_exposure_position_details', 'undefined', '套期工具', '0', 10, 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', 20, 1, 1, '', '', 'undefined', 0, 0, '');
+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, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -2981,7 +2981,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_spot_det
 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, '');
 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', 40, 1, 1, '', '', 'undefined', 0, 0, '');
+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, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -3000,7 +3000,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_plan_det
 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, '');
 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', 40, 1, 1, '', '', 'undefined', 0, 0, '');
+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, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -3019,7 +3019,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_futures_
 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, '');
 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', 30, 1, 1, '', '', 'undefined', 0, 0, '');
+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, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -3038,9 +3038,9 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_exposure_futures_
 -- 套期 -- 套期交易 -- 执行中 --
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_trade_running', 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_trade_running', 'undefined', '项目编号', '0', 10, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_trade_running', '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_trade_running', 'undefined', '套期类型', '0', 20, 1, 1, '', '', 'undefined', 0, 0, '');
+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)
@@ -3258,26 +3258,71 @@ 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', 'futurehedgeqty', '已关联数量', '0', 60, 1, 1, '', '', 'futurehedgeqty', 0, 0, '');
 
+-- 套期 -- 套期交易 -- 未关联采购/销售合同 --
+insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_spot_contract', 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_spot_contract', '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_hedgeditem_spot_contract', '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_hedgeditem_spot_contract', 'customername', '对手方', '0', 30, 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_hedgeditem_spot_contract', '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_spot_contract', 'qty', '合同数量', '0', 50, 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_hedgeditem_spot_contract', '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_hedgeditem_spot_contract', 'goodsname', '点价商品', '0', 70, 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_hedgeditem_spot_contract', 'goodscode', '点价合约', '0', 80, 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_spot_contract', 'unpricedqty', '未定价量', '0', 90, 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_hedgeditem_spot_contract', 'pricedqty', '已定价量', '0', 100, 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_hedgeditem_spot_contract', 'avgprice', '定价均价', '0', 110, 1, 1, '', '', 'avgprice', 0, 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_contract', 'spotavgprice', '现货均价', '0', 120, 1, 1, '', '', 'spotavgprice', 0, 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_contract', 'accountname', '套期主体', '0', 130, 1, 1, '', '', 'accountname', 0, 0, '');
 
 -- 套期 -- 套期交易 -- 合同关联项目 --
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_spot_contract_relation', 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_spot_contract_relation', 'undefined', '项目编号', '0', 10, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_contract_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_contract_relation', 'undefined', '项目名称', '0', 20, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_contract_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_contract_relation', 'undefined', '计划开始', '0', 30, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_contract_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_contract_relation', 'undefined', '计划结束', '0', 40, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_contract_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_contract_relation', 'undefined', '套期主体', '0', 50, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_contract_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_contract_relation', 'undefined', '套期类型', '0', 60, 1, 1, '', '', 'undefined', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_contract_relation', 'hedgedtype', '套期类型', '0', 60, 1, 1, '', '', 'hedgedtype', 0, 0, '');
+
+-- 套期 -- 套期交易 -- 未关联购销计划 --
+insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_spot_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_hedgeditem_spot_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_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, '');
+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, '');
+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, '');
+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, '');
 
 -- 套期 -- 套期交易 -- 计划关联项目 --
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_spot_plan_relation', 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_spot_plan_relation', 'undefined', '项目编号', '0', 10, 1, 1, '', '', 'undefined', 0, 0, '');
+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, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -3287,4 +3332,55 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedgeditem_spot_plan_relatio
 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, '');
 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', 'undefined', '套期类型', '0', 60, 1, 1, '', '', 'undefined', 0, 0, '');
+
+-- 统计报表 -- 套期项目报表 --
+insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_hedgeditem_report', 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_report', 'hedgeditemnum', '项目编号', '0', 20, 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_report', 'hedgedtype', '套期类型', '0', 30, 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_report', 'accountname', '套期主体', '0', 40, 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_report', 'wrstandardname', '现货商品', '0', 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_hedgeditem_report', 'enumdicname', '单位', '0', 60, 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_report', 'hedgeqty', '套期数量', '0', 70, 1, 1, '', '', '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_hedgeditem_report', 'oriavgprice', '期初价', '0', 80, 1, 1, '', '', 'oriavgprice', 0, 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_report', 'hedgeamount', '套期现货金额', '0', 90, 1, 1, '', '', 'hedgeamount', 0, 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_report', 'exeqty', '执行数量', '0', 100, 1, 1, '', '', 'exeqty', 0, 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_report', 'exeavgprice', '执行价', '0', 110, 1, 1, '', '', 'exeavgprice', 0, 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_report', 'exeamount', '执行现货金额', '0', 120, 1, 1, '', '', 'exeamount', 0, 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_report', 'futurehedgepl', '期货实际损益', '0', 130, 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_report', 'futurehedgeplchange', '期货实际变动', '0', 140, 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_report', 'futurepl', '期货套期损益', '0', 150, 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_report', 'futureplchange', '期货套期变动', '0', 160, 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_report', 'spothedgepl', '现货实际损益', '0', 170, 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_report', 'spothedgeplchange', '现货实际变动', '0', 180, 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_report', 'spotpl', '现货套期损益', '0', 190, 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_report', 'spotplchange', '现货套期变动', '0', 200, 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_report', 'unexeqty', '未执行现货量', '0', 210, 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_report', 'curprice', '当日现货市场价', '0', 220, 1, 1, '', '', 'curprice', 0, 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_report', 'planstartdate', '计划开始日期', '0', 230, 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_report', 'planenddate', '计划结束日期', '0', 240, 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_report', 'hedgeditemstatus', '状态', '0', 250, 1, 1, '', '', 'hedgeditemstatus', 0, 0, '');