Browse Source

修复:读取ACAS ID失败时,没有拦截的问题,导致三华上报了MES.

JeffWang 2 years ago
parent
commit
b3c50f55c1
1 changed files with 23 additions and 0 deletions
  1. 23 0
      FactoryTool_CShare/Views/OperationPanel.cs

+ 23 - 0
FactoryTool_CShare/Views/OperationPanel.cs

@@ -5045,6 +5045,29 @@ namespace MOKA_Factory_Tools
             }
 
             if (FunctionSettingNow.ExportSNACASID)
+            {// 只有抄写成功,才输出ACASID;
+                if (SerialCMD.ReadJapaneseACASID(TVPort, out result, out data, out error, SerailDelay))
+                {
+                     CommonMethod.ExportSNACASID(orderNow, SN, Encoding.ASCII.GetString(data));
+
+                    if (!SanhuaMethod.UploadIdcData(SN, Encoding.ASCII.GetString(data), out error))
+                    {
+                        TestResult = 0;
+                        ErrMsg = string.Format("{0}  UploadIdcData fail! {1}", SN, error);
+                        Log.WriteErrorLog(ErrMsg);
+                        goto end;
+                    }                    
+                }
+                else
+                {
+                    TestResult = 0;
+                    ErrMsg = string.Format("{0}  Read ACAS ID fail! {1}", SN, error);
+                    Log.WriteErrorLog(ErrMsg);
+                    goto end;
+                }
+            }
+
+            if (CommonMethod.GetLoginAccout().Equals("Sanhua", StringComparison.OrdinalIgnoreCase))
             {
                 SerialCMD.ReadJapaneseACASID(TVPort, out result, out data, out error, SerailDelay);
                 CommonMethod.ExportSNACASID(orderNow, SN, Encoding.ASCII.GetString(data));