1

RC1266-AutoCountMachine/source/AutoCountClient/FrmAnalyze.Designer.cs

@@ -243,10 +243,10 @@
             // 
             // 
             // Column_ImageName
             // Column_ImageName
             // 
             // 
-            this.Column_ImageName.HeaderText = "图片名称";
+            this.Column_ImageName.HeaderText = "点料结果";
             this.Column_ImageName.Name = "Column_ImageName";
             this.Column_ImageName.Name = "Column_ImageName";
             this.Column_ImageName.ReadOnly = true;
             this.Column_ImageName.ReadOnly = true;
-            this.Column_ImageName.Width = 530;
+            this.Column_ImageName.Width = 550;
             // 
             // 
             // FrmAnalyze
             // FrmAnalyze
             // 
             // 

RC1266-AutoCountMachine/source/DeviceLibrary/manager/SServerManager.cs

@@ -110,14 +110,17 @@ namespace OnlineStore.DeviceLibrary
                     return "";
                     return "";
                 }
                 }
                 DateTime startTime = DateTime.Now;
                 DateTime startTime = DateTime.Now;
-                string resultStr = HttpHelper.Get(server); 
+                string resultStr = HttpHelper.Get(server).Replace("\r\n", "  ");
                 //【<?xml version="1.0" encoding="utf-8"?>< string xmlns = "http://tempuri.org/" > NG 不可退料 厂别：ST </ string >】 
                 //【<?xml version="1.0" encoding="utf-8"?>< string xmlns = "http://tempuri.org/" > NG 不可退料 厂别：ST </ string >】 
                 LogUtil.info(deviceName + "Return_Material   " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
                 LogUtil.info(deviceName + "Return_Material   " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
 
 
+                //resultStr = "<?xml version=\"1.0\" encoding=\"utf - 8\"?>< string xmlns = \"http://tempuri.org/\" > NG 不可退料 厂别：ST </ string >";
                 if (resultStr.Contains("NG"))
                 if (resultStr.Contains("NG"))
                 {
                 {
-                    msg = resultStr.Replace("<?xml version=\"1.0\" encoding=\"utf - 8\"?>< string xmlns = \"http://tempuri.org/\" >", "").Replace(" </ string >","");
+                    int index = resultStr.IndexOf("NG");
+                    msg = resultStr.Substring(index, resultStr.Length - index).Replace("</ string >", "");
                 }
                 }
+
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {