增加元器件新增功能

DeviceLibrary/bean/BoardInfo.cs

@@ -161,8 +161,9 @@ namespace TSA_V.DeviceLibrary
             PositionX = 0;
             PositionY = 0;
         }
-        public SMTPointInfo(int num, string partNum, string name, double positionX, double positionY, string PositionNum, bool needs, bool needc, int sTemp, double
-            sTime,int pointType,int pointSizex,int pointSizeY,int penWidth)
+        public SMTPointInfo(int num, string partNum, string name, double positionX, double positionY, string PositionNum,
+            int pointType=1,int pointSizex=1,int pointSizeY=1,int penWidth =2, 
+            bool needs = false, bool needc = false, int sTemp = 0, double sTime = 0)
         {
             this.PartNum = partNum;
             this.pointNum = num;
@@ -238,19 +239,19 @@ namespace TSA_V.DeviceLibrary
         /// <summary>
         /// 是否需要焊接
         /// </summary>
-        public bool NeedSoldering { get; set; }
+        public bool NeedSoldering { get; set; } = false;
         /// <summary>
         /// 焊接温度
         /// </summary>
-        public int WeldTemp { get; set; }
+        public int WeldTemp { get; set; } = 0;
         /// <summary>
         /// 焊接时间，秒，可以小数
         /// </summary>
-        public double WeldTime { get; set; }
+        public double WeldTime { get; set; } = 0;
         /// <summary>
         /// 是否需要检测
         /// </summary>
-        public bool NeedCheck { get; set; }
+        public bool NeedCheck { get; set; } = false;
 
         /// <summary>
         /// 是否已经校准

DeviceLibrary/csvLoad/CSVReaderManager.cs

@@ -233,6 +233,8 @@ namespace TSA_V.LoadCSVLibrary
                 }
                 index++;
             }
+
+            allComMap[bomName] = oldMap;
             return true;
         }
 
@@ -405,7 +407,26 @@ namespace TSA_V.LoadCSVLibrary
 
             return false;
         }
+        public static bool AddCom(string bomName, ComponetInfo obj)
+        {
+            string fileName = getFilePath(bomName);
+            File.Delete(bomName);
+            if (allComMap.ContainsKey(bomName))
+            {
+                Dictionary<string, ComponetInfo> map = allComMap[bomName];
+                map.Add (obj.PartNum, obj);
+                List<ComponetInfo> newList = new List<ComponetInfo>(map.Values);
+                AddBomList(bomName, newList);
+                LogUtil.info($"元器件库[{bomName}]新增元器件[{obj.PartNum}-{obj.ComponentName}]");
+
+                //更新此元器件库对应的程序
+                BoardManager.AddCom(bomName, obj);
 
+                return true;
+            }
+
+            return false;
+        }
         public static ComponetInfo GetCom(string bomName, string partNum)
         {
             if (allComMap.ContainsKey(bomName))

DeviceLibrary/manager/BoardManager.cs

@@ -9,6 +9,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using TSA_V.LoadCSVLibrary;
 
 namespace TSA_V.DeviceLibrary
 {
@@ -347,6 +348,28 @@ namespace TSA_V.DeviceLibrary
             }
             return board;
         }
+        /// <summary>
+        /// 新增元器件时，程序自动新增点位
+        /// </summary>
+        /// <param name="bomName"></param>
+        /// <param name="obj"></param>
+        internal static void AddCom(string bomName, ComponetInfo obj)
+        {
+            List<BoardInfo> list = (from m in boardList where m.bomName.Equals(bomName) select m).ToList();
+            foreach (BoardInfo board in list)
+            {
+                if (board.bomName.Equals(bomName))
+                {
+                    int count = board.smtList.Count + 1;
 
+                    SMTPointInfo pointInfo = new SMTPointInfo(count, obj.PartNum, obj.ComponentName, 5, 5, obj.PositionNum,1,5,5,2);
+                    pointInfo.Disable = true;
+                    board.smtList.Add(pointInfo);
+                    Update(board);
+                    LogUtil.info($"程序[{board.boardName}]使用元器件库[{bomName}]，自动新增元器件[{obj.PartNum}-{obj.ComponentName}]，默认禁用");
+
+                }
+            }
+        }
     }
 }

TSA-V/FrmAddBoard.cs

@@ -57,7 +57,7 @@ namespace TSA_V
             }
             if (cmbBomList.SelectedIndex < 0)
             {
-                MessageBox.Show(ResourceCulture.GetString(ResourceCulture.ChoiceLibrary, "请选择元器件库！"));
+                //MessageBox.Show(ResourceCulture.GetString(ResourceCulture.ChoiceLibrary, "请选择元器件库！"));
                 txtBoardName.Focus();
                 return false ;
             }
@@ -153,7 +153,7 @@ namespace TSA_V
                         y = board.boardLength - y;
                         x = board.boardWidth - x;
                     }
-                    SMTPointInfo point = new SMTPointInfo(i, com.PartNum, com.ComponentName, x, y, com.PositionNum, false, false, 0, 0,pointType,pointSizeX,pointSizeY,penWidth);
+                    SMTPointInfo point = new SMTPointInfo(i, com.PartNum, com.ComponentName, x, y, com.PositionNum,pointType,pointSizeX,pointSizeY,penWidth);
 
 
                     y = board.boardLength - y;

TSA-V/FrmComponentList.Designer.cs

@@ -61,6 +61,7 @@
             this.Column_Del = new System.Windows.Forms.DataGridViewLinkColumn();
             this.btnBack = new System.Windows.Forms.Button();
             this.btnNew = new System.Windows.Forms.Button();
+            this.btnNewCom = new System.Windows.Forms.Button();
             this.groupBox1.SuspendLayout();
             this.groupInfo.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvList)).BeginInit();
@@ -117,7 +118,7 @@
             this.btnDownLoad.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnDownLoad.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnDownLoad.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnDownLoad.Location = new System.Drawing.Point(565, 632);
+            this.btnDownLoad.Location = new System.Drawing.Point(541, 629);
             this.btnDownLoad.Name = "btnDownLoad";
             this.btnDownLoad.Size = new System.Drawing.Size(131, 63);
             this.btnDownLoad.TabIndex = 71;
@@ -149,6 +150,7 @@
             // 
             this.groupInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupInfo.Controls.Add(this.btnNewCom);
             this.groupInfo.Controls.Add(this.cmbPositionNumList);
             this.groupInfo.Controls.Add(this.txtPartNum);
             this.groupInfo.Controls.Add(this.label7);
@@ -164,7 +166,7 @@
             this.groupInfo.Controls.Add(this.btnSave);
             this.groupInfo.Location = new System.Drawing.Point(518, 84);
             this.groupInfo.Name = "groupInfo";
-            this.groupInfo.Size = new System.Drawing.Size(442, 542);
+            this.groupInfo.Size = new System.Drawing.Size(442, 520);
             this.groupInfo.TabIndex = 68;
             this.groupInfo.TabStop = false;
             this.groupInfo.Text = "元器件基本信息";
@@ -288,7 +290,7 @@
             // 
             this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnSave.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSave.Location = new System.Drawing.Point(148, 377);
+            this.btnSave.Location = new System.Drawing.Point(246, 370);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(130, 45);
             this.btnSave.TabIndex = 4;
@@ -406,9 +408,9 @@
             this.btnBack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnBack.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnBack.Location = new System.Drawing.Point(849, 632);
+            this.btnBack.Location = new System.Drawing.Point(825, 629);
             this.btnBack.Name = "btnBack";
-            this.btnBack.Size = new System.Drawing.Size(111, 63);
+            this.btnBack.Size = new System.Drawing.Size(131, 63);
             this.btnBack.TabIndex = 6;
             this.btnBack.Text = "返回(&B)";
             this.btnBack.UseVisualStyleBackColor = true;
@@ -419,7 +421,7 @@
             this.btnNew.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnNew.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnNew.Location = new System.Drawing.Point(707, 632);
+            this.btnNew.Location = new System.Drawing.Point(683, 629);
             this.btnNew.Name = "btnNew";
             this.btnNew.Size = new System.Drawing.Size(131, 63);
             this.btnNew.TabIndex = 3;
@@ -427,6 +429,18 @@
             this.btnNew.UseVisualStyleBackColor = true;
             this.btnNew.Click += new System.EventHandler(this.btnNew_Click);
             // 
+            // btnNewCom
+            // 
+            this.btnNewCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnNewCom.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnNewCom.Location = new System.Drawing.Point(108, 370);
+            this.btnNewCom.Name = "btnNewCom";
+            this.btnNewCom.Size = new System.Drawing.Size(130, 45);
+            this.btnNewCom.TabIndex = 76;
+            this.btnNewCom.Text = "新增元器件";
+            this.btnNewCom.UseVisualStyleBackColor = true;
+            this.btnNewCom.Click += new System.EventHandler(this.btnNewCom_Click);
+            // 
             // FrmComponentList
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -483,5 +497,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column_X;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column_Y;
         private System.Windows.Forms.DataGridViewLinkColumn Column_Del;
+        private System.Windows.Forms.Button btnNewCom;
     }
 }
\ No newline at end of file

TSA-V/FrmComponentList.cs

@@ -113,11 +113,11 @@ namespace TSA_V
 
         private void btnSave_Click(object sender, EventArgs e)
         {
-            //if (groupInfo.Text.StartsWith("新增"))
-            //{
-            //    //AddCom();
-            //}
-            //else
+            if (IsNew)
+            {
+                AddCom();
+            }
+            else
             {
                 if (dgvList.SelectedRows != null && dgvList.SelectedRows.Count > 0)
                 {
@@ -152,12 +152,7 @@ namespace TSA_V
                         txtName.Focus();
                         return;
                     }
-                    //if (obj.PositionNum.Equals(""))
-                    //{
-                    //    MessageBox.Show("请输入元器件所在位置！");
-                    //    this.txtPosition.Focus();
-                    //    return;
-                    //}
+                   
                     if (obj.ComCount<=0)
                     {
                         MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WriteComNum,"请输入元器件数量！"));
@@ -174,6 +169,66 @@ namespace TSA_V
             }
         }
 
+        private void AddCom()
+        {
+            ComponetInfo obj = new ComponetInfo();
+          
+            if (cmbPositionNumList.SelectedIndex < 0)
+            {
+                MessageBox.Show(ResourceCulture.GetString(ResourceCulture.SelectCPosition, "请选择元器件位置！"));
+                cmbPositionNumList.Focus();
+                return;
+            }
+            TSAVPosition position = (TSAVPosition)cmbPositionNumList.SelectedItem;
+            obj.PartNum = FormUtil.getValue(txtPartNum);
+            obj.ComponentName = FormUtil.getValue(txtName);
+            obj.ComponentDes = FormUtil.getValue(txtDes);
+            obj.ComCount = FormUtil.GetIntValue(txtCount);
+            obj.Notes = FormUtil.getValue(txtNotes);  
+            obj.PositionNum = position.PositionNum;
+            
+            if (obj.PartNum.Equals(""))
+            {
+                MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WritePartName, "请输入元器件编号！"));
+                txtPartNum.Focus();
+                return;
+            }
+            //判断编号是否存在
+            List<ComponetInfo> allList = CSVReaderBomManager.GetComList(cmbList.Text);
+            List<ComponetInfo> objs = (from m in allList where m.PartNum.Equals(obj.PartNum) select m).ToList();
+            if (objs.Count > 0)
+            {
+                MessageBox.Show(ResourceCulture.GetString(ResourceCulture.PartNAExist, "元器件编号[{0}]已存在",obj.PartNum));
+                txtPartNum.Focus();
+                return;
+            }
+
+            if (obj.ComponentName.Equals(""))
+            {
+                MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WriteComName, "请输入元器件名称！"));
+                txtName.Focus();
+                return;
+            }
+
+            if (obj.ComCount <= 0)
+            {
+                MessageBox.Show(ResourceCulture.GetString(ResourceCulture.WriteComNum, "请输入元器件数量！"));
+                txtCount.Focus();
+                return;
+            }
+
+            CSVReaderBomManager.AddCom(cmbList.Text,obj);
+            
+            //ComponentManager.Update(obj);
+           
+            dgvList.Rows.Add(SetRowInfo(null, obj));
+            dgvList.Rows[dgvList.Rows.Count - 1].Selected = true;
+
+            btnNewCom.Visible = true ;
+            MessageBox.Show(ResourceCulture.GetString(ResourceCulture.ComSaveOk, "元器件【{0}】保存成功！", obj.PartNum + "-" + obj.ComponentName));
+            groupInfo.Text = ResourceCulture.GetString(ResourceCulture.ComInfo, "元器件【{0}】的基本信息", obj.PartNum + "-" + obj.ComponentName);
+        }
+
         private void btnDel_Click(object sender, EventArgs e)
         {
             if (dgvList.SelectedRows != null && dgvList.SelectedRows.Count > 0)
@@ -210,6 +265,21 @@ namespace TSA_V
             }
             return point;
         }
+        private bool IsNew = false;
+        private void btnNewCom_Click(object sender, EventArgs e)
+        {
+            IsNew = true;
+            txtPartNum.Text="";
+            txtName.Text = "";
+            txtDes.Text = "";
+            txtCount.Text = "";
+            txtPartNum.Text = "";
+            txtNotes.Text = "";
+            txtPartNum.Enabled = true;
+            this.cmbPositionNumList.SelectedIndex = 0;
+            btnNewCom.Visible = false;
+            groupInfo.Text = ResourceCulture.GetString(ResourceCulture.NewCom, "新增元器件");
+        }
         private void showDetail(int rowIndex)
         {
             DataGridViewRow row = dgvList.Rows[rowIndex];
@@ -219,12 +289,15 @@ namespace TSA_V
                 MessageBox.Show(ResourceCulture.GetString(ResourceCulture.ChoiceCom,"请选择元器件！"));
                 return;
             }
+            IsNew = false;
             txtPartNum.Tag = obj;
             txtName.Text = obj.ComponentName;
             txtDes.Text = obj.ComponentDes;
             txtCount.Text = obj.ComCount.ToString();
             txtPartNum.Text = obj.PartNum;
             txtNotes.Text = obj.Notes;
+            txtPartNum.Enabled = false;
+            btnNewCom.Visible = true ;
             //txtPosition.Text = obj.PositionNum;
             int index = -1;
             foreach (TSAVPosition p in allPosition)
@@ -239,7 +312,7 @@ namespace TSA_V
             {
                 this.cmbPositionNumList.SelectedIndex = index;
             }
-            groupInfo.Text = ResourceCulture.GetString(ResourceCulture.ChoiceLibrary, "元器件【{0}】的基本信息",obj.PartNum+"-"+obj.ComponentName);
+            groupInfo.Text = ResourceCulture.GetString( ResourceCulture.ComInfo, "元器件【{ 0}】的基本信息",obj.PartNum+" -"+obj.ComponentName);
         }
         private void DeleteCom(int rowIndex)
         {
@@ -397,6 +470,6 @@ namespace TSA_V
             {
                 LanguagePro();
             }
-        }
+        } 
     }
 }

TSA-V/Properties/Resource.en-US.resx

@@ -2362,9 +2362,12 @@
   <data name="ItemText_Disable" xml:space="preserve">
     <value>Disable</value>
   </data>
-  <data name = "FrmDeviceConfig_chbDisSideCylinder_Text" xml:space = "preserve"> <value> Disable the side brake cylinder </value>   </data>
-  <data name = "FrmDeviceConfig_chbDisBottonCylinder_Text" xml:space = "preserve"> <value> Disable bottom cylinder </value>   </data>
-   
+  <data name="FrmDeviceConfig_chbDisSideCylinder_Text" xml:space="preserve">
+    <value> Disable the side brake cylinder </value>
+  </data>
+  <data name="FrmDeviceConfig_chbDisBottonCylinder_Text" xml:space="preserve">
+    <value> Disable bottom cylinder </value>
+  </data>
   <data name="ChangeWEnd" xml:space="preserve">
     <value>Adjust width {0}={1} End: {2}</value>
   </data>
@@ -2392,4 +2395,16 @@
   <data name="WidthInvalid" xml:space="preserve">
     <value>The width of the invalid</value>
   </data>
+  <data name="NewCom" xml:space="preserve">
+    <value>Add components</value>
+  </data>
+  <data name="FrmComponentList_btnNewCom_Text" xml:space="preserve">
+    <value> Add components </value>
+  </data>
+  <data name="WritePartName" xml:space="preserve">
+    <value>Please enter the component number</value>
+  </data>
+  <data name="PartNAExist" xml:space="preserve">
+    <value>The component number [{0}] already exists</value>
+  </data>
 </root>
\ No newline at end of file

TSA-V/Properties/Resource.zh-CN.resx

@@ -2409,4 +2409,16 @@
   <data name="WidthInvalid" xml:space="preserve">
     <value>宽度无效</value>
   </data>
+  <data name="NewCom" xml:space="preserve">
+    <value>新增元器件</value>
+  </data>
+  <data name="FrmComponentList_btnNewCom_Text" xml:space="preserve">
+    <value> 新增元器件 </value>
+  </data>
+  <data name="WritePartName" xml:space="preserve">
+    <value>请输入元器件编号</value>
+  </data>
+  <data name="PartNAExist" xml:space="preserve">
+    <value>元器件编号[{0}]已存在</value>
+  </data>
 </root>
\ No newline at end of file

TSA-V/ResourceCulture.cs

@@ -266,6 +266,10 @@ namespace TSA_V
         /// </summary>
         public static string WriteComName = "WriteComName";
         /// <summary>
+        /// 请输入元器件编号
+        /// </summary>
+        public static string WritePartName = "WritePartName";
+        /// <summary>
         /// 请输入元器件数量
         /// </summary>
         public static string WriteComNum = "WriteComNum";
@@ -286,6 +290,14 @@ namespace TSA_V
         /// </summary>
         public static string ChoiceCom = "ChoiceCom";
         /// <summary>
+        /// 新增元器件
+        /// </summary>
+        public static string NewCom = "NewCom";
+        /// <summary>
+        /// 元器件编号[{0}]已存在
+        /// </summary>
+        public static string PartNAExist = "PartNAExist";
+        /// <summary>
         /// 确认要删除元器件【{0}】吗
         /// </summary>
         public static string SureDelCom = "SureDelCom";