diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/LogisticsAnalysisReport.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/LogisticsAnalysisReport.cs index d76a367..e2635ae 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/LogisticsAnalysisReport.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/LogisticsAnalysisReport.cs @@ -48,7 +48,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports list.Add(new Tuple("Driver_Name", "司机姓名")); list.Add(new Tuple("Driver_Telephone", "司机电话")); list.Add(new Tuple("HandcarNumber", "车牌号")); - //list.Add(new Tuple("Carrier_Name", "货站名称"));//承运方(还没有添加) + list.Add(new Tuple("Carrier_Name", "货站名称"));//承运方(还没有添加) list.Add(new Tuple("LinkManTel", "货站电话"));//电话 list.Add(new Tuple("CustomerSaleZone_Name", "地区"));//销售地区 list.Add(new Tuple("Car_Name", "车主姓名")); @@ -83,7 +83,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports config.Add("AccountingUnit_ID"); config.Add("Driver_ID"); config.Add("HandcarNumber"); ; - //config.Add("Carrier_ID"); + config.Add("Carrier_ID"); config.Add("CustomerSaleZone_ID"); config.Add("Customer_ID"); config.Add("AccountCustomer_ID"); diff --git a/BWP.B3_YunKen.Web/PluginClass.cs b/BWP.B3_YunKen.Web/PluginClass.cs index 48e7152..905851f 100644 --- a/BWP.B3_YunKen.Web/PluginClass.cs +++ b/BWP.B3_YunKen.Web/PluginClass.cs @@ -23,7 +23,7 @@ namespace BWP.B3_YunKen.Web GlobalFlags.On(B3SaleConsts.Flags.DriverNameAllowSame); GlobalFlags.On(B3UnitedInfosConsts.GlobalFlags.库存支持品牌项); - GlobalFlags.On(B3UnitedInfosConsts.GlobalFlags.产品线增加字段上级产品线); + //GlobalFlags.On(B3UnitedInfosConsts.GlobalFlags.产品线增加字段上级产品线); WpfPageFactory.RegisterPageOverlay(typeof(OrderEdit).FullName, typeof(OrderEdit_Ext).FullName); WpfPageFactory.RegisterPageOverlay(typeof(SaleOutStoreEdit).FullName, typeof(SaleOutStoreEdit_Ext).FullName); WpfPageFactory.RegisterPageOverlay(typeof(SaleForecastEdit).FullName, typeof(SaleForecastEdit_Ext).FullName);