diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Tools/CarLoadingBySendLinePage.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Tools/CarLoadingBySendLinePage.cs index 1824618..797d8ef 100644 --- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Tools/CarLoadingBySendLinePage.cs +++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Tools/CarLoadingBySendLinePage.cs @@ -275,8 +275,12 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Tools dom.Columns.Add(DQSelectColumn.Create(DQExpression.Snippet("''"), "业务员")); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Snippet("null"), "送货人员ID")); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Snippet("''"), "送货人员")); - dom.Columns.Add(DQSelectColumn.Create(DQExpression.Snippet("null"), "车辆ID")); - dom.Columns.Add(DQSelectColumn.Create(DQExpression.Snippet("''"), "车辆")); + dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(sendLine,"Car_ID"), "车辆ID")); + dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(sendLine, "Car_Name"), "车辆")); + dom.GroupBy.Expressions.Add(DQExpression.Field(sendLine, "Car_ID")); + dom.GroupBy.Expressions.Add(DQExpression.Field(sendLine, "Car_Name")); + // dom.Columns.Add(DQSelectColumn.Create(DQExpression.Snippet("null"), "车辆ID")); + // dom.Columns.Add(DQSelectColumn.Create(DQExpression.Snippet("''"), "车辆")); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Snippet("''"), "Remark")); dom.Where.Conditions.Add(DQCondition.EQ("BillState", 单据状态.未审核)); dom.Where.Conditions.Add(DQCondition.EQ("TakeGoods_Type", 配送方式.公司配送)); diff --git a/B3QingDaoWanFu/B3QingDaoWanFu.csproj b/B3QingDaoWanFu/B3QingDaoWanFu.csproj index 8b8118a..f63a1d9 100644 --- a/B3QingDaoWanFu/B3QingDaoWanFu.csproj +++ b/B3QingDaoWanFu/B3QingDaoWanFu.csproj @@ -135,6 +135,7 @@ + diff --git a/B3QingDaoWanFu/BLActions/SaleOutStoreBLActions.cs b/B3QingDaoWanFu/BLActions/SaleOutStoreBLActions.cs new file mode 100644 index 0000000..419a523 --- /dev/null +++ b/B3QingDaoWanFu/BLActions/SaleOutStoreBLActions.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using BWP.B3Sale.BL; +using BWP.B3Sale.BO; +using Forks.EnterpriseServices.BusinessInterfaces; +using TSingSoft.WebPluginFramework.BIPlugins.BLEvents; + +namespace BWP.B3QingDaoWanFu.BLActions +{ + //class SaleOutStoreCheckNullifyBLActions : IBLMethodAction + //{ + + // public void Execute(IDmoContext context, object dmo, object parameter) + // { + // var bl = BIFactory.Create(context.Session); + // var outstore = dmo as SaleOutStore; + // if (outstore.Details.Count == 0) + // { + // bl.UnCheck(outstore); + // bl.Nullify(outstore); + // } + // } + + // public string Name + // { + // get { return "B3QingDaoWanFu.销售出库审核作废没有明细的单据"; } + // } + // public string Description + // { + // get { return "销售出库审核作废没有明细的单据"; } + // } + // public IList Features + // { + // get { return new List(); } + // } + //} +}