浏览代码

Added Filtering for StagingManufactingPacket Groups

frogsoftware 1 年之前
父节点
当前提交
756d66726e

+ 2 - 0
prs.desktop/Panels/Staging/Manufacturing/StagingManufacturingPacketList.xaml.cs

@@ -54,6 +54,8 @@ namespace PRSDesktop
                                     .Add(x => x.Location)
                                     .Add(x => x.ITP.ID)
                                     .Add(x => x.Job.ID)
+                                    .Add(x => x.Group.ID)
+                                    .Add(x => x.Group.Code)
                                     .Add(x => x.Template.ID)
                                     .Add(x => x.Template.Code)
                                     .Add(x => x.ManufacturingPacket.ID)));

+ 7 - 1
prs.desktop/Panels/Staging/Manufacturing/StagingManufacturingPacketListItem.xaml.cs

@@ -19,6 +19,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using FastReport.Data;
 
 namespace PRSDesktop
 {
@@ -186,10 +187,15 @@ namespace PRSDesktop
 
         private void TemplateButton_Click(object sender, RoutedEventArgs e)
         {
+            Dictionary<String, String>? group = null;
+            if (!String.IsNullOrWhiteSpace(Packet.Group.Code))
+                group = new Dictionary<string, string>() { { "Group.Code", Packet.Group.Code } };
+            
             var templates = new PopupList(
                 typeof(ManufacturingTemplate),
                 Guid.Empty,
-                new string[] { nameof(ManufacturingTemplate.Code) });
+                new string[] { nameof(ManufacturingTemplate.Code) },
+                group);
             if(templates.ShowDialog() == true)
             {
                 Packet.Template.ID = templates.ID;