diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/SelectOrderDialog.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/SelectOrderDialog.cs index 1a7a61a..06b1188 100644 --- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/SelectOrderDialog.cs +++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/ProductionNotification_/SelectOrderDialog.cs @@ -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; diff --git a/B3_DongFangWanQi/BL/ProductionNotificationBL_/ProductionNotificationBL.cs b/B3_DongFangWanQi/BL/ProductionNotificationBL_/ProductionNotificationBL.cs index ea4501a..eed4669 100644 --- a/B3_DongFangWanQi/BL/ProductionNotificationBL_/ProductionNotificationBL.cs +++ b/B3_DongFangWanQi/BL/ProductionNotificationBL_/ProductionNotificationBL.cs @@ -55,7 +55,7 @@ namespace B3_DongFangWanQi.BL public void LoadDetailsByOrders(ProductionNotification dmo,IList resultDetails) { - dmo.Details.Clear(); + // dmo.Details.Clear(); var orderbl = BIFactory.Create(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;