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

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -480,7 +480,11 @@ namespace UAS_MES.Make
             TSNLength_checkBox.Enabled = true;
             SNPre_checkBox.Enabled = true;
             SNLength_checkBox.Enabled = true;
-
+            //判断工单是否导入了序列号清单
+            if (dh.CheckExist("makesnlist", "msl_makecode='" + oMakecode + "' and msl_type='after'"))
+            {
+                return;
+            }
             //查询表工单序列号防呆规则表
             rules = (DataTable)dh.ExecuteSql("select msr_startno,msr_endno,msr_system,msr_type, msr_prefix ,msr_length from makesnrule where msr_makecode='" + oMakecode + "'", "select");
             if (rules.Rows.Count > 0)

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -309,8 +309,13 @@ namespace UAS_MES.Make
             beforeTransSNLength_checkBox.Enabled = true;
             afterTransSNPre_checkBox.Enabled = true;
             afterTransSNLength_checkBox.Enabled = true;
-            //查询表工单序列号防呆规则表
-            rules = (DataTable)dh.ExecuteSql("select msr_startno,msr_endno,msr_system,msr_type, msr_prefix ,msr_length from makesnrule where msr_makecode='" + oMakeCode + "'", "select");
+            //判断工单是否导入了序列号清单
+            if (dh.CheckExist("makesnlist", "msl_makecode='" + oMakeCode + "' and msl_type='after'"))
+            {
+                return;
+            }
+                //查询表工单序列号防呆规则表
+                rules = (DataTable)dh.ExecuteSql("select msr_startno,msr_endno,msr_system,msr_type, msr_prefix ,msr_length from makesnrule where msr_makecode='" + oMakeCode + "'", "select");
             if (rules.Rows.Count > 0)
             {
                 foreach (DataRow dr in rules.Rows)

UAS_DLLTest/GroupBoxwithborder.Designer.cs

@@ -0,0 +1,36 @@
+namespace UAS_DLLTest
+{
+    partial class GroupBoxwithborder
+    {
+        /// <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()
+        {
+            components = new System.ComponentModel.Container();
+        }
+
+        #endregion
+    }
+}

UAS_DLLTest/GroupBoxwithborder.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace UAS_DLLTest
+{
+    public partial class GroupBoxwithborder : GroupBox
+    {
+        /// <summary>
+        /// 获取和设置控件高亮色
+        /// </summary>
+        /// <value>高亮色</value>
+        [TypeConverter("System.Drawing.ColorConverter"),
+        Category("LoadingCircle"),
+        Description("获取和设置控件高亮色")]
+        public Color TextColor
+        {
+            get
+            {
+                return textcolor;
+            }
+            set
+            {
+                textcolor = value;
+                Invalidate();
+            }
+        }
+
+        public Color BorderColor
+        {
+            get
+            {
+                return bordercolor;
+            }
+
+            set
+            {
+                bordercolor = value;
+                Invalidate();
+            }
+        }
+
+        private Color textcolor;
+
+        private Color bordercolor;
+
+        public GroupBoxwithborder()
+        {
+            InitializeComponent();
+            this.Paint += this.groupBox1_Paint;
+        }
+
+        private void groupBox1_Paint(object sender, PaintEventArgs e)
+        {
+            e.Graphics.Clear(BackColor);
+            Brush br = new SolidBrush(textcolor);
+            e.Graphics.DrawString(Text, Font, br, 10, 1);
+            Pen LineColor = new Pen(bordercolor);
+            e.Graphics.DrawLine(LineColor, 1, 7, 8, 7);
+            e.Graphics.DrawLine(LineColor, e.Graphics.MeasureString(Text, Font).Width + 8, 7, Width - 2, 7);
+            e.Graphics.DrawLine(LineColor, 1, 7, 1, Height - 2);
+            e.Graphics.DrawLine(LineColor, 1, Height - 2, Width - 2, Height - 2);
+            e.Graphics.DrawLine(LineColor, Width - 2, 7, Width - 2, Height - 2);
+        }
+    }
+}