Browse Source

.

master^2
yibo 7 years ago
parent
commit
d58948949d
3 changed files with 6 additions and 3 deletions
  1. +1
    -0
      B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/OrderEdit_Ext.cs
  2. +4
    -3
      B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/SaleOutStoreList_Ext.cs
  3. +1
    -0
      B3QingDaoWanFu/TypeIOCs/SaleOrderBLTypeIoc.cs

+ 1
- 0
B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/OrderEdit_Ext.cs View File

@ -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
{


+ 4
- 3
B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Overlays/SaleOutStoreList_Ext.cs View File

@ -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;
}


+ 1
- 0
B3QingDaoWanFu/TypeIOCs/SaleOrderBLTypeIoc.cs View File

@ -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
{


Loading…
Cancel
Save