From d58948949d2a49e94304e4549c3762ecf515dbe3 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Tue, 4 Dec 2018 20:35:54 +0800 Subject: [PATCH] . --- .../Pages/B3QingDaoWanFu/Overlays/OrderEdit_Ext.cs | 1 + .../Pages/B3QingDaoWanFu/Overlays/SaleOutStoreList_Ext.cs | 7 ++++--- B3QingDaoWanFu/TypeIOCs/SaleOrderBLTypeIoc.cs | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/OrderEdit_Ext.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/OrderEdit_Ext.cs index f7f8342..1242d42 100644 --- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/OrderEdit_Ext.cs +++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/OrderEdit_Ext.cs @@ -150,6 +150,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Overlays first.HiddenNumber = orderDetail.Number; first.HiddenSecondNumber = orderDetail.SecondNumber; first.IsOutsourcing = orderDetail.IsOutsourcing; + saleOut.Details.Add(first); } else { diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/SaleOutStoreList_Ext.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/SaleOutStoreList_Ext.cs index d60da1a..5a0b0cf 100644 --- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/SaleOutStoreList_Ext.cs +++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/SaleOutStoreList_Ext.cs @@ -15,15 +15,16 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Overlays protected override DQueryDom GetQueryDom() { var query = base.GetQueryDom(); - if (query.OrderBy.Expressions.Count == 0) - { + query.OrderBy.Expressions.Clear(); + //if (query.OrderBy.Expressions.Count == 0) + //{ var root = query.From.RootSource.Alias; var lineDetail = new JoinAlias("lineDetail", typeof(DeliverGoodsLine_Detail)); query.From.AddJoin(JoinType.Left, new DQDmoSource(lineDetail), DQCondition.And(DQCondition.EQ(root, "DeliverGoodsLine_ID", lineDetail, "DeliverGoodsLine_ID"), DQCondition.EQ(root, "Customer_ID", lineDetail, "Customer_ID"))); query.OrderBy.Expressions.Add(DQOrderByExpression.Create(root, "SequenceNumber")); query.OrderBy.Expressions.Add(DQOrderByExpression.Create(lineDetail, "SequenceNumber")); - } + //} return query; } diff --git a/B3QingDaoWanFu/TypeIOCs/SaleOrderBLTypeIoc.cs b/B3QingDaoWanFu/TypeIOCs/SaleOrderBLTypeIoc.cs index 92895a8..e8e3d6c 100644 --- a/B3QingDaoWanFu/TypeIOCs/SaleOrderBLTypeIoc.cs +++ b/B3QingDaoWanFu/TypeIOCs/SaleOrderBLTypeIoc.cs @@ -131,6 +131,7 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs outStoreDetail.HiddenNumber = orderDetail.Number; outStoreDetail.HiddenSecondNumber = orderDetail.SecondNumber; outStoreDetail.IsOutsourcing = orderDetail.IsOutsourcing; + saleOut.Details.Add(outStoreDetail); } else {