Merge repos.ubtob.net:usoft/mes-client

UAS_MES_YTDZ/CustomControl/RichText/RichTextAutoBottom.cs

@@ -7,6 +7,154 @@ using UAS_MES_NEW.PublicMethod;
 
 namespace UAS_MES_NEW.CustomControl.RichText
 {
+    public class CustomMessageBox : Form
+    {
+        private bool _isClosing = false;
+
+        public CustomMessageBox(string message, string title)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(message)) message = "未知错误";
+                if (string.IsNullOrEmpty(title)) title = "提示";
+
+                // 设置窗体的Tag为"ShowDialogWindow"，避免权限校验
+                this.Tag = "ShowDialogWindow";
+
+                this.FormBorderStyle = FormBorderStyle.None;
+                this.StartPosition = FormStartPosition.CenterParent;
+                this.ShowInTaskbar = false;
+                this.MaximizeBox = false;
+                this.MinimizeBox = false;
+                this.Size = new Size(500, 300);
+                this.BackColor = Color.White;
+                this.TopMost = true;
+
+                // 自定义标题栏
+                Panel titlePanel = new Panel
+                {
+                    Size = new Size(500, 50),
+                    Location = new Point(0, 0),
+                    BackColor = Color.FromArgb(0, 122, 204)
+                };
+
+                Label lblTitle = new Label
+                {
+                    Text = title,
+                    AutoSize = false,
+                    Size = new Size(400, 50),
+                    Location = new Point(20, 0),
+                    Font = new Font("微软雅黑", 18, FontStyle.Bold),
+                    ForeColor = Color.White,
+                    TextAlign = ContentAlignment.MiddleLeft
+                };
+
+                Button btnClose = new Button
+                {
+                    Text = "✕",
+                    Size = new Size(50, 50),
+                    Location = new Point(450, 0),
+                    FlatStyle = FlatStyle.Flat,
+                    Font = new Font("微软雅黑", 16, FontStyle.Bold),
+                    ForeColor = Color.White,
+                    BackColor = Color.Transparent
+                };
+                btnClose.FlatAppearance.BorderSize = 0;
+                btnClose.FlatAppearance.MouseOverBackColor = Color.FromArgb(192, 0, 0);
+                btnClose.Click += (sender, e) =>
+                {
+                    this.DialogResult = DialogResult.Cancel;
+                    SafeClose();
+                };
+
+                titlePanel.Controls.Add(lblTitle);
+                titlePanel.Controls.Add(btnClose);
+
+                Label lblMessage = new Label
+                {
+                    Text = message,
+                    AutoSize = false,
+                    Size = new Size(450, 150),
+                    Location = new Point(25, 70),
+                    Font = new Font("微软雅黑", 14, FontStyle.Regular),
+                    ForeColor = Color.Red,
+                    TextAlign = ContentAlignment.MiddleCenter
+                };
+
+                Button btnOK = new Button
+                {
+                    Text = "确定",
+                    Size = new Size(120, 40),
+                    Location = new Point(190, 240),
+                    BackColor = Color.FromArgb(0, 122, 204),
+                    ForeColor = Color.White,
+                    FlatStyle = FlatStyle.Flat,
+                    Font = new Font("微软雅黑", 11, FontStyle.Regular)
+                };
+                btnOK.Click += (sender, e) =>
+                {
+                    this.DialogResult = DialogResult.OK;
+                    SafeClose();
+                };
+
+                this.Controls.Add(titlePanel);
+                this.Controls.Add(lblMessage);
+                this.Controls.Add(btnOK);
+
+                // 窗口拖动支持
+                titlePanel.MouseDown += (sender, e) =>
+                {
+                    if (e.Button == MouseButtons.Left && !_isClosing)
+                    {
+                        ReleaseCapture();
+                        SendMessage(this.Handle, 0xA1, 0x2, 0);
+                    }
+                };
+
+                this.FormClosing += (s, e) =>
+                {
+                    _isClosing = true;
+                };
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"消息框创建失败: {ex.Message}", "错误");
+            }
+        }
+
+        private void SafeClose()
+        {
+            if (!_isClosing)
+            {
+                _isClosing = true;
+                this.Close();
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _isClosing = true;
+            }
+            base.Dispose(disposing);
+        }
+
+        [System.Runtime.InteropServices.DllImport("user32.dll")]
+        public static extern bool ReleaseCapture();
+
+        [System.Runtime.InteropServices.DllImport("user32.dll")]
+        public static extern IntPtr SendMessage(IntPtr hWnd, int msg, int wParam, int lParam);
+
+        public static DialogResult Show(string message, string title)
+        {
+            using (CustomMessageBox msgBox = new CustomMessageBox(message, title))
+            {
+                return msgBox.ShowDialog();
+            }
+        }
+    }
+
     public partial class RichTextAutoBottom : RichTextBox
     {
         Thread thread;
@@ -42,7 +190,7 @@ namespace UAS_MES_NEW.CustomControl.RichText
                 FileName = Application.StartupPath + @"\Resources\Sound\5185.wav";
                 thread.Start();
                 thread = new Thread(PlaySound);
-
+                CustomMessageBox.Show(str, "异常提示");
             }
             else if (color == Color.Green && Entity.SystemInf.CheckAudioEnable)
             {
@@ -73,6 +221,7 @@ namespace UAS_MES_NEW.CustomControl.RichText
                 FileName = Application.StartupPath + @"\Resources\Sound\1454.wav";
                 thread.Start();
                 thread = new Thread(PlaySound);
+                CustomMessageBox.Show(str, "异常提示");
             }
             LogManager.DoLog(FindForm().Tag + str);
         }
@@ -97,7 +246,7 @@ namespace UAS_MES_NEW.CustomControl.RichText
                     FileName = Application.StartupPath + @"\Resources\Sound\采集失败.wav";
                 thread.Start();
                 thread = new Thread(PlaySound);
-
+                CustomMessageBox.Show(str, "异常提示");
             }
             else if (color == Color.Green && Entity.SystemInf.CheckAudioEnable)
             {
@@ -128,6 +277,7 @@ namespace UAS_MES_NEW.CustomControl.RichText
                 FileName = Application.StartupPath + @"\Resources\Sound\1454.wav";
                 thread.Start();
                 thread = new Thread(PlaySound);
+                CustomMessageBox.Show(str, "异常提示");
             }
             LogManager.DoLog(FindForm().Tag + str);
         }

UAS_MES_YTDZ/FunctionCode/Make/Make_ToolingManager.Designer.cs

@@ -44,42 +44,43 @@
             this.ExePage1 = new System.Windows.Forms.TabPage();
             this.Page1Box = new System.Windows.Forms.TableLayoutPanel();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.useCountVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.useCountLab = new System.Windows.Forms.Label();
             this.Scrap = new System.Windows.Forms.Button();
             this.Return = new System.Windows.Forms.Button();
+            this.stA = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.stALab = new System.Windows.Forms.Label();
+            this.stB = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.stBLab = new System.Windows.Forms.Label();
+            this.stC = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.stCLab = new System.Windows.Forms.Label();
+            this.stD = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.stDLab = new System.Windows.Forms.Label();
+            this.stE = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.stELab = new System.Windows.Forms.Label();
             this.stLab = new System.Windows.Forms.Label();
+            this.empVal1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.empLab1 = new System.Windows.Forms.Label();
             this.IsClean = new System.Windows.Forms.CheckBox();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.gapVal1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.gapLab1 = new System.Windows.Forms.Label();
+            this.gapVal2 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.gapLab2 = new System.Windows.Forms.Label();
+            this.gapVal3 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.gapLab3 = new System.Windows.Forms.Label();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.empVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.empLab = new System.Windows.Forms.Label();
+            this.li_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.li_codeLab = new System.Windows.Forms.Label();
             this.sideVal = new System.Windows.Forms.ComboBox();
             this.sideLab = new System.Windows.Forms.Label();
             this.ma_codeLab = new System.Windows.Forms.Label();
             this.Receive = new System.Windows.Forms.Button();
             this.Container = new System.Windows.Forms.TableLayoutPanel();
-            this.gapLab1 = new System.Windows.Forms.Label();
-            this.gapLab2 = new System.Windows.Forms.Label();
-            this.gapLab3 = new System.Windows.Forms.Label();
             this.MsgBox = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
-            this.useCountVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.stA = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.stB = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.stC = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.stD = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.stE = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.empVal1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.gapVal1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.gapVal2 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.gapVal3 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
-            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
-            this.empVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.li_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.IsCheckProd = new System.Windows.Forms.CheckBox();
             this.TopBox.SuspendLayout();
             this.ExeBox.SuspendLayout();
             this.ExePage1.SuspendLayout();
@@ -91,6 +92,7 @@
             // 
             // TopBox
             // 
+            this.TopBox.Controls.Add(this.IsCheckProd);
             this.TopBox.Controls.Add(this.currStatusVal);
             this.TopBox.Controls.Add(this.currStatusLab);
             this.TopBox.Controls.Add(this.cancel);
@@ -283,6 +285,22 @@
             this.panel2.Size = new System.Drawing.Size(870, 188);
             this.panel2.TabIndex = 1;
             // 
+            // useCountVal
+            // 
+            this.useCountVal.AllPower = null;
+            this.useCountVal.BackColor = System.Drawing.Color.White;
+            this.useCountVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.useCountVal.ID = null;
+            this.useCountVal.Location = new System.Drawing.Point(438, 117);
+            this.useCountVal.Margin = new System.Windows.Forms.Padding(4);
+            this.useCountVal.Name = "useCountVal";
+            this.useCountVal.Power = null;
+            this.useCountVal.Size = new System.Drawing.Size(72, 31);
+            this.useCountVal.Str = null;
+            this.useCountVal.Str1 = null;
+            this.useCountVal.Str2 = null;
+            this.useCountVal.TabIndex = 156;
+            // 
             // useCountLab
             // 
             this.useCountLab.AutoSize = true;
@@ -318,6 +336,23 @@
             this.Return.UseVisualStyleBackColor = true;
             this.Return.Click += new System.EventHandler(this.Return_Click);
             // 
+            // stA
+            // 
+            this.stA.AllPower = null;
+            this.stA.BackColor = System.Drawing.Color.White;
+            this.stA.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.stA.ID = null;
+            this.stA.Location = new System.Drawing.Point(225, 21);
+            this.stA.Margin = new System.Windows.Forms.Padding(4);
+            this.stA.Name = "stA";
+            this.stA.Negative = false;
+            this.stA.Power = null;
+            this.stA.Size = new System.Drawing.Size(80, 31);
+            this.stA.Str = null;
+            this.stA.Str1 = null;
+            this.stA.Str2 = null;
+            this.stA.TabIndex = 150;
+            // 
             // stALab
             // 
             this.stALab.AutoSize = true;
@@ -329,6 +364,22 @@
             this.stALab.TabIndex = 138;
             this.stALab.Text = "A";
             // 
+            // stB
+            // 
+            this.stB.AllPower = null;
+            this.stB.BackColor = System.Drawing.Color.White;
+            this.stB.ID = null;
+            this.stB.Location = new System.Drawing.Point(224, 66);
+            this.stB.Margin = new System.Windows.Forms.Padding(4);
+            this.stB.Name = "stB";
+            this.stB.Negative = false;
+            this.stB.Power = null;
+            this.stB.Size = new System.Drawing.Size(80, 35);
+            this.stB.Str = null;
+            this.stB.Str1 = null;
+            this.stB.Str2 = null;
+            this.stB.TabIndex = 153;
+            // 
             // stBLab
             // 
             this.stBLab.AutoSize = true;
@@ -340,6 +391,23 @@
             this.stBLab.TabIndex = 136;
             this.stBLab.Text = "B";
             // 
+            // stC
+            // 
+            this.stC.AllPower = null;
+            this.stC.BackColor = System.Drawing.Color.White;
+            this.stC.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.stC.ID = null;
+            this.stC.Location = new System.Drawing.Point(373, 21);
+            this.stC.Margin = new System.Windows.Forms.Padding(4);
+            this.stC.Name = "stC";
+            this.stC.Negative = false;
+            this.stC.Power = null;
+            this.stC.Size = new System.Drawing.Size(80, 31);
+            this.stC.Str = null;
+            this.stC.Str1 = null;
+            this.stC.Str2 = null;
+            this.stC.TabIndex = 151;
+            // 
             // stCLab
             // 
             this.stCLab.AutoSize = true;
@@ -351,6 +419,22 @@
             this.stCLab.TabIndex = 134;
             this.stCLab.Text = "C";
             // 
+            // stD
+            // 
+            this.stD.AllPower = null;
+            this.stD.BackColor = System.Drawing.Color.White;
+            this.stD.ID = null;
+            this.stD.Location = new System.Drawing.Point(373, 66);
+            this.stD.Margin = new System.Windows.Forms.Padding(4);
+            this.stD.Name = "stD";
+            this.stD.Negative = false;
+            this.stD.Power = null;
+            this.stD.Size = new System.Drawing.Size(80, 35);
+            this.stD.Str = null;
+            this.stD.Str1 = null;
+            this.stD.Str2 = null;
+            this.stD.TabIndex = 154;
+            // 
             // stDLab
             // 
             this.stDLab.AutoSize = true;
@@ -362,6 +446,22 @@
             this.stDLab.TabIndex = 132;
             this.stDLab.Text = "D";
             // 
+            // stE
+            // 
+            this.stE.AllPower = null;
+            this.stE.BackColor = System.Drawing.Color.White;
+            this.stE.ID = null;
+            this.stE.Location = new System.Drawing.Point(517, 21);
+            this.stE.Margin = new System.Windows.Forms.Padding(4);
+            this.stE.Name = "stE";
+            this.stE.Negative = false;
+            this.stE.Power = null;
+            this.stE.Size = new System.Drawing.Size(80, 35);
+            this.stE.Str = null;
+            this.stE.Str1 = null;
+            this.stE.Str2 = null;
+            this.stE.TabIndex = 152;
+            // 
             // stELab
             // 
             this.stELab.AutoSize = true;
@@ -384,6 +484,22 @@
             this.stLab.TabIndex = 129;
             this.stLab.Text = "张力测试结果(N):";
             // 
+            // empVal1
+            // 
+            this.empVal1.AllPower = null;
+            this.empVal1.BackColor = System.Drawing.Color.White;
+            this.empVal1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.empVal1.ID = null;
+            this.empVal1.Location = new System.Drawing.Point(157, 117);
+            this.empVal1.Margin = new System.Windows.Forms.Padding(4);
+            this.empVal1.Name = "empVal1";
+            this.empVal1.Power = null;
+            this.empVal1.Size = new System.Drawing.Size(178, 31);
+            this.empVal1.Str = null;
+            this.empVal1.Str1 = null;
+            this.empVal1.Str2 = null;
+            this.empVal1.TabIndex = 155;
+            // 
             // empLab1
             // 
             this.empLab1.AutoSize = true;
@@ -398,6 +514,7 @@
             // IsClean
             // 
             this.IsClean.AutoSize = true;
+            this.IsClean.Cursor = System.Windows.Forms.Cursors.Hand;
             this.IsClean.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.IsClean.Location = new System.Drawing.Point(522, 117);
             this.IsClean.Margin = new System.Windows.Forms.Padding(4);
@@ -430,87 +547,22 @@
             this.panel1.Size = new System.Drawing.Size(870, 188);
             this.panel1.TabIndex = 0;
             // 
-            // empLab
-            // 
-            this.empLab.AutoSize = true;
-            this.empLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.empLab.Location = new System.Drawing.Point(22, 102);
-            this.empLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.empLab.Name = "empLab";
-            this.empLab.Size = new System.Drawing.Size(101, 28);
-            this.empLab.TabIndex = 113;
-            this.empLab.Text = "领用人员:";
-            // 
-            // li_codeLab
-            // 
-            this.li_codeLab.AutoSize = true;
-            this.li_codeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.li_codeLab.Location = new System.Drawing.Point(368, 23);
-            this.li_codeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.li_codeLab.Name = "li_codeLab";
-            this.li_codeLab.Size = new System.Drawing.Size(59, 28);
-            this.li_codeLab.TabIndex = 75;
-            this.li_codeLab.Text = "线体:";
-            // 
-            // sideVal
-            // 
-            this.sideVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sideVal.FormattingEnabled = true;
-            this.sideVal.Items.AddRange(new object[] {
-            "A",
-            "B"});
-            this.sideVal.Location = new System.Drawing.Point(617, 21);
-            this.sideVal.Name = "sideVal";
-            this.sideVal.Size = new System.Drawing.Size(145, 32);
-            this.sideVal.TabIndex = 16;
-            // 
-            // sideLab
-            // 
-            this.sideLab.AutoSize = true;
-            this.sideLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sideLab.Location = new System.Drawing.Point(562, 24);
-            this.sideLab.Name = "sideLab";
-            this.sideLab.Size = new System.Drawing.Size(75, 28);
-            this.sideLab.TabIndex = 15;
-            this.sideLab.Text = "面别：";
-            // 
-            // ma_codeLab
-            // 
-            this.ma_codeLab.AutoSize = true;
-            this.ma_codeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_codeLab.Location = new System.Drawing.Point(20, 23);
-            this.ma_codeLab.Name = "ma_codeLab";
-            this.ma_codeLab.Size = new System.Drawing.Size(101, 28);
-            this.ma_codeLab.TabIndex = 14;
-            this.ma_codeLab.Text = "归属工单:";
-            // 
-            // Receive
-            // 
-            this.Receive.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.Receive.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Receive.Location = new System.Drawing.Point(729, 146);
-            this.Receive.Name = "Receive";
-            this.Receive.Size = new System.Drawing.Size(100, 32);
-            this.Receive.TabIndex = 11;
-            this.Receive.Text = "领用";
-            this.Receive.UseVisualStyleBackColor = true;
-            this.Receive.Click += new System.EventHandler(this.Receive_Click);
-            // 
-            // Container
+            // gapVal1
             // 
-            this.Container.ColumnCount = 2;
-            this.Container.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 70F));
-            this.Container.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
-            this.Container.Controls.Add(this.MsgBox, 1, 0);
-            this.Container.Controls.Add(this.ExeBox, 0, 0);
-            this.Container.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.Container.Location = new System.Drawing.Point(0, 279);
-            this.Container.Name = "Container";
-            this.Container.RowCount = 1;
-            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 441F));
-            this.Container.Size = new System.Drawing.Size(1280, 441);
-            this.Container.TabIndex = 12;
+            this.gapVal1.AllPower = null;
+            this.gapVal1.BackColor = System.Drawing.Color.White;
+            this.gapVal1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gapVal1.ID = null;
+            this.gapVal1.Location = new System.Drawing.Point(370, 100);
+            this.gapVal1.Margin = new System.Windows.Forms.Padding(4);
+            this.gapVal1.Name = "gapVal1";
+            this.gapVal1.Negative = false;
+            this.gapVal1.Power = null;
+            this.gapVal1.Size = new System.Drawing.Size(69, 31);
+            this.gapVal1.Str = null;
+            this.gapVal1.Str1 = null;
+            this.gapVal1.Str2 = null;
+            this.gapVal1.TabIndex = 156;
             // 
             // gapLab1
             // 
@@ -523,171 +575,7 @@
             this.gapLab1.TabIndex = 155;
             this.gapLab1.Text = "间隙范围";
             // 
-            // gapLab2
-            // 
-            this.gapLab2.AutoSize = true;
-            this.gapLab2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.gapLab2.Location = new System.Drawing.Point(453, 102);
-            this.gapLab2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.gapLab2.Name = "gapLab2";
-            this.gapLab2.Size = new System.Drawing.Size(96, 28);
-            this.gapLab2.TabIndex = 154;
-            this.gapLab2.Text = "最大间隙";
-            // 
-            // gapLab3
-            // 
-            this.gapLab3.AutoSize = true;
-            this.gapLab3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.gapLab3.Location = new System.Drawing.Point(613, 102);
-            this.gapLab3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.gapLab3.Name = "gapLab3";
-            this.gapLab3.Size = new System.Drawing.Size(96, 28);
-            this.gapLab3.TabIndex = 153;
-            this.gapLab3.Text = "最小间隙";
-            // 
-            // MsgBox
-            // 
-            this.MsgBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.MsgBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.MsgBox.Location = new System.Drawing.Point(900, 4);
-            this.MsgBox.Margin = new System.Windows.Forms.Padding(4);
-            this.MsgBox.Name = "MsgBox";
-            this.MsgBox.Size = new System.Drawing.Size(376, 433);
-            this.MsgBox.TabIndex = 54;
-            this.MsgBox.Text = "";
-            // 
-            // useCountVal
-            // 
-            this.useCountVal.AllPower = null;
-            this.useCountVal.BackColor = System.Drawing.Color.White;
-            this.useCountVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.useCountVal.ID = null;
-            this.useCountVal.Location = new System.Drawing.Point(438, 117);
-            this.useCountVal.Margin = new System.Windows.Forms.Padding(4);
-            this.useCountVal.Name = "useCountVal";
-            this.useCountVal.Power = null;
-            this.useCountVal.Size = new System.Drawing.Size(72, 31);
-            this.useCountVal.Str = null;
-            this.useCountVal.Str1 = null;
-            this.useCountVal.Str2 = null;
-            this.useCountVal.TabIndex = 156;
-            // 
-            // stA
-            // 
-            this.stA.AllPower = null;
-            this.stA.BackColor = System.Drawing.Color.White;
-            this.stA.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.stA.ID = null;
-            this.stA.Location = new System.Drawing.Point(225, 21);
-            this.stA.Margin = new System.Windows.Forms.Padding(4);
-            this.stA.Name = "stA";
-            this.stA.Negative = false;
-            this.stA.Power = null;
-            this.stA.Size = new System.Drawing.Size(80, 31);
-            this.stA.Str = null;
-            this.stA.Str1 = null;
-            this.stA.Str2 = null;
-            this.stA.TabIndex = 150;
-            // 
-            // stB
-            // 
-            this.stB.AllPower = null;
-            this.stB.BackColor = System.Drawing.Color.White;
-            this.stB.ID = null;
-            this.stB.Location = new System.Drawing.Point(224, 66);
-            this.stB.Margin = new System.Windows.Forms.Padding(4);
-            this.stB.Name = "stB";
-            this.stB.Negative = false;
-            this.stB.Power = null;
-            this.stB.Size = new System.Drawing.Size(80, 35);
-            this.stB.Str = null;
-            this.stB.Str1 = null;
-            this.stB.Str2 = null;
-            this.stB.TabIndex = 153;
-            // 
-            // stC
-            // 
-            this.stC.AllPower = null;
-            this.stC.BackColor = System.Drawing.Color.White;
-            this.stC.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.stC.ID = null;
-            this.stC.Location = new System.Drawing.Point(373, 21);
-            this.stC.Margin = new System.Windows.Forms.Padding(4);
-            this.stC.Name = "stC";
-            this.stC.Negative = false;
-            this.stC.Power = null;
-            this.stC.Size = new System.Drawing.Size(80, 31);
-            this.stC.Str = null;
-            this.stC.Str1 = null;
-            this.stC.Str2 = null;
-            this.stC.TabIndex = 151;
-            // 
-            // stD
-            // 
-            this.stD.AllPower = null;
-            this.stD.BackColor = System.Drawing.Color.White;
-            this.stD.ID = null;
-            this.stD.Location = new System.Drawing.Point(373, 66);
-            this.stD.Margin = new System.Windows.Forms.Padding(4);
-            this.stD.Name = "stD";
-            this.stD.Negative = false;
-            this.stD.Power = null;
-            this.stD.Size = new System.Drawing.Size(80, 35);
-            this.stD.Str = null;
-            this.stD.Str1 = null;
-            this.stD.Str2 = null;
-            this.stD.TabIndex = 154;
-            // 
-            // stE
-            // 
-            this.stE.AllPower = null;
-            this.stE.BackColor = System.Drawing.Color.White;
-            this.stE.ID = null;
-            this.stE.Location = new System.Drawing.Point(517, 21);
-            this.stE.Margin = new System.Windows.Forms.Padding(4);
-            this.stE.Name = "stE";
-            this.stE.Negative = false;
-            this.stE.Power = null;
-            this.stE.Size = new System.Drawing.Size(80, 35);
-            this.stE.Str = null;
-            this.stE.Str1 = null;
-            this.stE.Str2 = null;
-            this.stE.TabIndex = 152;
-            // 
-            // empVal1
-            // 
-            this.empVal1.AllPower = null;
-            this.empVal1.BackColor = System.Drawing.Color.White;
-            this.empVal1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.empVal1.ID = null;
-            this.empVal1.Location = new System.Drawing.Point(157, 117);
-            this.empVal1.Margin = new System.Windows.Forms.Padding(4);
-            this.empVal1.Name = "empVal1";
-            this.empVal1.Power = null;
-            this.empVal1.Size = new System.Drawing.Size(178, 31);
-            this.empVal1.Str = null;
-            this.empVal1.Str1 = null;
-            this.empVal1.Str2 = null;
-            this.empVal1.TabIndex = 155;
-            // 
-            // gapVal1
-            // 
-            this.gapVal1.AllPower = null;
-            this.gapVal1.BackColor = System.Drawing.Color.White;
-            this.gapVal1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.gapVal1.ID = null;
-            this.gapVal1.Location = new System.Drawing.Point(370, 100);
-            this.gapVal1.Margin = new System.Windows.Forms.Padding(4);
-            this.gapVal1.Name = "gapVal1";
-            this.gapVal1.Negative = false;
-            this.gapVal1.Power = null;
-            this.gapVal1.Size = new System.Drawing.Size(69, 31);
-            this.gapVal1.Str = null;
-            this.gapVal1.Str1 = null;
-            this.gapVal1.Str2 = null;
-            this.gapVal1.TabIndex = 156;
-            // 
-            // gapVal2
+            // gapVal2
             // 
             this.gapVal2.AllPower = null;
             this.gapVal2.BackColor = System.Drawing.Color.White;
@@ -704,6 +592,17 @@
             this.gapVal2.Str2 = null;
             this.gapVal2.TabIndex = 157;
             // 
+            // gapLab2
+            // 
+            this.gapLab2.AutoSize = true;
+            this.gapLab2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gapLab2.Location = new System.Drawing.Point(453, 102);
+            this.gapLab2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.gapLab2.Name = "gapLab2";
+            this.gapLab2.Size = new System.Drawing.Size(96, 28);
+            this.gapLab2.TabIndex = 154;
+            this.gapLab2.Text = "最大间隙";
+            // 
             // gapVal3
             // 
             this.gapVal3.AllPower = null;
@@ -720,6 +619,17 @@
             this.gapVal3.Str2 = null;
             this.gapVal3.TabIndex = 158;
             // 
+            // gapLab3
+            // 
+            this.gapLab3.AutoSize = true;
+            this.gapLab3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.gapLab3.Location = new System.Drawing.Point(613, 102);
+            this.gapLab3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.gapLab3.Name = "gapLab3";
+            this.gapLab3.Size = new System.Drawing.Size(96, 28);
+            this.gapLab3.TabIndex = 153;
+            this.gapLab3.Text = "最小间隙";
+            // 
             // ma_code
             // 
             this.ma_code.AllPower = null;
@@ -757,6 +667,17 @@
             this.empVal.Str2 = null;
             this.empVal.TabIndex = 114;
             // 
+            // empLab
+            // 
+            this.empLab.AutoSize = true;
+            this.empLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.empLab.Location = new System.Drawing.Point(22, 102);
+            this.empLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.empLab.Name = "empLab";
+            this.empLab.Size = new System.Drawing.Size(101, 28);
+            this.empLab.TabIndex = 113;
+            this.empLab.Text = "领用人员:";
+            // 
             // li_code
             // 
             this.li_code.AllPower = null;
@@ -778,6 +699,103 @@
             this.li_code.TableName = null;
             this.li_code.TextBoxEnable = false;
             // 
+            // li_codeLab
+            // 
+            this.li_codeLab.AutoSize = true;
+            this.li_codeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.li_codeLab.Location = new System.Drawing.Point(368, 23);
+            this.li_codeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.li_codeLab.Name = "li_codeLab";
+            this.li_codeLab.Size = new System.Drawing.Size(59, 28);
+            this.li_codeLab.TabIndex = 75;
+            this.li_codeLab.Text = "线体:";
+            // 
+            // sideVal
+            // 
+            this.sideVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.sideVal.FormattingEnabled = true;
+            this.sideVal.Items.AddRange(new object[] {
+            "A",
+            "B"});
+            this.sideVal.Location = new System.Drawing.Point(617, 21);
+            this.sideVal.Name = "sideVal";
+            this.sideVal.Size = new System.Drawing.Size(145, 32);
+            this.sideVal.TabIndex = 16;
+            // 
+            // sideLab
+            // 
+            this.sideLab.AutoSize = true;
+            this.sideLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.sideLab.Location = new System.Drawing.Point(562, 24);
+            this.sideLab.Name = "sideLab";
+            this.sideLab.Size = new System.Drawing.Size(75, 28);
+            this.sideLab.TabIndex = 15;
+            this.sideLab.Text = "面别：";
+            // 
+            // ma_codeLab
+            // 
+            this.ma_codeLab.AutoSize = true;
+            this.ma_codeLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_codeLab.Location = new System.Drawing.Point(20, 23);
+            this.ma_codeLab.Name = "ma_codeLab";
+            this.ma_codeLab.Size = new System.Drawing.Size(101, 28);
+            this.ma_codeLab.TabIndex = 14;
+            this.ma_codeLab.Text = "归属工单:";
+            // 
+            // Receive
+            // 
+            this.Receive.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Receive.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Receive.Location = new System.Drawing.Point(729, 146);
+            this.Receive.Name = "Receive";
+            this.Receive.Size = new System.Drawing.Size(100, 32);
+            this.Receive.TabIndex = 11;
+            this.Receive.Text = "领用";
+            this.Receive.UseVisualStyleBackColor = true;
+            this.Receive.Click += new System.EventHandler(this.Receive_Click);
+            // 
+            // Container
+            // 
+            this.Container.ColumnCount = 2;
+            this.Container.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 70F));
+            this.Container.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
+            this.Container.Controls.Add(this.MsgBox, 1, 0);
+            this.Container.Controls.Add(this.ExeBox, 0, 0);
+            this.Container.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.Container.Location = new System.Drawing.Point(0, 279);
+            this.Container.Name = "Container";
+            this.Container.RowCount = 1;
+            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.Container.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 441F));
+            this.Container.Size = new System.Drawing.Size(1280, 441);
+            this.Container.TabIndex = 12;
+            // 
+            // MsgBox
+            // 
+            this.MsgBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.MsgBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.MsgBox.Location = new System.Drawing.Point(900, 4);
+            this.MsgBox.Margin = new System.Windows.Forms.Padding(4);
+            this.MsgBox.Name = "MsgBox";
+            this.MsgBox.Size = new System.Drawing.Size(376, 433);
+            this.MsgBox.TabIndex = 54;
+            this.MsgBox.Text = "";
+            // 
+            // IsCheckProd
+            // 
+            this.IsCheckProd.AutoSize = true;
+            this.IsCheckProd.Checked = true;
+            this.IsCheckProd.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.IsCheckProd.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.IsCheckProd.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.IsCheckProd.Location = new System.Drawing.Point(89, 113);
+            this.IsCheckProd.Margin = new System.Windows.Forms.Padding(4);
+            this.IsCheckProd.Name = "IsCheckProd";
+            this.IsCheckProd.Size = new System.Drawing.Size(206, 32);
+            this.IsCheckProd.TabIndex = 157;
+            this.IsCheckProd.Text = "核对产品对应治具";
+            this.IsCheckProd.UseVisualStyleBackColor = true;
+            // 
             // Make_ToolingManager
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
@@ -857,5 +875,6 @@
         private System.Windows.Forms.Label gapLab2;
         private CustomControl.TextBoxWithIcon.NumOnlyTextBox gapVal3;
         private System.Windows.Forms.Label gapLab3;
+        private System.Windows.Forms.CheckBox IsCheckProd;
     }
 }

UAS_MES_YTDZ/FunctionCode/Make/Make_ToolingManager.cs

@@ -223,6 +223,16 @@ namespace UAS_MES_NEW.Make
                 return;
             }
 
+            if (IsCheckProd.Checked)
+            {
+                dt = (DataTable)dh.ExecuteSql($"SELECT sp_detno FROM stenilcanusepro,make WHERE sp_stcode = '{toolingVal.Text.Trim()}' AND ma_code = '{ma_code.Text}' AND ma_code = sp_prodcode", "select");
+                if(dt.Rows.Count == 0)
+                {
+                    ShowMsg(MsgBox, 0, $"NG,治具编号:{toolingVal.Text}使用产品未维护，无法在工单{ma_code.Text}中使用");
+                    return;
+                }
+            }
+
             dt = (DataTable)dh.ExecuteSql($@"SELECT st_usestatus,st_version,nvl(st_maxusecount, 0) st_maxusecount,nvl(st_usecount, 0)    st_usecount
                 FROM stencil WHERE st_code = '{toolingVal.Text.Trim()}'", "select");
             string status = dt.Rows[0]["st_usestatus"].ToString();
@@ -284,21 +294,18 @@ namespace UAS_MES_NEW.Make
                     ShowMsg(MsgBox, 0, $"NG,线体已有在线{typeVal.Text},编号为:{dt.Rows[0]["st_code"].ToString()}");
                     return;
                 }
+                string seq = (string)dh.getFieldDataByCondition("dual", "stenciluse_seq.NEXTVAL seq", "1=1");
 
-                dt = (DataTable)dh.ExecuteSql("select stenciluse_seq.NEXTVAL seq from dual", "select");
-                if(dt.Rows.Count > 1)
-                {
-                    dh.ExecuteSql($@"INSERT INTO stenciluse (su_id,su_stcode,su_stid,
+                dh.ExecuteSql($@"INSERT INTO stenciluse (su_id,su_stcode,su_stid,
                     su_usemacode,su_useprodcode,su_linecode,su_table,su_useman,su_usedate,su_status)
-                    SELECT '{dt.Rows[0]["seq"].ToString()}','{toolingVal.Text.Trim()}',st_id,
+                    SELECT '{seq}','{toolingVal.Text.Trim()}',st_id,
                     '{ma_code.Text}','{ma_prodcode}','{li_code.Text}','{sideVal.Text}','{empVal.Text}',sysdate, '领用'
                     FROM stencil WHERE st_code = '{toolingVal.Text.Trim()}'", "insert");
 
-                    if(!string.IsNullOrEmpty(gapVal1.Text) && !string.IsNullOrEmpty(gapVal2.Text)&& !string.IsNullOrEmpty(gapVal3.Text))
-                    {
-                        dh.ExecuteSql($@"INSERT INTO steptestdetail( std_id, std_subclass1, std_subclass2, std_value9, std_value10, std_value11) 
-                            VALUES ( steptestdetail_seq.NEXTVAL, '{dt.Rows[0]["seq"].ToString()}', '刮刀', '{gapVal1.Text}', '{gapVal2.Text}', '{gapVal3.Text}' )", "insert");
-                    }
+                if (!string.IsNullOrEmpty(gapVal1.Text) && !string.IsNullOrEmpty(gapVal2.Text) && !string.IsNullOrEmpty(gapVal3.Text))
+                {
+                    dh.ExecuteSql($@"INSERT INTO steptestdetail( std_id, std_subclass1, std_subclass2, std_value9, std_value10, std_value11) 
+                            VALUES ( steptestdetail_seq.NEXTVAL, '{seq}', '刮刀', '{gapVal1.Text}', '{gapVal2.Text}', '{gapVal3.Text}' )", "insert");
                 }
             }
             dh.ExecuteSql($@"update stencil set st_usestatus= '出库',st_line = '{li_code.Text}',st_macode = '{ma_code.Text}',

UAS_MES_YTDZ/FunctionCode/Make/Make_ToolingManager.resx

@@ -120,4 +120,7 @@
   <metadata name="ExePage1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="ExePage1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

UAS_MES_YTDZ/UAS_MES_YTDZ.csproj

@@ -368,7 +368,7 @@
       <DependentUpon>ProcessBar.cs</DependentUpon>
     </Compile>
     <Compile Include="CustomControl\RichText\RichTextAutoBottom.cs">
-      <SubType>Component</SubType>
+      <SubType>Form</SubType>
     </Compile>
     <Compile Include="CustomControl\RichText\RichTextAutoBottom.Designer.cs">
       <DependentUpon>RichTextAutoBottom.cs</DependentUpon>