Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/DataOperate/DataHelper.cs

@@ -57,12 +57,23 @@ namespace UAS_MES.DataOperate
         {
             DataTable dt = new DataTable();
             string sql = "select " + Field + " from " + TableName + " where " + Condition;
-
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter();
             ad.SelectCommand = command;
-            ad.Fill(dt);
+            try
+            {
+                ad.Fill(dt);
+            }
+            catch (Exception)
+            {
+                connection = new OracleConnection(DBConnectionString);
+                connection.Open();
+                command = new OracleCommand(sql, connection);
+                ad = new OracleDataAdapter();
+                ad.SelectCommand = command;
+                ad.Fill(dt);
+            }
             ad.Dispose();
             command.Dispose();
             if (dt.Rows.Count > 0)
@@ -75,7 +86,6 @@ namespace UAS_MES.DataOperate
             }
         }
 
-
         /// <summary>
         /// 执行打印的SQL
         /// </summary>
@@ -101,7 +111,6 @@ namespace UAS_MES.DataOperate
                 {
                     command.Parameters.Add("Param" + i, OracleDbType.Varchar2, Parameters[i], ParameterDirection.Input);
                 }
-
                 OracleDataAdapter ad = new OracleDataAdapter(command);
                 DataTable dt = new DataTable();
                 ad.Fill(dt);
@@ -120,7 +129,6 @@ namespace UAS_MES.DataOperate
         {
             DataTable dt = new DataTable();
             string sql = "select count(1) from " + TableName + " where " + Condition;
-
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
@@ -158,11 +166,22 @@ namespace UAS_MES.DataOperate
             string sql = "select ";
             sql += AddField(Fields);
             sql += " from " + TableName + " where " + Condition + " and rownum=1";
-
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
-            ad.Fill(dt);
+            try
+            {
+                ad.Fill(dt);
+            }
+            catch (Exception)
+            {
+                connection = new OracleConnection(DBConnectionString);
+                connection.Open();
+                command = new OracleCommand(sql, connection);
+                ad = new OracleDataAdapter();
+                ad.SelectCommand = command;
+                ad.Fill(dt);
+            }
             ad.Dispose();
             command.Dispose();
             return dt;
@@ -240,7 +259,19 @@ namespace UAS_MES.DataOperate
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
-            ad.Fill(dt);
+            try
+            {
+                ad.Fill(dt);
+            }
+            catch (Exception)
+            {
+                connection = new OracleConnection(DBConnectionString);
+                connection.Open();
+                command = new OracleCommand(sql, connection);
+                ad = new OracleDataAdapter();
+                ad.SelectCommand = command;
+                ad.Fill(dt);
+            }
             ad.Dispose();
             command.Dispose();
             return dt;
@@ -259,10 +290,18 @@ namespace UAS_MES.DataOperate
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
             ad.SelectCommand = command;
-            ad.Fill(dt);
-            foreach (DataColumn dc in dt.Columns)
+            try
             {
-                dc.Caption = "测试测试";
+                ad.Fill(dt);
+            }
+            catch (Exception)
+            {
+                connection = new OracleConnection(DBConnectionString);
+                connection.Open();
+                command = new OracleCommand(sql, connection);
+                ad = new OracleDataAdapter();
+                ad.SelectCommand = command;
+                ad.Fill(dt);
             }
             ad.Dispose();
             command.Dispose();
@@ -430,128 +469,6 @@ namespace UAS_MES.DataOperate
             }
         }
 
-        /// <summary>
-        ///  获取配置列表中的数据，支持DaatList,Form,DetailGrid
-        /// </summary>
-        /// <param name="Caller"></param>
-        /// <param name="Type"></param>
-        /// <param name="condition"></param>
-        /// <returns></returns>
-        public DataTable GetConfigureData(string Caller, string Type, string condition)
-        {
-            DataTable dt = new DataTable();
-            //用于拼接SQL语句
-            StringBuilder Sql = new StringBuilder();
-            //用于设置不同Type时设置对应表的字段
-            string getField = "";
-            string getCaption = "";
-            string getTable = "";
-            switch (Type.ToUpper())
-            {
-                case "DATALIST":
-                    getField = "dld_field"; getCaption = "dld_caption"; getTable = "dld_table";
-                    Sql.Append("select * from datalistdetail where dld_caller='" + Caller + "'");
-                    break;
-                case "FORM":
-                    getField = "fd_field"; getCaption = "fd_caption"; getTable = "fd_table";
-                    Sql.Append("select * from formdetail where fd_foid=( select fo_id from form where fo_caller='" + Caller + "')");
-                    break;
-                case "DETAILGRID":
-                    getField = "dg_field"; getCaption = "dg_caption"; getTable = "dg_table";
-                    Sql.Append("select * from detailgrid  where dg_caller='" + Caller + "'");
-                    break;
-            }
-            command = new OracleCommand(Sql.ToString(), connection);
-            OracleDataAdapter ad = new OracleDataAdapter(command);
-            ad.Fill(dt);
-            //清除掉之前的内容重新拼接
-            Sql.Clear();
-            Sql.Append("select ");
-            string[] field = new string[dt.Rows.Count];
-            string[] caption = new string[dt.Rows.Count];
-            DataTable dt1 = new DataTable();
-            //记录描述和字段名称
-            foreach (DataRow dr in dt.Rows)
-            {
-                field[dt.Rows.IndexOf(dr)] = dr[getCaption].ToString();
-                caption[dt.Rows.IndexOf(dr)] = dr[getField].ToString();
-                Sql.Append(dr[getField] + ",");
-            }
-            //调用substring是为了去除之前拼接多出来的一个逗号
-            string sql = Sql.Remove(Sql.Length - 1, 1).ToString() + " from " + dt.Rows[0][getTable] + " where " + condition;
-            //调用一个新的构造DataTable用来存放返回的数据
-            dt1 = (DataTable)ExecuteSql(sql, "select");
-            //给DataTable加上列名和描述，列名是中文字段，描述是数据库实际的字段名称
-            for (int i = 0; i < field.Length; i++)
-            {
-                dt1.Columns[i].ColumnName = field[i];
-                dt1.Columns[i].Caption = caption[i];
-            }
-            //返回的第一条数据是SQL，后面的是实际的列名
-            ad.Dispose();
-            command.Dispose();
-            return dt1;
-        }
-
-        /// <summary>
-        /// 查询配置的字段,Type是查询DataList，Form还是DetailGrid
-        /// </summary>
-        /// <param name="Caller"></param>
-        /// <param name="Type"></param>
-        /// <returns></returns>
-        public DataTable GetConfigureData(string Caller, string Type)
-        {
-            DataTable dt = new DataTable();
-            //用于拼接SQL语句
-            StringBuilder Sql = new StringBuilder();
-            //用于设置不同Type时设置对应表的字段
-            string getField = "";
-            string getCaption = "";
-            string getTable = "";
-            switch (Type.ToUpper())
-            {
-                case "DATALIST":
-                    getField = "dld_field"; getCaption = "dld_caption"; getTable = "dld_table";
-                    Sql.Append("select * from datalistdetail where dld_caller='" + Caller + "'");
-                    break;
-                case "FORM":
-                    getField = "fd_field"; getCaption = "fd_caption"; getTable = "fd_table";
-                    Sql.Append("select * from formdetail where fd_foid=( select fo_id from form where fo_caller='" + Caller + "')");
-                    break;
-                case "DETAILGRID":
-                    getField = "dg_field"; getCaption = "dg_caption"; getTable = "dg_table";
-                    Sql.Append("select * from detailgrid  where dg_caller='" + Caller + "'");
-                    break;
-            }
-            command = new OracleCommand(Sql.ToString(), connection);
-            OracleDataAdapter ad = new OracleDataAdapter(command);
-            ad.Fill(dt);
-            //清除掉之前的内容重新拼接
-            Sql.Clear();
-            Sql.Append("select ");
-            //用于记录实际的列名,+1的目的是为了存放SQL
-            string[] field = new string[dt.Rows.Count];
-            string[] caption = new string[dt.Rows.Count];
-            DataTable dt1 = new DataTable();
-            foreach (DataRow dr in dt.Rows)
-            {
-                field[dt.Rows.IndexOf(dr)] = dr[getCaption].ToString();
-                caption[dt.Rows.IndexOf(dr)] = dr[getField].ToString();
-                Sql.Append(dr[getField] + ",");
-            }
-            string sql = Sql.Remove(Sql.Length - 1, 1).ToString() + " from " + dt.Rows[0][getTable];
-            dt1 = (DataTable)ExecuteSql(sql, "select");
-            //设置DataTable的列名和描述
-            for (int i = 0; i < field.Length; i++)
-            {
-                dt1.Columns[i].ColumnName = field[i];
-                dt1.Columns[i].Caption = caption[i];
-            }
-            ad.Dispose();
-            command.Dispose();
-            return dt1;
-        }
-
         /// <summary>
         /// 检测内容是否存在
         /// </summary>
@@ -565,7 +482,6 @@ namespace UAS_MES.DataOperate
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
             DataTable dt = new DataTable();
-
             ad.Fill(dt);
             ad.Dispose();
             command.Dispose();
@@ -609,38 +525,60 @@ namespace UAS_MES.DataOperate
                 for (int i = 0; i < addpar.Length; i++)
                     command.Parameters.Add(new OracleParameter(addpar[i].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
             }
-
             switch (Type.ToUpper())
             {
                 case "SELECT":
+                    OracleDataAdapter ad = new OracleDataAdapter(command);
                     result = new DataTable();
                     try
                     {
-                        OracleDataAdapter ad = new OracleDataAdapter(command);
                         ad.Fill((DataTable)result);
-                        ad.Dispose();
-                        //成功执行后将重复连接数置为0
-                        ReconnectTime = 0;
                     }
                     catch (Exception)
                     {
-                        if (ReconnectTime == 0)
-                        {
-                            //重置的数据库链接后只执行一次
-                            ReconnectTime = ReconnectTime + 1;
-                            connection = new OracleConnection(DBConnectionString);
-                            result = ExecuteSql(SQL, Type, names);
-                        }
+                        connection = new OracleConnection(DBConnectionString);
+                        connection.Open();
+                        command = new OracleCommand(SQL, connection);
+                        ad = new OracleDataAdapter();
+                        ad.SelectCommand = command;
+                        ad.Fill((DataTable)result);
                     }
                     break;
                 case "DELETE":
-                    result = command.ExecuteNonQuery();
+                    try
+                    {
+                        result=command.ExecuteNonQuery();
+                    }
+                    catch (Exception)
+                    {
+                        command.Connection = new OracleConnection(DBConnectionString);
+                        command.Connection.Open();
+                        result=command.ExecuteNonQuery();
+                    }
                     break;
                 case "UPDATE":
-                    result = command.ExecuteNonQuery();
+                    try
+                    {
+                        result = command.ExecuteNonQuery();
+                    }
+                    catch (Exception)
+                    {
+                        command.Connection = new OracleConnection(DBConnectionString);
+                        command.Connection.Open();
+                        result = command.ExecuteNonQuery();
+                    }
                     break;
                 case "INSERT":
-                    result = command.ExecuteNonQuery();
+                    try
+                    {
+                        result = command.ExecuteNonQuery();
+                    }
+                    catch (Exception)
+                    {
+                        command.Connection = new OracleConnection(DBConnectionString);
+                        command.Connection.Open();
+                        result = command.ExecuteNonQuery();
+                    }
                     break;
             }
             command.Dispose();
@@ -663,11 +601,22 @@ namespace UAS_MES.DataOperate
         {
             DataTable dt = new DataTable();
             string sql = "select distinct count('" + Field + "') from " + TableName;
-
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
-            ad.Fill(dt);
+            try
+            {
+                ad.Fill(dt);
+            }
+            catch (Exception)
+            {
+                connection = new OracleConnection(DBConnectionString);
+                connection.Open();
+                command = new OracleCommand(sql, connection);
+                ad = new OracleDataAdapter();
+                ad.SelectCommand = command;
+                ad.Fill(dt);
+            }
             ad.Dispose();
             command.Dispose();
             return int.Parse(dt.Rows[0][0].ToString());
@@ -699,7 +648,16 @@ namespace UAS_MES.DataOperate
             Reconnect(command);
             command.ArrayBindCount = DeleteID.Length;
             command.Parameters.Add(new OracleParameter("DeleteID", OracleDbType.Long, DeleteID, ParameterDirection.Input));
-            command.ExecuteNonQuery();
+            try
+            {
+                command.ExecuteNonQuery();
+            }
+            catch (Exception)
+            {
+                command.Connection = new OracleConnection(DBConnectionString);
+                command.Connection.Open();
+                command.ExecuteNonQuery();
+            }
             command.Dispose();
         }
 
@@ -848,7 +806,16 @@ namespace UAS_MES.DataOperate
             {
                 command.Parameters.Add(new OracleParameter(names[0][i - 1].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
             }
-            command.ExecuteNonQuery();
+            try
+            {
+                command.ExecuteNonQuery();
+            }
+            catch (Exception)
+            {
+                command.Connection = new OracleConnection(DBConnectionString);
+                command.Connection.Open();
+                command.ExecuteNonQuery();
+            }
             command.Dispose();
         }
 
@@ -863,28 +830,17 @@ namespace UAS_MES.DataOperate
             {
                 command.Parameters.Add(new OracleParameter(param[i].ToString(), OracleDbType.Varchar2, param1[i], ParameterDirection.Input));
             }
-            command.ExecuteNonQuery();
-            command.Dispose();
-        }
-
-
-        /// <summary>
-        /// 查询DataList配置的字段
-        /// </summary>
-        /// <param name="TableName"></param>
-        /// <param name="Caller"></param>
-        /// <returns></returns>
-        public string GetDataList(string TableName, string Caller)
-        {
-            DataTable dt = new DataTable();
-            string SQL = " select listagg(dld_field,',') within group (order by dld_id)  from datalistdetail where dld_caller='" + Caller + "'";
-            command = new OracleCommand(SQL, connection);
-            Reconnect(command);
-            OracleDataAdapter ad = new OracleDataAdapter(command);
-            ad.Fill(dt);
-            ad.Dispose();
+            try
+            {
+                command.ExecuteNonQuery();
+            }
+            catch (Exception)
+            {
+                command.Connection = new OracleConnection(DBConnectionString);
+                command.Connection.Open();
+                command.ExecuteNonQuery();
+            }
             command.Dispose();
-            return dt.Rows[0][0].ToString();
         }
 
         /// <summary>
@@ -952,10 +908,18 @@ namespace UAS_MES.DataOperate
         public string UpdateByCondition(string TableName, string update, string condition)
         {
             string sql = "update " + TableName + " set " + update + " where " + condition;
-
             command = new OracleCommand(sql, connection);
             Reconnect(command);
-            command.ExecuteNonQuery();
+            try
+            {
+                command.ExecuteNonQuery();
+            }
+            catch (Exception)
+            {
+                command.Connection = new OracleConnection(DBConnectionString);
+                command.Connection.Open();
+                command.ExecuteNonQuery();
+            }
             command.Dispose();
             return sql;
         }
@@ -974,7 +938,16 @@ namespace UAS_MES.DataOperate
             command.CommandType = CommandType.StoredProcedure;
             for (int i = 0; i < param.Length; i++)
                 command.Parameters.Add(new OracleParameter(param[i].ToString(), OracleDbType.Varchar2, 200, param[i], ParameterDirection.InputOutput));
-            command.ExecuteNonQuery();
+            try
+            {
+                command.ExecuteNonQuery();
+            }
+            catch (Exception)
+            {
+                command.Connection = new OracleConnection(DBConnectionString);
+                command.Connection.Open();
+                command.ExecuteNonQuery();
+            }
             for (int i = 0; i < command.Parameters.Count; i++)
                 param[i] = command.Parameters[i].Value.ToString();
             command.Dispose();
@@ -996,9 +969,17 @@ namespace UAS_MES.DataOperate
                 {
                     if (!String.IsNullOrEmpty(sql))
                     {
-
                         command.CommandText = sql;
-                        command.ExecuteNonQuery();
+                        try
+                        {
+                            command.ExecuteNonQuery();
+                        }
+                        catch (Exception)
+                        {
+                            command.Connection = new OracleConnection(DBConnectionString);
+                            command.Connection.Open();
+                            command.ExecuteNonQuery();
+                        }
                     }
                 }
                 tx.Commit();
@@ -1062,7 +1043,19 @@ namespace UAS_MES.DataOperate
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter();
             ad.SelectCommand = command;
-            ad.Fill(dt);
+            try
+            {
+                ad.Fill(dt);
+            }
+            catch (Exception)
+            {
+                connection = new OracleConnection(DBConnectionString);
+                connection.Open();
+                command = new OracleCommand(sql, connection);
+                ad = new OracleDataAdapter();
+                ad.SelectCommand = command;
+                ad.Fill(dt);
+            }
             if (dt.Rows.Count > 0)
             {
                 ad.Dispose();

UAS-MES/Login.cs

@@ -49,7 +49,7 @@ namespace UAS_MES
             //显示上次用户登录的用户名，将输入框定位到密码
             UserName.Text = Properties.Settings.Default.LastLoginUser;
             Source.Text = Properties.Settings.Default.LastLoginResource;
-           
+
             if (UserName.Text != "")
                 PassWord.Select();
             else
@@ -89,7 +89,7 @@ namespace UAS_MES
                     //设置屏幕的宽高信息 
                     SystemInf.ScreenWidth = Screen.PrimaryScreen.WorkingArea.Width;
                     SystemInf.ScreenHeight = Screen.PrimaryScreen.WorkingArea.Height;
-                    SystemInf.ConnectionString = "Data Source=" + DbComboxData.Rows[i]["ma_address"] + ";User ID=" + DbComboxData.Rows[i]["ma_user"] + ";PassWord=" + DbComboxData.Rows[i]["ms_pwd"];
+                    SystemInf.ConnectionString = "Connection Timeout=5;Pooling=false;Password=" + DbComboxData.Rows[i]["ms_pwd"] + ";User ID=" + DbComboxData.Rows[i]["ma_user"] + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" + DbComboxData.Rows[i]["ma_address"].ToString().Split('/')[0] + ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)))";
                     DataHelper.DBConnectionString = SystemInf.ConnectionString;
                     //重新执行一遍构造函数使得重置之后的链接字符串生效
                     dh = new DataHelper();

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1171,7 +1171,7 @@ namespace UAS_MES.PublicMethod
             DataTable dt = (DataTable)dh.ExecuteSql("select cm_id from craftmaterial  where cm_sncode='" + iSnCode + "' and cm_barcode='" + iBarcode + "' and cm_soncode='" + iSonCode + "'", "select");
             if (dt.Rows.Count > 0)
             {
-                oErrorMessage = "条码已经上料";
+                oErrorMessage = "条码"+ iBarcode + "已经上料";
                 return false;
             }
             else

UAS_KanBan/CustomControl/ValueLabel.Designer.cs

@@ -0,0 +1,42 @@
+namespace UAS_KanBan.CustomControl
+{
+    partial class ValueLabel
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.SuspendLayout();
+            // 
+            // ValueLabel
+            // 
+            this.Size = new System.Drawing.Size(100, 0);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}

UAS_KanBan/CustomControl/ValueLabel.cs

@@ -0,0 +1,13 @@
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace UAS_KanBan.CustomControl
+{
+    public partial class ValueLabel : Label
+    {
+        public ValueLabel()
+        {
+            InitializeComponent();
+        }
+    }
+}

TestProject/Form1.resx → UAS_KanBan/CustomControl/ValueLabel.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
 </root>

UAS_KanBan/Process.Designer.cs

@@ -55,7 +55,7 @@
             this.Line = new CCWin.SkinControl.SkinLabel();
             this.Title2 = new CCWin.SkinControl.SkinLabel();
             this.Refresh = new System.Windows.Forms.Timer(this.components);
-            this.机型 = new CCWin.SkinControl.SkinLabel();
+            this.机型 = new UAS_KanBan.CustomControl.ValueLabel();
             ((System.ComponentModel.ISupportInitialize)(this.Logo)).BeginInit();
             this.SuspendLayout();
             // 
@@ -185,7 +185,7 @@
             this.产出_label.BackColor = System.Drawing.Color.Transparent;
             this.产出_label.BorderColor = System.Drawing.Color.White;
             this.产出_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.产出_label.Location = new System.Drawing.Point(7, 488);
+            this.产出_label.Location = new System.Drawing.Point(7, 518);
             this.产出_label.Name = "产出_label";
             this.产出_label.Size = new System.Drawing.Size(243, 70);
             this.产出_label.TabIndex = 9;
@@ -200,7 +200,7 @@
             this.投入_label.BackColor = System.Drawing.Color.Transparent;
             this.投入_label.BorderColor = System.Drawing.Color.White;
             this.投入_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.投入_label.Location = new System.Drawing.Point(7, 376);
+            this.投入_label.Location = new System.Drawing.Point(7, 393);
             this.投入_label.Name = "投入_label";
             this.投入_label.Size = new System.Drawing.Size(243, 70);
             this.投入_label.TabIndex = 10;
@@ -215,7 +215,7 @@
             this.收益率_label.BackColor = System.Drawing.Color.Transparent;
             this.收益率_label.BorderColor = System.Drawing.Color.White;
             this.收益率_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.收益率_label.Location = new System.Drawing.Point(638, 376);
+            this.收益率_label.Location = new System.Drawing.Point(638, 393);
             this.收益率_label.Name = "收益率_label";
             this.收益率_label.Size = new System.Drawing.Size(243, 70);
             this.收益率_label.TabIndex = 13;
@@ -230,7 +230,7 @@
             this.故障数_label.BackColor = System.Drawing.Color.Transparent;
             this.故障数_label.BorderColor = System.Drawing.Color.White;
             this.故障数_label.Font = new System.Drawing.Font("宋体", 52F, System.Drawing.FontStyle.Bold);
-            this.故障数_label.Location = new System.Drawing.Point(638, 488);
+            this.故障数_label.Location = new System.Drawing.Point(638, 518);
             this.故障数_label.Name = "故障数_label";
             this.故障数_label.Size = new System.Drawing.Size(243, 70);
             this.故障数_label.TabIndex = 12;
@@ -296,11 +296,12 @@
             this.投入.AutoSize = true;
             this.投入.BackColor = System.Drawing.Color.Transparent;
             this.投入.BorderColor = System.Drawing.Color.Red;
-            this.投入.Font = new System.Drawing.Font("宋体", 51.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.投入.BorderSize = 0;
+            this.投入.Font = new System.Drawing.Font("宋体", 52.75F, System.Drawing.FontStyle.Bold);
             this.投入.ForeColor = System.Drawing.Color.Red;
-            this.投入.Location = new System.Drawing.Point(340, 376);
+            this.投入.Location = new System.Drawing.Point(340, 393);
             this.投入.Name = "投入";
-            this.投入.Size = new System.Drawing.Size(0, 69);
+            this.投入.Size = new System.Drawing.Size(0, 71);
             this.投入.TabIndex = 19;
             this.投入.Tag = "AutoFont";
             // 
@@ -311,11 +312,12 @@
             this.产出.AutoSize = true;
             this.产出.BackColor = System.Drawing.Color.Transparent;
             this.产出.BorderColor = System.Drawing.Color.Red;
-            this.产出.Font = new System.Drawing.Font("宋体", 51.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.产出.BorderSize = 0;
+            this.产出.Font = new System.Drawing.Font("宋体", 52.75F, System.Drawing.FontStyle.Bold);
             this.产出.ForeColor = System.Drawing.Color.Red;
-            this.产出.Location = new System.Drawing.Point(340, 488);
+            this.产出.Location = new System.Drawing.Point(340, 518);
             this.产出.Name = "产出";
-            this.产出.Size = new System.Drawing.Size(0, 69);
+            this.产出.Size = new System.Drawing.Size(0, 71);
             this.产出.TabIndex = 18;
             this.产出.Tag = "AutoFont";
             // 
@@ -326,11 +328,12 @@
             this.收益率.AutoSize = true;
             this.收益率.BackColor = System.Drawing.Color.Transparent;
             this.收益率.BorderColor = System.Drawing.Color.Red;
-            this.收益率.Font = new System.Drawing.Font("宋体", 51.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.收益率.BorderSize = 0;
+            this.收益率.Font = new System.Drawing.Font("宋体", 52.75F, System.Drawing.FontStyle.Bold);
             this.收益率.ForeColor = System.Drawing.Color.Red;
-            this.收益率.Location = new System.Drawing.Point(898, 376);
+            this.收益率.Location = new System.Drawing.Point(898, 393);
             this.收益率.Name = "收益率";
-            this.收益率.Size = new System.Drawing.Size(0, 69);
+            this.收益率.Size = new System.Drawing.Size(0, 71);
             this.收益率.TabIndex = 22;
             this.收益率.Tag = "AutoFont";
             // 
@@ -341,11 +344,12 @@
             this.故障数.AutoSize = true;
             this.故障数.BackColor = System.Drawing.Color.Transparent;
             this.故障数.BorderColor = System.Drawing.Color.Red;
-            this.故障数.Font = new System.Drawing.Font("宋体", 51.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.故障数.BorderSize = 0;
+            this.故障数.Font = new System.Drawing.Font("宋体", 52.75F, System.Drawing.FontStyle.Bold);
             this.故障数.ForeColor = System.Drawing.Color.Red;
-            this.故障数.Location = new System.Drawing.Point(898, 488);
+            this.故障数.Location = new System.Drawing.Point(898, 518);
             this.故障数.Name = "故障数";
-            this.故障数.Size = new System.Drawing.Size(0, 69);
+            this.故障数.Size = new System.Drawing.Size(0, 71);
             this.故障数.TabIndex = 21;
             this.故障数.Tag = "AutoFont";
             // 
@@ -356,11 +360,12 @@
             this.直通率.AutoSize = true;
             this.直通率.BackColor = System.Drawing.Color.Transparent;
             this.直通率.BorderColor = System.Drawing.Color.Red;
-            this.直通率.Font = new System.Drawing.Font("宋体", 51.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.直通率.BorderSize = 0;
+            this.直通率.Font = new System.Drawing.Font("宋体", 52.75F, System.Drawing.FontStyle.Bold);
             this.直通率.ForeColor = System.Drawing.Color.Red;
             this.直通率.Location = new System.Drawing.Point(898, 265);
             this.直通率.Name = "直通率";
-            this.直通率.Size = new System.Drawing.Size(0, 69);
+            this.直通率.Size = new System.Drawing.Size(0, 71);
             this.直通率.TabIndex = 20;
             this.直通率.Tag = "AutoFont";
             // 
@@ -409,12 +414,11 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.机型.AutoSize = true;
             this.机型.BackColor = System.Drawing.Color.Transparent;
-            this.机型.BorderColor = System.Drawing.Color.Red;
-            this.机型.Font = new System.Drawing.Font("宋体", 51.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.机型.Font = new System.Drawing.Font("宋体", 52.25F, System.Drawing.FontStyle.Bold);
             this.机型.ForeColor = System.Drawing.Color.Red;
             this.机型.Location = new System.Drawing.Point(340, 265);
             this.机型.Name = "机型";
-            this.机型.Size = new System.Drawing.Size(0, 69);
+            this.机型.Size = new System.Drawing.Size(0, 70);
             this.机型.TabIndex = 17;
             this.机型.Tag = "AutoFont";
             // 
@@ -493,6 +497,6 @@
         private CCWin.SkinControl.SkinLabel Line;
         private CCWin.SkinControl.SkinLabel Title2;
         private System.Windows.Forms.Timer Refresh;
-        private CCWin.SkinControl.SkinLabel 机型;
+        private CustomControl.ValueLabel 机型;
     }
 }

UAS_KanBan/Process.cs

@@ -7,6 +7,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+using UAS_KanBan.CustomControl;
 
 namespace UAS_KanBan
 {
@@ -25,9 +26,10 @@ namespace UAS_KanBan
             int WorkHeight = Screen.PrimaryScreen.Bounds.Width;
             if (WorkHeight <= 1024)
             {
+                机型.MaximumSize = new Size(300, 0);
                 for (int i = 0; i < this.Controls.Count; i++)
                 {
-                    if (Controls[i] is Label)
+                    if (Controls[i] is Label ||Controls[i] is ValueLabel)
                     {
                         if (Controls[i].Tag != null && Controls[i].Tag.ToString() == "AutoFont")
                             Controls[i].Font = new Font("宋体", Controls[i].Font.Size - 10, FontStyle.Bold);

UAS_KanBan/Setting.Designer.cs

@@ -281,8 +281,6 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Menu;
             this.ClientSize = new System.Drawing.Size(677, 401);
-            this.ControlBoxActive = System.Drawing.Color.DeepSkyBlue;
-            this.ControlBoxDeactive = System.Drawing.Color.DeepSkyBlue;
             this.Controls.Add(this.Start);
             this.Controls.Add(this.MasterCombo);
             this.Controls.Add(this.MasterCombo_Label);

UAS_KanBan/UAS_KanBan.csproj

@@ -14,7 +14,7 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
     <IsWebBootstrapper>true</IsWebBootstrapper>
-    <PublishUrl>ftp://192.168.253.9/MESSetting/KanBan/</PublishUrl>
+    <PublishUrl>E:\s_user_site\KanBan\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
@@ -24,14 +24,14 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>true</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <InstallUrl>http://218.17.158.219:8888/KanBan/</InstallUrl>
+    <InstallUrl>http://172.16.11.99/KanBan/</InstallUrl>
     <ProductName>UAS看板</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>UAS看板</SuiteName>
-    <MinimumRequiredVersion>1.0.0.12</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.0.0.14</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>13</ApplicationRevision>
+    <ApplicationRevision>15</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -67,7 +67,7 @@
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Resources\board_windows_48px_14504_easyicon.net.ico</ApplicationIcon>
@@ -101,6 +101,12 @@
     <Compile Include="BaseForm.Designer.cs">
       <DependentUpon>BaseForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\ValueLabel.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CustomControl\ValueLabel.Designer.cs">
+      <DependentUpon>ValueLabel.cs</DependentUpon>
+    </Compile>
     <Compile Include="DataHelper.cs" />
     <Compile Include="Process.cs">
       <SubType>Form</SubType>
@@ -116,6 +122,9 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="CustomControl\ValueLabel.resx">
+      <DependentUpon>ValueLabel.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Process.resx">
       <DependentUpon>Process.cs</DependentUpon>
     </EmbeddedResource>

UAS_XmlAnalysor/Form1.cs

@@ -138,8 +138,8 @@ namespace UAS_XmlAnalysor
             string date = testDate + " " + testTime;
             string sql = "insert into STEPTESTDETAIL(std_id,std_makecode,std_sn,std_subclass1,std_testresult,std_indate,";
             sql += "std_rescode,std_testdate,std_testtime,std_date) values(STEPTESTDETAIL_seq.nextval, '" + iMakeCode + "', ";
-            sql += "'" + sncode + "',:std_subclass1,:std_testresult, sysdate,'" + Source.Text + "',to_char(to_date('"+testDate+"','YYYY/MM/DD'), 'YYYYMMDD'),";
-            sql += "to_char(to_date('"+testTime+ "','hh24:mi:ss'), 'hh24miss'),to_date('"+ date + "','YYYY/MM/DD hh24:mi:ss'))";
+            sql += "'" + sncode + "',:std_subclass1,:std_testresult, sysdate,'" + Source.Text + "',to_char(to_date('" + testDate + "','YYYY/MM/DD'), 'YYYYMMDD'),";
+            sql += "to_char(to_date('" + testTime + "','hh24:mi:ss'), 'hh24miss'),to_date('" + date + "','YYYY/MM/DD hh24:mi:ss'))";
             dh.BatchInsert(sql, new string[] { "std_subclass1", "std_testresult" }, name.ToArray(), result.ToArray());
             myReader.Close();
             FileInfo file = new FileInfo(FolderPath.Text + @"\" + e.Name);