放大镜返回值控件赋值方式修改，以及包含放大镜到处DBFind界面的统一赋值方式更新

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.cs

@@ -267,21 +267,13 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
             if (TextBox.Text != "")
             {
                 DataHelper dh = new DataHelper();
-                List<string> fields = new List<string>();
-                //获取查询的字段
-                string[] field = selectField.Replace(",", "#").Trim().Split('#');
-                for (int i = 0; i < field.Length; i++)
-                {
-                    if (i % 2 == 0)
-                        fields.Add(field[i]);
-                }
                 string sql;
                 //将查询到的结果返回界面
                 if (TextBox.Text != null) { 
-                 sql = "select " + BaseUtil.AddField(fields.ToArray()) + " from " + tableName + " where " + Name + "='" + TextBox.Text.ToUpper() + "'";
+                 sql = "select " + BaseUtil.AddField(setValueField) + " from " + tableName + " where " + Name + "='" + TextBox.Text + "'";
                 }
                 else { 
-                 sql = "select " + BaseUtil.AddField(fields.ToArray()) + " from " + tableName + " where " + Name + "='" + db.TextBoxValue1 + "'";
+                 sql = "select " + BaseUtil.AddField(setValueField) + " from " + tableName + " where " + Name + "='" + db.TextBoxValue1 + "'";
                 }
                 if (condition != null)
                 {

UAS-MES/CustomControl/TextBoxWithIcon/SearchTextBox.cs

@@ -324,22 +324,14 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
             if (TextBox.Text != "")
             {
                 DataHelper dh = new DataHelper();
-                List<string> fields = new List<string>();
-                //获取查询的字段
-                string[] field = selectField.Replace(",", "#").Trim().Split('#');
-                for (int i = 0; i < field.Length; i++)
-                {
-                    if (i % 2 == 0)
-                        fields.Add(field[i]);
-                }
                 string sql;
                 //将查询到的结果返回界面
                 if (TextBox.Text != null)
                 {
-                     sql = "select " + BaseUtil.AddField(fields.ToArray()) + " from " + tableName + " where " + Name + "='" + TextBox.Text + "'";
+                     sql = "select " + BaseUtil.AddField(setValueField) + " from " + tableName + " where " + Name + "='" + TextBox.Text + "'";
                 }
                 else {
-                    sql = "select " + BaseUtil.AddField(fields.ToArray()) + " from " + tableName + " where " + Name + "='" + db.TextBoxValue1 + "'";
+                    sql = "select " + BaseUtil.AddField(setValueField) + " from " + tableName + " where " + Name + "='" + db.TextBoxValue1 + "'";
                 }
                     if (condition != null)
                 {

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -40,10 +40,12 @@ namespace UAS_MES.Make
 
         DataHelper dh;
         LogStringBuilder sql = new LogStringBuilder();
-
+        DataTable DBFind;
         DataTable dt;
         //保存ListB中的数据
         DataTable dt1;
+        
+
 
         AutoSizeFormClass asc = new AutoSizeFormClass();
         public Make_FeedingCollection()
@@ -67,6 +69,13 @@ namespace UAS_MES.Make
             ma_code.DBTitle = "工单查询";
             ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_qty", "pr_detail" };
             ma_code.Condition = "ma_statuscode='STARTED'";
+            ma_code.DbChange += Ma_code_DBChange;
+        }
+
+        private void Ma_code_DBChange(object sender, EventArgs e)
+        {
+            DBFind = ma_code.ReturnData;
+            BaseUtil.SetFormValue(this.Controls, DBFind);
         }
 
         private void 上料采集_SizeChanged(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_NewPallet.cs

@@ -1,12 +1,15 @@
 using System;
+using System.Data;
 using System.Windows.Forms;
 using UAS_MES.DataOperate;
+using UAS_MES.PublicMethod;
 
 namespace UAS_MES.Make
 {
     public partial class Make_NewPallet : Form
     {
         DataHelper dh;
+        DataTable Dbfind;
         //生成的箱类型，2表示大箱号，3表示栈板号
         string pa_type = "";
 
@@ -35,6 +38,13 @@ namespace UAS_MES.Make
             pr_code.SetValueField = new string[] { "pr_code" };
             pr_code.TableName = "product";
             pr_code.SelectField = "pr_code # 物料编号,pr_detail # 物料名称,pr_kind # 物料种类,pr_spec # 物料规格";
+            pr_code.DbChange += Pr_code_DbChange;
+        }
+
+        private void Pr_code_DbChange(object sender, EventArgs e)
+        {
+            Dbfind = pr_code.ReturnData;
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
         }
 
         private void pr_code_UserControlTextChanged(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -19,6 +19,7 @@ namespace UAS_MES.Make
         AutoSizeFormClass asc = new AutoSizeFormClass();
         ApplicationClass lbl;
         Thread thread;
+        DataTable Dbfind;
 
         public Make_PackageCollection()
         {
@@ -42,10 +43,17 @@ namespace UAS_MES.Make
             ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "ma_prodname", "pr_id" };
             ma_code.TableName = "Make left join product on  ma_prodcode=pr_code";
             ma_code.SelectField = "pr_id # 物料ID,ma_code # 工单号,ma_prodcode # 物料编号,ma_qty # 数量,ma_prodname # 物料名册,ma_wccode # 工作中心编号";
+            ma_code.DbChange += Ma_code_DbChange;
             PrintNum.Text = "1";
             asc.controllInitializeSize(this);
         }
 
+        private void Ma_code_DbChange(object sender, EventArgs e)
+        {
+            Dbfind = ma_code.ReturnData;
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
+        }
+
         private void 包装采集_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);

UAS-MES/FunctionCode/Make/Make_PositionStock.cs

@@ -19,6 +19,8 @@ namespace UAS_MES.Make
 
         LogStringBuilder sql = new LogStringBuilder();
 
+        DataTable Dbfind;
+
         string ma_id;
 
         public Make_PositionStock()
@@ -37,11 +39,18 @@ namespace UAS_MES.Make
             ma_code.DBTitle = "工单查询";
             ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "pr_detail", "ma_craftcode" };
             ma_code.Condition = "ma_statuscode='STARTED'";
+            ma_code.DbChange += Ma_code_DbChange;
 
             sc_linecode.Text = User.UserLineCode;
             sc_stepcode.Text = User.CurrentStepCode;
         }
 
+        private void Ma_code_DbChange(object sender, EventArgs e)
+        {
+            Dbfind = ma_code.ReturnData;
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
+        }
+
         private void 岗位备料_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -17,6 +17,8 @@ namespace UAS_MES.Make
 
         DataTable dt;
 
+        DataTable Dbfind;
+
         string bsncode = "";//转换前序列号
 
         string errorMessage = "";
@@ -42,6 +44,13 @@ namespace UAS_MES.Make
             ma_code.FormName = Name;
             ma_code.SetValueField = new string[] { "ma_code", "ma_prodcode", "pr_detail" };
             ma_code.Condition = "ma_statuscode='STARTED'";
+            ma_code.DbChange += Ma_code_DbChange;
+        }
+
+        private void Ma_code_DbChange(object sender, EventArgs e)
+        {
+            Dbfind = ma_code.ReturnData;
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
         }
 
         private void sncode_KeyDown(object sender, KeyEventArgs e)

UAS-MES/PublicMethod/ftpOperater.cs

@@ -217,6 +217,38 @@ namespace UAS_MES.PublicMethod
             }
         }
 
+             /// <summary>
+         /// 删除文件
+         /// </summary>
+         /// <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;
+                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;
+             }
+         }
+
        
     }
 }