luanhui 7 years ago
parent
commit
5f3b585656
2 changed files with 7 additions and 1 deletions
  1. +2
    -0
      B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/SelectOrderDialog.cs
  2. +5
    -1
      B3_DongFangWanQi/BL/ProductionNotificationBL_/ProductionNotificationBL.cs

+ 2
- 0
B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/SelectOrderDialog.cs View File

@ -74,6 +74,8 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Bills.ProductionNotification_
dom.Where.Conditions.Add(DQCondition.EQ(flowdetail, "DepartmentWorkFlowStateCategory_ID", long.Parse(_liuchengfenlei.Value)));
}
// dom.Where.Conditions.Add(DQCondition.NotInSubQuery(DQExpression.Field(bill)));
dom.OrderBy.Expressions.Add(DQOrderByExpression.Create(bill, "LoadTime"));
dom.OrderBy.Expressions.Add(DQOrderByExpression.Create(bill, "ID"));
return dom;


+ 5
- 1
B3_DongFangWanQi/BL/ProductionNotificationBL_/ProductionNotificationBL.cs View File

@ -55,7 +55,7 @@ namespace B3_DongFangWanQi.BL
public void LoadDetailsByOrders(ProductionNotification dmo,IList<ProductionNotification_Detail> resultDetails)
{
dmo.Details.Clear();
// dmo.Details.Clear();
var orderbl = BIFactory.Create<IOrderBL>(Session);
foreach (ProductionNotification_Detail detail in resultDetails)
@ -63,6 +63,10 @@ namespace B3_DongFangWanQi.BL
var order = orderbl.Load(detail.Order_ID);
foreach (Order_Detail orderDetail in order.Details)
{
if (dmo.Details.Any(x => x.Order_ID == order.ID && x.OrderDetail_ID == orderDetail.ID))
{
continue;
}
var dmodetail = new ProductionNotification_Detail();
dmodetail.Order_ID = order.ID;
dmodetail.OrderDetail_ID = orderDetail.ID;


Loading…
Cancel
Save