Эх сурвалжийг харах

FTP文件上传绑定,SOP绑定打开

callm 4 жил өмнө
parent
commit
664210454f

+ 42 - 42
UAS_MES_PW/FunctionCode/Make/Make_GetTestFileData.Designer.cs

@@ -42,15 +42,15 @@ namespace UAS_MES_NEW.Make
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.CheckItemDGV = new System.Windows.Forms.DataGridView();
+            this.std_class = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_testtimes = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_testresult = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.std_badcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ReSet = new UAS_MES_NEW.CustomControl.CustomCheckBox.ReSetCheckBox();
-            this.std_class = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.std_testtimes = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.std_testresult = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.std_badcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.StepCount = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
@@ -71,7 +71,7 @@ namespace UAS_MES_NEW.Make
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(64, 788);
+            this.label10.Location = new System.Drawing.Point(64, 781);
             this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(53, 35);
@@ -189,6 +189,41 @@ namespace UAS_MES_NEW.Make
             this.CheckItemDGV.TabIndex = 33;
             this.CheckItemDGV.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.CheckItemDGV_CellPainting);
             // 
+            // std_class
+            // 
+            this.std_class.DataPropertyName = "std_class";
+            this.std_class.HeaderText = "检测项";
+            this.std_class.MinimumWidth = 130;
+            this.std_class.Name = "std_class";
+            this.std_class.ReadOnly = true;
+            this.std_class.Width = 150;
+            // 
+            // std_testtimes
+            // 
+            this.std_testtimes.DataPropertyName = "std_testtimes";
+            this.std_testtimes.HeaderText = "测试次数";
+            this.std_testtimes.MinimumWidth = 200;
+            this.std_testtimes.Name = "std_testtimes";
+            this.std_testtimes.ReadOnly = true;
+            this.std_testtimes.Width = 468;
+            // 
+            // std_testresult
+            // 
+            this.std_testresult.DataPropertyName = "std_testresult";
+            this.std_testresult.HeaderText = "测试结果";
+            this.std_testresult.MinimumWidth = 200;
+            this.std_testresult.Name = "std_testresult";
+            this.std_testresult.ReadOnly = true;
+            this.std_testresult.Width = 467;
+            // 
+            // std_badcode
+            // 
+            this.std_badcode.DataPropertyName = "std_badcode";
+            this.std_badcode.HeaderText = "故障代码";
+            this.std_badcode.MinimumWidth = 200;
+            this.std_badcode.Name = "std_badcode";
+            this.std_badcode.Width = 200;
+            // 
             // dataGridViewTextBoxColumn1
             // 
             this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
@@ -227,48 +262,13 @@ namespace UAS_MES_NEW.Make
             // ReSet
             // 
             this.ReSet.AutoSize = true;
-            this.ReSet.Location = new System.Drawing.Point(1102, 795);
+            this.ReSet.Location = new System.Drawing.Point(1102, 788);
             this.ReSet.Name = "ReSet";
             this.ReSet.Size = new System.Drawing.Size(186, 28);
             this.ReSet.TabIndex = 34;
             this.ReSet.Text = "恢复出厂设置";
             this.ReSet.UseVisualStyleBackColor = true;
             // 
-            // std_class
-            // 
-            this.std_class.DataPropertyName = "std_class";
-            this.std_class.HeaderText = "检测项";
-            this.std_class.MinimumWidth = 130;
-            this.std_class.Name = "std_class";
-            this.std_class.ReadOnly = true;
-            this.std_class.Width = 150;
-            // 
-            // std_testtimes
-            // 
-            this.std_testtimes.DataPropertyName = "std_testtimes";
-            this.std_testtimes.HeaderText = "测试次数";
-            this.std_testtimes.MinimumWidth = 200;
-            this.std_testtimes.Name = "std_testtimes";
-            this.std_testtimes.ReadOnly = true;
-            this.std_testtimes.Width = 468;
-            // 
-            // std_testresult
-            // 
-            this.std_testresult.DataPropertyName = "std_testresult";
-            this.std_testresult.HeaderText = "测试结果";
-            this.std_testresult.MinimumWidth = 200;
-            this.std_testresult.Name = "std_testresult";
-            this.std_testresult.ReadOnly = true;
-            this.std_testresult.Width = 467;
-            // 
-            // std_badcode
-            // 
-            this.std_badcode.DataPropertyName = "std_badcode";
-            this.std_badcode.HeaderText = "故障代码";
-            this.std_badcode.MinimumWidth = 200;
-            this.std_badcode.Name = "std_badcode";
-            this.std_badcode.Width = 200;
-            // 
             // StepCount
             // 
             this.StepCount.LineCode = null;
@@ -285,7 +285,7 @@ namespace UAS_MES_NEW.Make
             this.sncode.AllPower = null;
             this.sncode.BackColor = System.Drawing.Color.White;
             this.sncode.ID = null;
-            this.sncode.Location = new System.Drawing.Point(144, 788);
+            this.sncode.Location = new System.Drawing.Point(144, 781);
             this.sncode.Margin = new System.Windows.Forms.Padding(4);
             this.sncode.Name = "sncode";
             this.sncode.Power = null;

+ 4 - 1
UAS_MES_PW/FunctionCode/Make/Make_GetTestFileData.cs

@@ -26,6 +26,8 @@ namespace UAS_MES_NEW.Make
         string omakeCode = "";
 
         string oMsid = "";
+
+        ftpOperater ftp = new ftpOperater();
         public Make_GetTestFileData()
         {
             InitializeComponent();
@@ -66,6 +68,7 @@ namespace UAS_MES_NEW.Make
                 {
                     if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sncode.Text, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
                     {
+                        string ms_prodcode = dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_id='"+oMsid+"'").ToString();
                         DataTable dt = new DataTable();
                         BaseUtil.OpenCSVFile(ref dt, @"C:\Users\callm\Desktop\品网\2019_04_04_19_59_18_788.csv");
                         //移除标题行
@@ -101,12 +104,12 @@ namespace UAS_MES_NEW.Make
                                 BaseUtil.SetFormValue(Controls, dt);
                                 //将SN,时间,结果记录在页面
                                 //记录日志
+                                ftp.UpLoadFile(@"C:\Users\callm\Desktop\品网\", "2019_04_04_19_59_18_788.csv", "/" + DateTime.Now.ToString("yyyy-MM-dd") + "/" + ms_prodcode + "/");
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "标签核对", "参数核对成功", sncode.Text, "");
                                 //SN核对成功
                                 //>> 请输入SN
                                 OperateResult.AppendText("<<" + sncode.Text + "信息核对成功\n", Color.Green, sncode);
                                 OperateResult.AppendText(">>请输入SN\n", Color.Black);
-
                                 SetCheck set = new SetCheck("OK", Color.Green);
                                 BaseUtil.SetFormCenter(set);
                                 set.ShowDialog();

+ 32 - 1
UAS_MES_PW/FunctionCode/Query/Query_SOP.Designer.cs

@@ -29,24 +29,55 @@
         private void InitializeComponent()
         {
             this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
+            this.Sn = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SNCodeEnterTextBox();
+            this.label1 = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
+            // Sn
+            // 
+            this.Sn.AllPower = null;
+            this.Sn.ID = null;
+            this.Sn.Location = new System.Drawing.Point(213, 357);
+            this.Sn.Name = "Sn";
+            this.Sn.Power = null;
+            this.Sn.Size = new System.Drawing.Size(283, 35);
+            this.Sn.Str = null;
+            this.Sn.Str1 = null;
+            this.Sn.Str2 = null;
+            this.Sn.TabIndex = 0;
+            this.Sn.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Sn_KeyDown);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(100, 355);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(58, 37);
+            this.label1.TabIndex = 1;
+            this.label1.Text = "SN";
+            // 
             // Query_SOP
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1494, 1075);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.Sn);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Margin = new System.Windows.Forms.Padding(6);
             this.Name = "Query_SOP";
-            this.Tag = "Query!SpecialReport";
+            this.Tag = "Query!SOP";
             this.Text = "Query_SpecialReport";
             this.Load += new System.EventHandler(this.Query_SpecialReport_Load);
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
         #endregion
         private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
+        private CustomControl.TextBoxWithIcon.SNCodeEnterTextBox Sn;
+        private System.Windows.Forms.Label label1;
     }
 }

+ 21 - 3
UAS_MES_PW/FunctionCode/Query/Query_SOP.cs

@@ -24,18 +24,36 @@ namespace UAS_MES_NEW.Query
 
         private void Export_Click(object sender, EventArgs e)
         {
-         
+
         }
 
         //选择导出Excel时是选择导出数据的还是模板
         private void ExcelExport(string DataOrTemplet)
         {
-         
+
         }
 
         private void Query_SpecialReport_Load(object sender, EventArgs e)
         {
 
         }
+
+        private void Sn_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyData == Keys.Enter)
+            {
+                DataTable dt = (DataTable)dh.ExecuteSql("select ms_prodcode from makeserial where ms_sncode='" + Sn.Text + "'", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    string prodcode = dt.Rows[0]["ms_prodcode"].ToString();
+                    string FilePath = dh.getFieldDataByCondition("SOPDETAIL left join sop on so_id=sod_soid ", "sod_path", "so_prodcode='" + prodcode + "' and sod_stepcode='" + User.CurrentStepCode + "'").ToString();
+                    System.Diagnostics.Process.Start(FilePath);
+                }
+                else
+                {
+                    MessageBox.Show("序列号" + Sn.Text + "不存在");
+                }
+            }
+        }
     }
-}
+}

+ 1 - 1
UAS_MES_PW/PublicMethod/BaseUtil.cs

@@ -1210,7 +1210,7 @@ namespace UAS_MES_NEW.PublicMethod
 
         public static bool connectState(string path)
         {
-            return connectState(path, "a", "a");
+            return connectState(path, "vsftpd", "vsftpd");
         }
         /// <summary>
         /// 连接远程共享文件夹

+ 129 - 78
UAS_MES_PW/PublicMethod/ftpOperater.cs

@@ -22,18 +22,18 @@ namespace UAS_MES_NEW.PublicMethod
 
         public ftpOperater()
         {
-            //string[] FTPInf = Properties.Settings.Default.Properties["FTPAddress"].DefaultValue.ToString().Split('|');
-            //this.ftpServerIP = FTPInf[0];
-            //this.ftpUser = FTPInf[1];
-            //this.ftpPwd = FTPInf[2];
-             string FTPInf = Properties.Settings.Default.Properties["FTPAddress"].DefaultValue.ToString();
-           
-            //连接共享文件夹
-            status = BaseUtil.connectState(FTPInf);
+            string[] FTPInf = Properties.Settings.Default.Properties["FTPAddress"].DefaultValue.ToString().Split('|');
+            this.ftpServerIP = FTPInf[0];
+            this.ftpUser = FTPInf[1];
+            this.ftpPwd = FTPInf[2];
+            //string FTPInf = Properties.Settings.Default.Properties["FTPAddress"].DefaultValue.ToString();
 
+            //连接共享文件夹
+            //status = BaseUtil.connectState(FTPInf);
         }
+
         #region
-        public void UpLoadFile(string filepath, string filename)
+        public void UpLoadFile(string filepath, string filename, string UploadFolder)
         {
             //上传之前判断文件是否存在
             string[] filelist = GetFileList();
@@ -50,7 +50,8 @@ namespace UAS_MES_NEW.PublicMethod
                     }
                 }
             FtpWebRequest reqFTP;
-            reqFTP = (FtpWebRequest)FtpWebRequest.Create(new Uri(ftpServerIP + "/" + filename));
+            FtpCheckDirectoryExist(UploadFolder);
+            reqFTP = (FtpWebRequest)FtpWebRequest.Create(new Uri(ftpServerIP + UploadFolder + filename));
             reqFTP.UseBinary = true;
             reqFTP.Credentials = new NetworkCredential(ftpUser, ftpPwd);
             reqFTP.Method = WebRequestMethods.Ftp.UploadFile;
@@ -73,53 +74,54 @@ namespace UAS_MES_NEW.PublicMethod
                 }
                 fs.Close();
             }
+            File.Delete(filepath + "/" + filename);
         }
         #endregion
 
 
-        public void UpLoadFile(string filepath, string filename,string savepath)
-        {
-            if (status)
-            {
-                //目标路径
-                string targetPath = savepath;
-                //var file = Directory.GetFiles(targetPath);
-                string sourceFile = Path.Combine(filepath + @"\", filename);
-                string destFile = Path.Combine(targetPath + @"\", filename);
-                //获取指定路径下的全部文件名
-                var file = Directory.GetFiles(targetPath);
-                string overwrite = "";
-                for (int i = 0; i < file.Length; i++)
-                {
-                    if (file[i].Substring(file[i].LastIndexOf(@"\") + 1) == filename)
-                    {
-                        overwrite = MessageBox.Show("已存在名为" + filename + "的文件,是否覆盖", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
-                        break;
-                    }
-                }
-                if (overwrite == "Yes" || overwrite == "")
-                {
-                    //不存在文件的话进行创建
-                    if (!Directory.Exists(targetPath))
-                        Directory.CreateDirectory(targetPath);
-                    //将文件复制到指定位置
-                    File.Copy(sourceFile, destFile, true);
-                }
-                //string sourceFile = Path.Combine(filepath+@"\", filename);
-                ////共享文件夹的目录
-                //DirectoryInfo theFolder = new DirectoryInfo(savepath);
-                ////获取保存文件的路径
-                //string fielpath = theFolder.ToString() + @"\";
-                ////执行方法
-                //BaseUtil.Transport(sourceFile, fielpath, filename);
-            }
-            else
-            {
-                //ListBox1.Items.Add("未能连接!");
-                MessageBox.Show("共享文件连接错误");
-            }
-         
-        }
+        //public void UpLoadFile(string filepath, string filename, string savepath)
+        //{
+        //    if (status)
+        //    {
+        //        //目标路径
+        //        string targetPath = savepath;
+        //        //var file = Directory.GetFiles(targetPath);
+        //        string sourceFile = Path.Combine(filepath + @"\", filename);
+        //        string destFile = Path.Combine(targetPath + @"\", filename);
+        //        //获取指定路径下的全部文件名
+        //        var file = Directory.GetFiles(targetPath);
+        //        string overwrite = "";
+        //        for (int i = 0; i < file.Length; i++)
+        //        {
+        //            if (file[i].Substring(file[i].LastIndexOf(@"\") + 1) == filename)
+        //            {
+        //                overwrite = MessageBox.Show("已存在名为" + filename + "的文件,是否覆盖", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+        //                break;
+        //            }
+        //        }
+        //        if (overwrite == "Yes" || overwrite == "")
+        //        {
+        //            //不存在文件的话进行创建
+        //            if (!Directory.Exists(targetPath))
+        //                Directory.CreateDirectory(targetPath);
+        //            //将文件复制到指定位置
+        //            File.Copy(sourceFile, destFile, true);
+        //        }
+        //        //string sourceFile = Path.Combine(filepath+@"\", filename);
+        //        ////共享文件夹的目录
+        //        //DirectoryInfo theFolder = new DirectoryInfo(savepath);
+        //        ////获取保存文件的路径
+        //        //string fielpath = theFolder.ToString() + @"\";
+        //        ////执行方法
+        //        //BaseUtil.Transport(sourceFile, fielpath, filename);
+        //    }
+        //    else
+        //    {
+        //        //ListBox1.Items.Add("未能连接!");
+        //        MessageBox.Show("共享文件连接错误");
+        //    }
+
+        //}
 
         /// <summary>
         /// 获取ftp服务器上的文件信息
@@ -230,6 +232,54 @@ namespace UAS_MES_NEW.PublicMethod
             return fileSize;
         }
 
+        public void FtpCheckDirectoryExist(string destFilePath)
+        {
+            string fullDir = FtpParseDirectory(destFilePath);
+            string[] dirs = fullDir.Split('/');
+            string curDir = "/";
+            for (int i = 0; i < dirs.Length; i++)
+            {
+                string dir = dirs[i];
+                //如果是以/开始的路径,第一个为空    
+                if (dir != null && dir.Length > 0)
+                {
+                    try
+                    {
+                        curDir += dir + "/";
+                        FtpMakeDir(curDir);
+                    }
+                    catch (Exception)
+                    { }
+                }
+            }
+        }
+
+        public string FtpParseDirectory(string destFilePath)
+        {
+            return destFilePath.Substring(0, destFilePath.LastIndexOf("/"));
+        }
+
+        //创建目录  
+        public Boolean FtpMakeDir(string localFile)
+        {
+            FtpWebRequest req = (FtpWebRequest)WebRequest.Create(ftpServerIP + localFile);
+            req.Credentials = new NetworkCredential(ftpUser, ftpPwd);
+            req.Method = WebRequestMethods.Ftp.MakeDirectory;
+            try
+            {
+                FtpWebResponse response = (FtpWebResponse)req.GetResponse();
+                response.Close();
+            }
+            catch (Exception)
+            {
+                req.Abort();
+                return false;
+            }
+            req.Abort();
+            return true;
+        }
+
+
         /// <summary>
         /// 实现ftp下载操作
         /// </summary>
@@ -271,7 +321,7 @@ namespace UAS_MES_NEW.PublicMethod
         }
 
 
-        public string DownLoadFromSharePath(string URL,string fileName)
+        public string DownLoadFromSharePath(string URL, string fileName)
         {
             //目标路径
             string targetPath = FTPInf;
@@ -280,14 +330,15 @@ namespace UAS_MES_NEW.PublicMethod
             string destFile = Path.Combine(DownLoadTo, fileName);
             //不存在文件的话进行创建
             if (!Directory.Exists(DownLoadTo))
-            Directory.CreateDirectory(DownLoadTo);
+                Directory.CreateDirectory(DownLoadTo);
             //将文件复制到指定位置
             try
             {
                 File.Copy(sourceFile, destFile, true);
             }
-            catch {
-                MessageBox.Show("标签文件更新失败,不在指定维护路径"+ URL + "中或已被占用","提示",MessageBoxButtons.OK,MessageBoxIcon.Warning);
+            catch
+            {
+                MessageBox.Show("标签文件更新失败,不在指定维护路径" + URL + "中或已被占用", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
             }
             return destFile;
         }
@@ -298,30 +349,30 @@ namespace UAS_MES_NEW.PublicMethod
         /// <param name="fileName"></param>
         public void Delete(string fileName)
         {
-             try
-             {
-                 FtpWebRequest reqFTP;
-                 reqFTP = (FtpWebRequest)FtpWebRequest.Create(new Uri(ftpServerIP + "/" + fileName));
-                 reqFTP.KeepAlive = false;
-                 reqFTP.Method = WebRequestMethods.Ftp.DeleteFile;
+            try
+            {
+                FtpWebRequest reqFTP;
+                reqFTP = (FtpWebRequest)FtpWebRequest.Create(new Uri(ftpServerIP + "/" + fileName));
+                reqFTP.KeepAlive = false;
+                reqFTP.Method = WebRequestMethods.Ftp.DeleteFile;
                 reqFTP.UseBinary = true;
                 reqFTP.Credentials = new NetworkCredential(ftpUser, ftpPwd);
                 reqFTP.UsePassive = true;
                 string result = String.Empty;
-                 FtpWebResponse response = (FtpWebResponse)reqFTP.GetResponse();
-                 long size = response.ContentLength;
-                 Stream datastream = response.GetResponseStream();
-                 StreamReader sr = new StreamReader(datastream);
-                 result = sr.ReadToEnd();
-                 sr.Close();
-                 datastream.Close();
-                 response.Close();
-                 //Buffer.Log(string.Format("Ftp文件{1}删除成功!", DateTime.Now.ToString(), fileName));
-             }
-             catch (Exception ex)
-             {
-                 throw ex;
-             }
-         }       
+                FtpWebResponse response = (FtpWebResponse)reqFTP.GetResponse();
+                long size = response.ContentLength;
+                Stream datastream = response.GetResponseStream();
+                StreamReader sr = new StreamReader(datastream);
+                result = sr.ReadToEnd();
+                sr.Close();
+                datastream.Close();
+                response.Close();
+                //Buffer.Log(string.Format("Ftp文件{1}删除成功!", DateTime.Now.ToString(), fileName));
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
     }
 }

+ 9 - 0
UAS_MES_PW/UAS_MES_PW.csproj

@@ -271,6 +271,12 @@
     <Compile Include="CustomControl\CustomCheckBox\LockCheckBox.Designer.cs">
       <DependentUpon>LockCheckBox.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\CustomCheckBox\ReSetCheckBox.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CustomControl\CustomCheckBox\ReSetCheckBox.Designer.cs">
+      <DependentUpon>ReSetCheckBox.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\CustomTabControl\CustomTabControl.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -1180,6 +1186,9 @@
     <EmbeddedResource Include="CustomControl\CustomCheckBox\LockCheckBox.resx">
       <DependentUpon>LockCheckBox.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="CustomControl\CustomCheckBox\ReSetCheckBox.resx">
+      <DependentUpon>ReSetCheckBox.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="CustomControl\CustomTabControl\CustomTabControl.resx">
       <DependentUpon>CustomTabControl.cs</DependentUpon>
     </EmbeddedResource>