处理

Src/Entities/SemirOrderBase.cs

@@ -29,39 +29,40 @@ namespace Njhg.Third.Semir.Entities
             if (third.Metadata == null) return null;
             var semir = third.Metadata.DicToObject();
 
-            var report = new Report();
-            report.BizId = third.SerialNumber;
-            report.BizKvid = third.Kvid;
-            report.BizType = typeof(ThirdReportOrder).FullName;
-            report.ReportId = $"{semir.BRAND_DISPLAY}{DateTime.Now:yyyyMMddHHmmss}";
+            var rtns = new Report();
+            rtns.BizId = third.SerialNumber;
+            rtns.BizKvid = third.Kvid;
+            rtns.BizType = typeof(ThirdReportOrder).FullName;
+            rtns.ReportId = $"{semir.BRAND_DISPLAY}{DateTime.Now:yyyyMMddHHmmss}";
             //contract.OrderID = semir.DOC_NO;
-            report.Type = "B";
-            report.TypeEx = "W";
-            report.TypeName = "委托送样";
-            report.Category = "SE";
-            report.DemanderName = semir.COMPANY_NAME;
-            report.DemanderContactName = semir.CONTACT_PERSON;
-            report.DemanderContactNumber = semir.CONTACT_PHONE;
-            report.DemanderContactAddress = semir.COMPANY_ADDRESS;
-
-            report.SampleManufacturerName = semir.APPLY_ORG_NAME;
-            report.SampleManufacturerContactName = semir.PAYER_CONTACT_PERSON;
-            report.SampleManufacturerContactNumber = semir.PAYER_CONTACT_PHONE;
-            report.SampleManufacturerAddress = semir.PAYER_ORG_ADDRESS;
-
-            report.SampleName = semir.MAT_NAME;
-            report.SampleBrand = semir.BRAND_DISPLAY;
-            report.SampleGradeSafety = semir.CHECK_LEVEL;
-            report.SampleGrade = semir.SAMPLE_GRADE;
-
-            report.SampleBatchNumber = semir.FG_MAT_CODE;
-
-            report.Metadata['ProductColor'] = semir.FG_COLOR;
-            report.Metadata['MaterialColor'] = semir.COLOR;
-            report.Metadata['MaterialNumber'] = semir.MAT_CODE;
-            report.Metadata['SampleType'] = semir.THIRDPARTY_TESTING_TESTPART;
-            report.Metadata['VersionNumber'] = semir.MAT_DEV_CODE;
-            report.Metadata['YearQuarter'] = semir.YEAR+"/"+semir.SEASONS;
+            //report.Type = "B";
+            rtns.TypeEx = "W";
+            rtns.TypeName = "委托送样";
+            rtns.Category = "SE";
+            rtns.DemanderName = semir.COMPANY_NAME;
+            rtns.DemanderContactName = semir.CONTACT_PERSON;
+            rtns.DemanderContactNumber = semir.CONTACT_PHONE;
+            rtns.DemanderContactAddress = semir.COMPANY_ADDRESS;
+
+            rtns.SampleManufacturerName = semir.APPLY_ORG_NAME;
+            rtns.SampleManufacturerContactName = semir.PAYER_CONTACT_PERSON;
+            rtns.SampleManufacturerContactNumber = semir.PAYER_CONTACT_PHONE;
+            rtns.SampleManufacturerAddress = semir.PAYER_ORG_ADDRESS;
+
+            rtns.SampleName = semir.MAT_NAME;
+            rtns.SampleBrand = semir.BRAND_DISPLAY;
+            rtns.SampleGradeSafety = semir.CHECK_LEVEL;
+            rtns.SampleGrade = semir.SAMPLE_GRADE;
+
+            rtns.SampleBatchNumber = semir.FG_MAT_CODE;
+
+            rtns.Metadata = new Dictionary<string, string>();
+            rtns.Metadata["ProductColor"] = semir.FG_COLOR;
+            rtns.Metadata["MaterialColor"] = semir.COLOR;
+            rtns.Metadata["MaterialNumber"] = semir.MAT_CODE;
+            rtns.Metadata["SampleType"] = semir.THIRDPARTY_TESTING_TESTPART;
+            rtns.Metadata["VersionNumber"] = semir.MAT_DEV_CODE;
+            rtns.Metadata["YearQuarter"] = semir.YEAR+"/"+semir.SEASONS;
 
             var details = new List<string>();
             foreach (var detail in semir.ITEMS)
@@ -69,9 +70,8 @@ namespace Njhg.Third.Semir.Entities
                 details.Add($"{detail.ITEM_NAME}({detail.ITEM_STANDARD})");
             }
             var tasks = string.Join("、", details.ToArray());
-            report.Metadata = new Dictionary<string, string>();
-            report.Metadata.Add("ERemark", tasks);
-            return report;
+            rtns.Metadata.Add("ERemark", tasks);
+            return rtns;
         }
 
         public bool OnRejectThirdReport(Guid ThirdReportOrderKvid)

Src/Properties/AssemblyInfo.cs

@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.4.2024.1100")]
-[assembly: AssemblyFileVersion("5.4.2024.1100")]
+[assembly: AssemblyVersion("5.4.2024.1200")]
+[assembly: AssemblyFileVersion("5.4.2024.1200")]