瀏覽代碼

Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/Configuration

li.shaoyi 4 年之前
父節點
當前提交
db38d72a77
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      ERMCP/PCWEB/TableSql/fxgl_v3_pcweb_table_define.sql

+ 2 - 2
ERMCP/PCWEB/TableSql/fxgl_v3_pcweb_table_define.sql

@@ -1464,7 +1464,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse_category_report',
 -- 报表 - 库存报表(仓库)
 -- 报表 - 库存报表(仓库)
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_warehouse_report', 2, '报表-库存报表', '', 'web端-报表-库存报表(仓库)');
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_warehouse_report', 2, '报表-库存报表', '', 'web端-报表-库存报表(仓库)');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse_report', 'warehousename', '仓库', '0', 10, 1, 1, '', '', 'warehousename', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse_report', 'warehousecode', '仓库', '0', 10, 1, 1, '', '', 'warehousecode', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse_report', 'deliverygoodsname', '现货品种', '0', 20, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_warehouse_report', 'deliverygoodsname', '现货品种', '0', 20, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
@@ -1843,7 +1843,7 @@ values (seq_TableColumnConfig.Nextval, 'table_pcweb_inventory_commodity_report_w
 -- 报表 - 库存报表 - 库存(仓库)报表 - 仓库明细
 -- 报表 - 库存报表 - 库存(仓库)报表 - 仓库明细
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_inventory_warehouse_report_warehouse_details', 2, '报表-库存(仓库)报表-仓库明细', '', 'web端-报表-库存(仓库)报表-仓库明细');
 insert into TableDefine (TableKey, TableType, TableName, TabelMenu, Remark) values ('table_pcweb_inventory_warehouse_report_warehouse_details', 2, '报表-库存(仓库)报表-仓库明细', '', 'web端-报表-库存(仓库)报表-仓库明细');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
-values (seq_TableColumnConfig.Nextval, 'table_pcweb_inventory_warehouse_report_warehouse_details', 'warehousename', '仓库', '0', 10, 1, 1, '', '', 'warehousename', 0, 0, '');
+values (seq_TableColumnConfig.Nextval, 'table_pcweb_inventory_warehouse_report_warehouse_details', 'warehousecode', '仓库', '0', 10, 1, 1, '', '', 'warehousecode', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_inventory_warehouse_report_warehouse_details', 'deliverygoodsname', '现货品种', '0', 20, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
 values (seq_TableColumnConfig.Nextval, 'table_pcweb_inventory_warehouse_report_warehouse_details', 'deliverygoodsname', '现货品种', '0', 20, 1, 1, '', '', 'deliverygoodsname', 0, 0, '');
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)
 insert into TableColumnConfig (AutoID, TableKey, ColumnField, ColumnTitle, ColumnWidth, OrderIndex, IsShow, AlignType, FormatterType, FormatterString, Remark, NeedSummary, SummaryType, GroupName)