1

DeviceLibrary/csvLoad/CSVReaderManager.cs

@@ -307,7 +307,13 @@ namespace TSA_V.LoadCSVLibrary
                 Dictionary<string, ComponetInfo> map = new Dictionary<string, ComponetInfo>();
                 Dictionary<string, ComponetInfo> map = new Dictionary<string, ComponetInfo>();
                 foreach (ComponetInfo com in comList)
                 foreach (ComponetInfo com in comList)
                 {
                 {
+                    if (map.ContainsKey(com.PartNum))
+                    {
+                        LogUtil.error("新增元器件库：" + bomName + ", 位号【" + com.PartNum + "】已存在，跳过一行");
+                        continue;
+                    }
                     map.Add(com.PartNum, com);
                     map.Add(com.PartNum, com);
+                 
                 }
                 }
                 allComMap.Add(bomName, map);
                 allComMap.Add(bomName, map);
                 return SaveComponet(bomName, comList);
                 return SaveComponet(bomName, comList);

TSA-V/App.config

@@ -73,7 +73,7 @@
     <!--AOI程序文件夹-->
     <!--AOI程序文件夹-->
     <add key="AOIFileConfig" value="\config\AOIConfig\" />
     <add key="AOIFileConfig" value="\config\AOIConfig\" />
     <!--是否启动AOI-->
     <!--是否启动AOI-->
-    <add key="IsNeedAOI" value="1" />
+    <add key="IsNeedAOI" value="0" />
     <add key="DefaultPointSize" value="5" />
     <add key="DefaultPointSize" value="5" />
     <add key="DefaultPointType" value="1" />
     <add key="DefaultPointType" value="1" />
     <add key="Config_Pwd" value="123456" />
     <add key="Config_Pwd" value="123456" />

TSA-V/FrmAddCom.cs

@@ -132,7 +132,10 @@ namespace TSA_V
                 MessageBox.Show(ResourceCulture.GetString(ResourceCulture.SaveOk,"保存成功！"));
                 MessageBox.Show(ResourceCulture.GetString(ResourceCulture.SaveOk,"保存成功！"));
                 this.Close();
                 this.Close();
             }
             }
-             
+            else
+            { 
+                MessageBox.Show(ResourceCulture.GetString(ResourceCulture.SaveError, "保存失败！"));
+            }
         }
         }
 
 
 
 
@@ -150,6 +153,10 @@ namespace TSA_V
                     this.Close();
                     this.Close();
                 }
                 }
             }
             }
+            else
+            {
+                MessageBox.Show(ResourceCulture.GetString(ResourceCulture.SaveError, "保存失败！"));
+            }
 
 
 
 
         }
         }

TSA-V/workForm/FrmTSAV.cs

@@ -923,8 +923,13 @@ namespace TSA_V
 
 
         private void btnWorkInfo_Click(object sender, EventArgs e)
         private void btnWorkInfo_Click(object sender, EventArgs e)
         {
         {
-            FrmWorkCount frm = new FrmWorkCount();
-            frm.ShowDialog();
+            //FrmWorkCount frm = new FrmWorkCount();
+            //frm.ShowDialog();
+
+            MesUtil.ClearCode();
+            FrmCodeInPut frmCode = new FrmCodeInPut();
+            frmCode.SetCount(1);
+            frmCode.ShowDialog(this);
         }
         }
         private static bool IsSet = false;
         private static bool IsSet = false;
         private void TSAVBean_InputCodeEvent(int count)
         private void TSAVBean_InputCodeEvent(int count)