소스 검색

版本:3.0.6.9,上报抄写结果到MES,也要红底弹框。

sat23 3 년 전
부모
커밋
9f6945d0e0
5개의 변경된 파일15개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      Packagescript/setup without net40.nsi
  2. 1 1
      Packagescript/setup.nsi
  3. 1 1
      Properties/AssemblyInfo.cs
  4. 10 0
      Upgradelog/Licence3.0.6.9.txt
  5. 2 1
      Views/OperationPanel.cs

+ 1 - 1
Packagescript/setup without net40.nsi

@@ -4,7 +4,7 @@ ${StrRep}
 
 ; °²×°³ÌÐò³õʼ¶¨Òå³£Á¿
 !define PRODUCT_NAME "MOKA Factory Tools"
-!define PRODUCT_VERSION "3.0.6.8"
+!define PRODUCT_VERSION "3.0.6.9"
 !define PRODUCT_PUBLISHER "MOKA"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\MOKA Factory Tools.exe"
 !define UNINSTALL_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall"

+ 1 - 1
Packagescript/setup.nsi

@@ -4,7 +4,7 @@ ${StrRep}
 
 ; °²×°³ÌÐò³õʼ¶¨Òå³£Á¿
 !define PRODUCT_NAME "MOKA Factory Tools"
-!define PRODUCT_VERSION "3.0.6.8"
+!define PRODUCT_VERSION "3.0.6.9"
 !define PRODUCT_PUBLISHER "MOKA"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\MOKA Factory Tools.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

+ 1 - 1
Properties/AssemblyInfo.cs

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

+ 10 - 0
Upgradelog/Licence3.0.6.9.txt

@@ -0,0 +1,10 @@
+moka tools
+
+//////////////////////////////////////
+//         Upgrade content:         // 
+//////////////////////////////////////
+Ver=3.0.6.9
+1.所有MessageBox改用自定义红底框。
+2.上报抄写结果到MES中,只针对惠州工厂。
+
+

+ 2 - 1
Views/OperationPanel.cs

@@ -5153,7 +5153,8 @@ namespace MOKA_Factory_Tools
                 string strOutMsg;
                 if (!CommonMethod.ReportDataBurningResultToMES(SN, keyInfo.DSN, TestResult ? "Pass" : "Fail", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), errorDBNow, out strOutMsg))
                 {
-                    MessageBox.Show("上报抄写结果到MES失败,请紧急处理:" + strOutMsg);
+                    //MessageBox.Show("上报抄写结果到MES失败,请紧急处理:" + strOutMsg);
+                    ShowVerifyDelegate("上报抄写结果到MES失败,请紧急处理:" + strOutMsg);
                 }
             }
             if (midListNow.host == "LocalPC" && !preloadNow)