Merge branch 'Release3.3' of http://36.129.169.60:30080/gogsadmin/OTS into Release3.3

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ParticlesGridDevidePage.cs

@@ -2225,12 +2225,13 @@ private DataTable ReadClassification(string a_address, string STDName)
                     else
                     {
                         MessageBox.Show("Delete failed");
+                        break;
                     }
                 }
             }
 
             UpdateUIAfterDeletion(deletedParticles.Count);
-            SynchronizeParticleDeletion(deletedParticles);
+            //SynchronizeParticleDeletion(deletedParticles);
         }
 
         private void RemoveParticleFromDataTable(Particle particle)
@@ -2302,17 +2303,17 @@ private DataTable ReadClassification(string a_address, string STDName)
 
             try
             {
-                Particle particle = result.GetList_OTSField()
-                    .Find(x => x.FieldID == fieldId)?
-                    .ParticleList.Find(x => x.ParticleId == particleId);
+                //Particle particle = result.GetList_OTSField()
+                //    .Find(x => x.FieldID == fieldId)?
+                //    .ParticleList.Find(x => x.ParticleId == particleId);
 
-                if (particle == null)
-                    return false;
+                //if (particle == null)
+                //    return false;
 
                 var particleData = new ParticleData(result.FilePath);
                     return particleData.DeleteFromData(
-                        Convert.ToString(particle.FieldId),
-                        Convert.ToString(particle.XrayId));
+                        Convert.ToString(fieldId),
+                        Convert.ToString(particleId));
             }
             catch (Exception ex)
             {