Kenric Nugteren 2 лет назад
Родитель
Сommit
140004d8b1

+ 1 - 1
prs.desktop/Panels/DeliveryItems/ReadyToGoGrid.cs

@@ -196,7 +196,7 @@ namespace PRSDesktop
             Action<CoreTable?, Exception?> action)
         {
             var filter = new Filter<DeliveryItem>(x => x.DeliveredDate).IsEqualTo(DateTime.MinValue)
-                .And(x => x.ManufacturingPacketLink.Completed).IsGreaterThan(DateTime.MinValue.AddDays(1));
+                .And(x => x.ManufacturingPacketLink.Completed).IsNotEqualTo(DateTime.MinValue);
             if (ParentID != Guid.Empty)
                 filter = filter.And(x => x.JobLink.ID).IsEqualTo(ParentID);
             if (!string.IsNullOrEmpty(Search))

+ 2 - 2
prs.desktop/Panels/Factory/FactoryPanel.xaml.cs

@@ -2277,8 +2277,8 @@ namespace PRSDesktop
                             .Add(x => x.SectionID)
                             .Add(x => x.ManufacturingSectionLink.ID));
 
-                    var pktfilter = new Filter<ManufacturingPacket>(x => x.Completed).IsLessThan(DateTime.MinValue.AddDays(1))
-                        .And(x => x.Archived).IsLessThan(DateTime.MinValue.AddDays(1))
+                    var pktfilter = new Filter<ManufacturingPacket>(x => x.Completed).IsEqualTo(DateTime.MinValue)
+                        .And(x => x.Archived).IsEqualTo(DateTime.MinValue)
                         .And(x => x.OnHold).IsEqualTo(false)
                         .And(new Filter<ManufacturingPacket>(x => x.OrderItem).NotLinkValid().Or(x => x.OrderItem.ReceivedDate)
                             .IsNotEqualTo(DateTime.MinValue))

+ 3 - 3
prs.desktop/Panels/Manufacturing/ManufacturingAllocationPanel.xaml.cs

@@ -273,9 +273,9 @@ namespace PRSDesktop
                     );
                     //Stages = stagetable.Rows.Select(x => x.ToObject<ManufacturingPacketStage>()).ToArray();
 
-                    //Filter<ManufacturingPacket> filter = new Filter<ManufacturingPacket>(x => x.Completed).IsLessThan(DateTime.MinValue.AddDays(1)).And(x => x.Archived).IsLessThan(DateTime.MinValue.AddDays(1)).And(x => x.OnHold).IsEqualTo(false);
-                    var filter = new Filter<ManufacturingPacket>(x => x.Completed).IsLessThan(DateTime.MinValue.AddDays(1)).And(x => x.Archived)
-                        .IsLessThan(DateTime.MinValue.AddDays(1)).And(x => x.OnHold).IsEqualTo(false);
+                    var filter = new Filter<ManufacturingPacket>(x => x.Completed).IsEqualTo(DateTime.MinValue)
+                        .And(x => x.Archived).IsEqualTo(DateTime.MinValue)
+                        .And(x => x.OnHold).IsEqualTo(false);
 
                     var sectfilter = new Filter<ManufacturingPacket>(x => x.StageLink.SectionID).IsEqualTo(sectionid).Or(x => x.Distributed)
                         .IsEqualTo(true);