修改pdf

BlankApp1/BlankApp1/Pdf/InvoiceDocument.cs

@@ -68,7 +68,7 @@ namespace PLCTool.Pdf
                 column.Spacing(20);
                 column.Item().Row(row =>
                 {
-                    row.RelativeItem().Text($"测试方案名称:{Model.SchemeName}").FontFamily("simhei").Style(TextStyle.Default.FontSize(10));
+                    row.RelativeItem().Text($"项目名称:{Model.ProjectName}").FontFamily("simhei").Style(TextStyle.Default.FontSize(10));
                     row.ConstantItem(50);
                     row.RelativeItem().Text($"设备名称:{Model.DeviceName}").FontFamily("simhei").Style(TextStyle.Default.FontSize(10));
                 });
@@ -103,6 +103,7 @@ namespace PLCTool.Pdf
                     columns.RelativeColumn();
                     columns.RelativeColumn();
                     columns.RelativeColumn();
+                    columns.RelativeColumn();
                     columns.RelativeColumn(2);
                     columns.RelativeColumn();
                     columns.RelativeColumn();
@@ -115,17 +116,18 @@ namespace PLCTool.Pdf
 
                 table.Header(header =>
                 {
-                    header.Cell().Text("测试项名称").FontFamily("simhei").Style(TextStyle.Default.FontSize(10));
-                    header.Cell().Text("类型").FontFamily("simhei").Style(TextStyle.Default.FontSize(10));
-                    header.Cell().Text("测试项类型").FontFamily("simhei").Style(TextStyle.Default.FontSize(10));
-                    header.Cell().AlignCenter().Text("明细判定逻辑").FontFamily("simhei").Style(TextStyle.Default.FontSize(10));
-                    header.Cell().AlignCenter().Text("描述").FontFamily("simhei").Style(TextStyle.Default.FontSize(10));
-                    header.Cell().AlignCenter().Text("PLC地址").FontFamily("simhei").Style(TextStyle.Default.FontSize(10));
-                    header.Cell().AlignCenter().Text("PLC变量名").FontFamily("simhei").Style(TextStyle.Default.FontSize(10));
-                    header.Cell().AlignCenter().Text("判定值").FontFamily("simhei").Style(TextStyle.Default.FontSize(10));
-                    header.Cell().AlignCenter().Text("实际值").FontFamily("simhei").Style(TextStyle.Default.FontSize(10));
-                    header.Cell().AlignCenter().Text("结果").FontFamily("simhei").Style(TextStyle.Default.FontSize(10));
-                    header.Cell().AlignCenter().Text("测试时间").FontFamily("simhei").Style(TextStyle.Default.FontSize(10));
+                    header.Cell().Text("方案").FontFamily("simhei").Style(TextStyle.Default.FontSize(8));
+                    header.Cell().Text("测试项名称").FontFamily("simhei").Style(TextStyle.Default.FontSize(8));
+                    header.Cell().Text("类型").FontFamily("simhei").Style(TextStyle.Default.FontSize(8));
+                    header.Cell().Text("测试项类型").FontFamily("simhei").Style(TextStyle.Default.FontSize(8));
+                    header.Cell().AlignCenter().Text("判定逻辑").FontFamily("simhei").Style(TextStyle.Default.FontSize(8));
+                    header.Cell().AlignCenter().Text("描述").FontFamily("simhei").Style(TextStyle.Default.FontSize(8));
+                    header.Cell().AlignCenter().Text("PLC地址").FontFamily("simhei").Style(TextStyle.Default.FontSize(8));
+                    header.Cell().AlignCenter().Text("PLC变量名").FontFamily("simhei").Style(TextStyle.Default.FontSize(8));
+                    header.Cell().AlignCenter().Text("判定值").FontFamily("simhei").Style(TextStyle.Default.FontSize(8));
+                    header.Cell().AlignCenter().Text("实际值").FontFamily("simhei").Style(TextStyle.Default.FontSize(8));
+                    header.Cell().AlignCenter().Text("结果").FontFamily("simhei").Style(TextStyle.Default.FontSize(8));
+                    header.Cell().AlignCenter().Text("测试时间").FontFamily("simhei").Style(TextStyle.Default.FontSize(8));
                     //标题画一条黑线
                     header.Cell().ColumnSpan(11).PaddingTop(5).BorderBottom(1).BorderColor(Colors.Black);
 
@@ -136,6 +138,7 @@ namespace PLCTool.Pdf
                     var index = Model.ReportPLCModels.IndexOf(item) + 1;
 
                     //table.Cell().Element(CellStyle).Text($"{index}");
+                    table.Cell().Element(CellStyle).AlignCenter().Text(item.SchName).FontFamily("simhei").Style(TextStyle.Default.FontSize(8));
                     table.Cell().Element(CellStyle).AlignCenter().Text(item.ItemName).FontFamily("simhei").Style(TextStyle.Default.FontSize(8)); ;
                     table.Cell().Element(CellStyle).AlignCenter().Text(item.Type).FontFamily("simhei").Style(TextStyle.Default.FontSize(8)); ;
                     table.Cell().Element(CellStyle).AlignCenter().Text($"{item.JudgeType}").FontFamily("simhei").Style(TextStyle.Default.FontSize(8)); ;

BlankApp1/BlankApp1/Pdf/InvoiceModel.cs

@@ -8,7 +8,7 @@ namespace PLCTool.Pdf
 {
     public class InvoiceModel
     {
-        public string SchemeName { get; set; }
+        public string ProjectName { get; set; }
         /// <summary>
         /// Desc:设备名称
         /// Default:
@@ -26,9 +26,16 @@ namespace PLCTool.Pdf
     }
 
     public class ReportPLCModel
-    {     /// <summary>
-          /// 测试项名称
+    {    
+        
+        /// <summary>
+          /// 测试方案名称
           /// </summary>
+        public string SchName { get; set; }
+
+        /// <summary>
+        /// 测试项名称
+        /// </summary>
         public string ItemName { get; set; }
         /// <summary>
         /// 测试项类型

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ResultQueryViewModel.cs

@@ -386,6 +386,8 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             //测试结果和设备id
             string testResult = (string)multiObj[0];
             long deviceId = (long)multiObj[1];
+            //项目名称
+            string projectName = (string)multiObj[2];
             //查找recordid
             var recordMsgs=_iBizTestRecordService.FindRecordByDeviceId((int)deviceId);
             //查找这个id的所有测试记录
@@ -406,7 +408,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             try
             {
                 Settings.License = LicenseType.Community;
-                var model = GetReportPLCInfo("123",deviceName, allRecordDtls,testResult);
+                var model = GetReportPLCInfo(projectName,deviceName, allRecordDtls,testResult);
                 var document = new InvoiceDocument(model);
                 //pdf名称为轴编号+时间
 
@@ -457,14 +459,14 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         /// </summary>
         /// <param name="schDtlId"></param>
         /// <returns></returns>
-        private InvoiceModel GetReportPLCInfo(string schName,string deviceName,List<biz_test_record_dtl> recordDtls,string testResult)
+        private InvoiceModel GetReportPLCInfo(string projectName,string deviceName,List<biz_test_record_dtl> recordDtls,string testResult)
         {
             //测试方案明细主键ID
 
             InvoiceModel invoiceModel = new InvoiceModel();
 
             invoiceModel.ReportPLCModels = new List<ReportPLCModel>();
-            invoiceModel.SchemeName = schName;
+            invoiceModel.ProjectName = projectName;
             invoiceModel.DeviceName = deviceName;
 
             foreach (var each in recordDtls)
@@ -474,6 +476,9 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 var schDtlRelt = _iBasicPlcTestSchemeDtlService.Find((int)schDtlid);
                 if(schDtlRelt != null)
                 {
+                    //查找方案名
+                    long schId = schDtlRelt.scheme_id.Value;
+                    string schEachName = _basicPlcTestSchemeService.Find((int)schId)?.scheme_name;
                     string schItemName = schDtlRelt.item_name;
                     string schItemType = string.Empty;
                     int typeNo = schDtlRelt.item_type.Value;
@@ -502,6 +507,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
 
                                 invoiceModel.ReportPLCModels.Add(new ReportPLCModel()
                                 {
+                                    SchName= schEachName,
                                     ItemName = schItemName,
                                     ItemType = schItemType,
                                     Type = "前置项",
@@ -531,6 +537,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                             {
                                 invoiceModel.ReportPLCModels.Add(new ReportPLCModel()
                                 {
+                                    SchName = schEachName,
                                     ItemName = schItemName,
                                     ItemType = schItemType,
                                     Type = "输入项",
@@ -560,6 +567,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                             {
                                 invoiceModel.ReportPLCModels.Add(new ReportPLCModel()
                                 {
+                                    SchName = schEachName,
                                     ItemName = schItemName,
                                     ItemType = schItemType,
                                     Type = "结果项",

BlankApp1/BlankApp1/Views/BusinessManageView/ResultQueryView.xaml

@@ -113,6 +113,7 @@
                                         <MultiBinding Converter="{ StaticResource ResourceKey=TwoParConverter}">
                                             <Binding Path="TestResult"  ></Binding>
                                             <Binding Path="DeviceId"></Binding>
+                                            <Binding Path="ProjectName"></Binding>
                                         </MultiBinding>
                                     </Button.CommandParameter>
                                     <StackPanel Orientation="Horizontal">