webpc菜单6期改版

ERMCP/PCWEB/TableSql/fxgl_v3_pcweb_table_define.sql

@@ -27,8 +27,6 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'wrstandardname',
 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, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'convertfactor', '标仓系数', '120', 90, 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_delivery', 'pricetype', '定价类型', '120', 100, 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', 'goodsname', '点价合约', '120', 110, 1, 1, '', '', 'goodscode', 0, 0, '');
@@ -53,6 +51,96 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_delivery', 'tradeusername',
 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, '');
 
+-- 合同待审核
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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端-现货合同');
+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', 'contracctstatus', '状态', '120', 10, 1, 1, '', '', 'contracctstatus', 0, 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', 'contractno', '合同编号', '250', 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_delivery_ysh', 'contracttype', '类型', '120', 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_delivery_ysh', 'negative', '对手方', '250', 40, 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_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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+
 -- 客户资料
 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)
@@ -78,6 +166,9 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'legalpersonname'
 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, '');
+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)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_userinfo', 'remark', '备注', '0', 140, 1, 1, '', '', 'remark', 0, 0, '');
@@ -133,8 +224,7 @@ insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, Colum
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_pointprice', 'deliverystartdate,deliveryenddate', '点价期', '200', 150, 1, 1, '', '', 'deliverystartdate,deliveryenddate', 0, 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', 'convertfactor', '标仓系数', '0', 170, 1, 1, '', '', 'convertfactor', 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)
@@ -166,8 +256,6 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_purchase_settle', 'deliverys
 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, '');
 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', 'convertfactor', '标仓系数 ', '0', 150, 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_purchase_settle', 'goodsname', '点价合约 ', '0', 160, 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_settle', 'pricemove', '升贴水 ', '0', 170, 1, 1, '', '', 'pricemove', 0, 0, '');
@@ -244,9 +332,8 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'daikaiam
 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, '');
 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', 'convertfactor', '标仓系数', '0', 170, 1, 1, '', '', 'convertfactor', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_pointprice', 'startdate,enddate', '交收期 ', '200', 160, 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)
@@ -326,7 +413,8 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_sales_all', 'convertfactor',
 -- 敞口--实时敞口
 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', 'MiddleGoodsCode', '代码', '0', 20, 1, 1, '', '', 'MiddleGoodsCode', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -371,33 +459,29 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure', 'DiffQty', '总
 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', 'deliverygoodscode', '代码', '0', 10, 1, 1, '', '', 'deliverygoodscode', 0, 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 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', 'deliverygoodsname', '现货品种', '0', 40, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_detail', 'deliverygoodsname', '现货商品', '0', 40, 1, 1, '', '', 'deliverygoodsname', 0, 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, '');
+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, '');
+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', 'convertratio', '套保系数 ', '0', 90, 1, 1, '', '', 'convertratio', 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, '');
+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', '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_exposure_futures_detail', 'createtime', '时间 ', '0', 20, 1, 1, '', '', 'createtime', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_exposure_futures_detail', 'createtime', '时间 ', '0', 20, 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_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)
@@ -577,6 +661,42 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_dj', 'applyti
 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, '');
+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, '');
+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, '');
+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, '');
+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)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_ydj', '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_business_aduit_ydj', 'pricedPrice', '点价价格', '0', 80, 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_ydj', '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_business_aduit_ydj', 'pricedQty', '点价数量', '0', 100, 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_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, '');
+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, '');
+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, '');
+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, '');
+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, '');
+--?
+
 -- 业务审核-交收
 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)
@@ -604,6 +724,39 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_js', 'applyti
 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', '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, '');
+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)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_business_aduit_yjs', 'reckonrealqty', '交收量', '0', 70, 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_yjs', 'reckonotheramount', '其它费用', '0', 80, 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_yjs', 'addmargin||decmargin', '调整保证金', '0', 90, 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_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, '');
+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', 'auditremark', '审核意见', '0', 130, 1, 1, '', '', 'auditremark', 0, 0, '');
+
 
 -- 财务审核-发票
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_fincial_aduit_fp', 2, '业务审核-发票', '', 'web端-业务审核-发票');
@@ -624,10 +777,43 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_fp', 'contract
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_fp', 'InvoiceAmount', '金额', '0', 80, 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_fincial_aduit_fp', 'attachurl', '发票附件', '0', 80, 1, 1, '', '', 'attachurl', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_fp', 'applytime', '登记时间', '0', 90, 1, 1, '', '', 'applytime', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_fp', 'applyname', '登记人', '0', 100, 1, 1, '', '', 'applyname', 0, 0, '');
 
+-- 财务审核-发票-已审核
+insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_fincial_aduit_yfp', 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_fincial_aduit_yfp', '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_fincial_aduit_yfp', '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_fincial_aduit_yfp', 'buyusernameOrsellusername', '对手方', '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_fincial_aduit_yfp', '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_fincial_aduit_yfp', 'deliverygoodsname', '现货品种', '0', 50, 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_fincial_aduit_yfp', 'operateapplytype', '点价类型', '0', 60, 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_fincial_aduit_yfp', 'contracttype', '发票类型', '0', 70, 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_fincial_aduit_yfp', 'InvoiceAmount', '金额', '0', 80, 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_fincial_aduit_yfp', 'attachurl', '发票附件', '0', 80, 1, 1, '', '', 'attachurl', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_yfp', 'applytime', '登记时间', '0', 90, 1, 1, '', '', 'applytime', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_yfp', 'applyname', '登记人', '0', 100, 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_fincial_aduit_yfp', '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_fincial_aduit_yfp', '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_fincial_aduit_yfp', 'auditremark', '审核意见', '0', 130, 1, 1, '', '', 'auditremark', 0, 0, '');
+
 -- 财务审核-款项
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_fincial_aduit_kx', 2, '财务审核-款项', '', 'web端-财务审核-款项');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -651,16 +837,45 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_kx', 'applytim
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_kx', 'applyname', '登记人', '0', 100, 1, 1, '', '', 'applyname', 0, 0, '');
 
+-- 财务审核-款项-已审核
+insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_fincial_aduit_ykx', 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_fincial_aduit_ykx', 'contractstatus', '状态', '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_fincial_aduit_ykx', '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_fincial_aduit_ykx', 'buyusernameOrsellusername', '对手方', '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_fincial_aduit_ykx', '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_fincial_aduit_ykx', 'deliverygoodsname', '现货品种', '0', 50, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_ykx', '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)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_ykx', 'kxtype', '款项类型', '0', 70, 1, 1, '', '', 'kxtype', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_ykx', 'payamount', '金额', '0', 80, 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_fincial_aduit_ykx', 'applytime', '登记时间', '0', 90, 1, 1, '', '', 'applytime', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_fincial_aduit_ykx', 'applyname', '登记人', '0', 100, 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_fincial_aduit_ykx', '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_fincial_aduit_ykx', '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_fincial_aduit_ykx', 'auditremark', '审核意见', '0', 130, 1, 1, '', '', 'auditremark', 0, 0, '');
+
 -- 库存审核 - 入库
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_stock_aduit_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_stock_aduit_in', '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_stock_aduit_in', 'inouttype', '入库类型', '0', 20, 1, 1, '', '', 'inouttype', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_stock_aduit_in', 'inouttype', '出入库类型', '0', 20, 1, 1, '', '', 'inouttype', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_stock_aduit_in', 'deliverygoodsname', '现货品种', '0', 30, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_stock_aduit_in', 'wrstandardname', '品类', '0', 40, 1, 1, '', '', 'wrstandardname', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_stock_aduit_in', '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_stock_aduit_in', 'brandname', '品牌', '0', 50, 1, 1, '', '', 'brandname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -678,6 +893,39 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_stock_aduit_in', 'applytime'
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_stock_aduit_in', 'applyname', '登记人', '0', 120, 1, 1, '', '', 'applyname', 0, 0, '');
 
+-- 库存审核 - 入库 - 已审核
+insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_stock_aduit_yin', 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_stock_aduit_yin', '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_stock_aduit_yin', 'inouttype', '出入库类型', '0', 20, 1, 1, '', '', 'inouttype', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_stock_aduit_yin', 'deliverygoodsname', '现货品种', '0', 30, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_stock_aduit_yin', '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_stock_aduit_yin', 'brandname', '品牌', '0', 50, 1, 1, '', '', 'brandname', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_stock_aduit_yin', 'warehousecode', '仓库', '0', 60, 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_stock_aduit_yin', 'contracttype', '合同类型', '0', 70, 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_stock_aduit_yin', 'buynicknameOrsellusername', '对手方', '0', 80, 1, 1, '', '', 'buynicknameOrsellusername', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_stock_aduit_yin', 'contractno', '合同编号', '0', 90, 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_stock_aduit_yin', 'pricetype', '点价类型', '0', 100, 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_stock_aduit_yin', 'applytime', '登记时间', '0', 110, 1, 1, '', '', 'applytime', 0, 0, '');
+insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_stock_aduit_yin', 'applyname', '登记人', '0', 120, 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_stock_aduit_yin', '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_stock_aduit_yin', '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_stock_aduit_yin', 'auditremark', '审核意见', '0', 130, 1, 1, '', '', 'auditremark', 0, 0, '');
+
 -- 库存审核-出库
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_stock_aduit_out', 2, '库存审核-出库', '', 'web端-库存审核-出库');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -834,8 +1082,6 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_hedging_plan', 'deliverygood
 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, '');
 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', 'convertfactor', '标仓系数', '0', 60, 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_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, '');
@@ -887,7 +1133,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_application_record', 'applyt
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_application_record', 'applyname', '登记人', '0', 100, 1, 1, '', '', 'hedgeplanstatus', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_application_record', 'audittime', '审核时间', '0', 110, 1, 1, '', '', 'hedgeplanstatus', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_application_record', 'userinfotype', '审核时间', '0', 110, 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_application_record', 'auditname', '审核人', '0', 120, 1, 1, '', '', 'hedgeplanstatus', 0, 0, '');