位号bug修改

TSA-V/FrmComponentList.cs

@@ -142,6 +142,7 @@ namespace TSA_V
                     
                     ComponetInfo obj = getRowPointInfo(row);
                     string oldPosition = obj.PositionNum;
+                    string oldTagNo = obj.TagNo;
 
                     if (obj == null)
                     {
@@ -163,6 +164,7 @@ namespace TSA_V
                     obj.TagNo = FormUtil.getValue(txtPartNum);
                     obj.Id = FormUtil.GetIntValue(txtId);
                     obj.PositionNum = position.PositionNum;
+                     
 
                     if (obj.PN.Equals(""))
                     {
@@ -186,6 +188,18 @@ namespace TSA_V
                             MessageBox.Show(ResourceCulture.GetString(ResourceCulture.ComExists, "元器件已存在"));
                         }
                     }
+                    if (obj.TagNo.Equals(oldTagNo).Equals(false) &&( !String.IsNullOrEmpty(obj.TagNo)))
+                    {
+                        List<ComponetInfo> list = CSVBomManager.GetComList(cmbList.Text);
+                        List<ComponetInfo> objs = (from m in list where (!String.IsNullOrEmpty(m.TagNo)) && m.TagNo.Equals(obj.TagNo) select m).ToList();
+                        if (objs.Count > 0)
+                        {
+                            MessageBox.Show(ResourceCulture.GetString(ResourceCulture.PartNAExist, "元器件编号[{0}]已存在", obj.TagNo));
+                            txtPartNum.Focus();
+                            return;
+                        }
+                    }
+                 
                     bool result = CSVBomManager.UpdateComponet(cmbList.Text, obj);
                     if (result)
                     { 
@@ -345,7 +359,14 @@ namespace TSA_V
             txtCount.Text = obj.ComCount.ToString();
             txtPartNum.Text = obj.TagNo;
             txtNotes.Text = obj.Notes;
-            txtPartNum.Enabled = false;
+            if (txtPartNum.Text == "")
+            {
+                txtPartNum.Enabled = true;
+            }
+            else
+            { 
+                txtPartNum.Enabled = false;
+            }
             btnNewCom.Visible = true ;
             txtId.Text = obj.Id.ToString();
             //txtPosition.Text = obj.PositionNum;

TSA-V/FrmPointInfo.cs

@@ -234,20 +234,25 @@ namespace TSA_V
             } 
 
             string tagNo = FormUtil.getValue(txtTagNo);
-            if (tagNo.Equals(""))
-            {
-                MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WritePartNumber, "请输入位号！"));
-                txtTagNo.Focus();
-                return false;
-            }
-            List<SMTPointInfo> pos = (from m in boardInfo.smtList where m.pointNum != smtPointInfo.pointNum && m.TagNo.Equals(tagNo) select m).ToList();
-            if (pos.Count > 0)
+
+            if (isNewPoint)
             {
-                MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WritePartNumber, "请输入位号！"));
-                txtTagNo.Text = smtPointInfo.TagNo;
-                txtTagNo.Focus();
-                return false;
+                if (tagNo.Equals(""))
+                {
+                    MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WritePartNumber, "请输入位号！"));
+                    txtTagNo.Focus();
+                    return false;
+                }
+                List<SMTPointInfo> pos = (from m in boardInfo.smtList where m.pointNum != smtPointInfo.pointNum && m.TagNo.Equals(tagNo) select m).ToList();
+                if (pos.Count > 0)
+                {
+                    MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WritePartNumber, "请输入位号！"));
+                    txtTagNo.Text = smtPointInfo.TagNo;
+                    txtTagNo.Focus();
+                    return false;
+                }
             }
+
             smtPointInfo.PN = pn;
             smtPointInfo.TagNo = tagNo;
             smtPointInfo.PositionX = FormUtil.getDoubleValue(txtX);