소스 검색

change TF value report to numeric
update to 1.5.2

Robert 3 년 전
부모
커밋
6204f1f449
5개의 변경된 파일21개의 추가작업 그리고 13개의 파일을 삭제
  1. 4 4
      AwInitilizer/Properties/AssemblyInfo.cs
  2. 1 1
      GitVersion.yml
  3. 3 3
      Initilizer/AssemblyInfo.cs
  4. 4 4
      MesAdaptor/Properties/AssemblyInfo.cs
  5. 9 1
      MesAdaptor/SajectConnectSajet2.cs

+ 4 - 4
AwInitilizer/Properties/AssemblyInfo.cs

@@ -50,7 +50,7 @@ using System.Windows;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.5.1.0")]
-[assembly: AssemblyVersion("1.5.1.0")]
-[assembly: AssemblyFileVersion("1.5.1.0")]
-[assembly: AssemblyInformationalVersion("de77dec")]
+// [assembly: AssemblyVersion("1.5.2.0")]
+[assembly: AssemblyVersion("1.5.2.0")]
+[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyInformationalVersion("10cda34")]

+ 1 - 1
GitVersion.yml

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{ShortSha}'
-next-version: 1.5.1
+next-version: 1.5.2
 branches: {}
 ignore:
   sha: []

+ 3 - 3
Initilizer/AssemblyInfo.cs

@@ -9,7 +9,7 @@
                                               // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyVersion("1.5.1.0")]
-[assembly: AssemblyFileVersion("1.5.1.0")]
-[assembly: AssemblyInformationalVersion("de77dec")]
+[assembly: AssemblyVersion("1.5.2.0")]
+[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyInformationalVersion("10cda34")]
 

+ 4 - 4
MesAdaptor/Properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.5.1.0")]
-[assembly: AssemblyVersion("1.5.1.0")]
-[assembly: AssemblyFileVersion("1.5.1.0")]
-[assembly: AssemblyInformationalVersion("de77dec")]
+// [assembly: AssemblyVersion("1.5.2.0")]
+[assembly: AssemblyVersion("1.5.2.0")]
+[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyInformationalVersion("10cda34")]

+ 9 - 1
MesAdaptor/SajectConnectSajet2.cs

@@ -182,7 +182,15 @@ namespace MesAdaptor
             var totalResult = true;
             foreach (var pair in reportPair)
             {
-                var msg = string.Format("{0};{1};{2};{3};{4}:{5};", userId, _MechineCode, systemID.ModelName.ToString(), systemID.ToString(), pair.Key, pair.Value);
+                var key = pair.Key;
+                var value = pair.Value;
+
+                if (value.ToLower() == "fail")
+                    value = "0";
+                else if (value.ToLower() == "success")
+                    value = "1";
+
+                var msg = string.Format("{0};{1};{2};{3};{4}:{5};", userId, _MechineCode, systemID.ModelName.ToString(), systemID.ToString(), key, pair.Value);
                 var result = SajetTransData(CMD.ValueReport, ref msg);
                 totalResult &= result;
             }