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

UAS-MES/Entity/User.cs

@@ -55,6 +55,10 @@
         /// </summary>
         public static string WorkCenter;
         /// <summary>
+        /// 用户ID
+        /// </summary>
+        public static string UserID;
+        /// <summary>
         /// 默认不良组别
         /// </summary>
         public static string DefaultBadGroup;

UAS-MES/FunctionCode/Make/Make_SMTStencil.Designer.cs

@@ -34,10 +34,8 @@
             this.li_code_label = new System.Windows.Forms.Label();
             this.RadioReceive = new System.Windows.Forms.RadioButton();
             this.RadioReturn = new System.Windows.Forms.RadioButton();
-            this.SU_USEMAN_label = new System.Windows.Forms.Label();
             this.SU_DEVCODE_label = new System.Windows.Forms.Label();
             this.st_table_label = new System.Windows.Forms.Label();
-            this.SU_RETURNMAN_label = new System.Windows.Forms.Label();
             this.SU_DEVCODE1_label = new System.Windows.Forms.Label();
             this.st_combinenumber_label = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
@@ -48,8 +46,9 @@
             this.ST_ENSIONA_label = new System.Windows.Forms.Label();
             this.ma_qty_label = new System.Windows.Forms.Label();
             this.ma_qty = new System.Windows.Forms.Label();
-            this.label1 = new System.Windows.Forms.Label();
-            this.enterTextBox1 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.su_singlepringqty1_label = new System.Windows.Forms.Label();
+            this.SU_RETURNIFCLEAN = new System.Windows.Forms.CheckBox();
+            this.su_singlepringqty1 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.st_table = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.Receive = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Return = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -61,20 +60,20 @@
             this.ST_ENSIONE = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.st_combinenumber = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.SU_DEVCODE1 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.SU_RETURNMAN = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.SU_DEVCODE = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.SU_USEMAN = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ToolsBom = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
+            this.su_stcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.st_pcbcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.su_status = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SU_LINECODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.su_stverison = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.su_singlepringqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.su_table = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.su_usemacode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Confirm = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.li_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.ma_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ma_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
-            this.su_usemacode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.su_table = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.su_singlepringqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.su_stverison = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.st_pcbcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.su_stcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.ToolsBom)).BeginInit();
             this.SuspendLayout();
             // 
@@ -102,7 +101,7 @@
             // 
             this.li_code_label.AutoSize = true;
             this.li_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.li_code_label.Location = new System.Drawing.Point(455, 9);
+            this.li_code_label.Location = new System.Drawing.Point(602, 430);
             this.li_code_label.Name = "li_code_label";
             this.li_code_label.Size = new System.Drawing.Size(74, 21);
             this.li_code_label.TabIndex = 73;
@@ -111,9 +110,10 @@
             // RadioReceive
             // 
             this.RadioReceive.AutoSize = true;
-            this.RadioReceive.Location = new System.Drawing.Point(3, 434);
+            this.RadioReceive.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.RadioReceive.Location = new System.Drawing.Point(3, 430);
             this.RadioReceive.Name = "RadioReceive";
-            this.RadioReceive.Size = new System.Drawing.Size(47, 16);
+            this.RadioReceive.Size = new System.Drawing.Size(55, 24);
             this.RadioReceive.TabIndex = 77;
             this.RadioReceive.TabStop = true;
             this.RadioReceive.Text = "领用";
@@ -123,30 +123,21 @@
             // RadioReturn
             // 
             this.RadioReturn.AutoSize = true;
-            this.RadioReturn.Location = new System.Drawing.Point(3, 465);
+            this.RadioReturn.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.RadioReturn.Location = new System.Drawing.Point(3, 457);
             this.RadioReturn.Name = "RadioReturn";
-            this.RadioReturn.Size = new System.Drawing.Size(47, 16);
+            this.RadioReturn.Size = new System.Drawing.Size(55, 24);
             this.RadioReturn.TabIndex = 78;
             this.RadioReturn.TabStop = true;
             this.RadioReturn.Text = "退回";
             this.RadioReturn.UseVisualStyleBackColor = true;
             this.RadioReturn.CheckedChanged += new System.EventHandler(this.Radio_CheckedChanged);
             // 
-            // SU_USEMAN_label
-            // 
-            this.SU_USEMAN_label.AutoSize = true;
-            this.SU_USEMAN_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SU_USEMAN_label.Location = new System.Drawing.Point(57, 431);
-            this.SU_USEMAN_label.Name = "SU_USEMAN_label";
-            this.SU_USEMAN_label.Size = new System.Drawing.Size(74, 21);
-            this.SU_USEMAN_label.TabIndex = 79;
-            this.SU_USEMAN_label.Text = "领用人员";
-            // 
             // SU_DEVCODE_label
             // 
             this.SU_DEVCODE_label.AutoSize = true;
             this.SU_DEVCODE_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SU_DEVCODE_label.Location = new System.Drawing.Point(260, 431);
+            this.SU_DEVCODE_label.Location = new System.Drawing.Point(56, 430);
             this.SU_DEVCODE_label.Name = "SU_DEVCODE_label";
             this.SU_DEVCODE_label.Size = new System.Drawing.Size(74, 21);
             this.SU_DEVCODE_label.TabIndex = 81;
@@ -156,27 +147,17 @@
             // 
             this.st_table_label.AutoSize = true;
             this.st_table_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.st_table_label.Location = new System.Drawing.Point(467, 431);
+            this.st_table_label.Location = new System.Drawing.Point(263, 430);
             this.st_table_label.Name = "st_table_label";
             this.st_table_label.Size = new System.Drawing.Size(51, 21);
             this.st_table_label.TabIndex = 83;
             this.st_table_label.Text = "Table";
             // 
-            // SU_RETURNMAN_label
-            // 
-            this.SU_RETURNMAN_label.AutoSize = true;
-            this.SU_RETURNMAN_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SU_RETURNMAN_label.Location = new System.Drawing.Point(57, 461);
-            this.SU_RETURNMAN_label.Name = "SU_RETURNMAN_label";
-            this.SU_RETURNMAN_label.Size = new System.Drawing.Size(74, 21);
-            this.SU_RETURNMAN_label.TabIndex = 85;
-            this.SU_RETURNMAN_label.Text = "退回人员";
-            // 
             // SU_DEVCODE1_label
             // 
             this.SU_DEVCODE1_label.AutoSize = true;
             this.SU_DEVCODE1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SU_DEVCODE1_label.Location = new System.Drawing.Point(260, 461);
+            this.SU_DEVCODE1_label.Location = new System.Drawing.Point(56, 460);
             this.SU_DEVCODE1_label.Name = "SU_DEVCODE1_label";
             this.SU_DEVCODE1_label.Size = new System.Drawing.Size(74, 21);
             this.SU_DEVCODE1_label.TabIndex = 87;
@@ -186,7 +167,7 @@
             // 
             this.st_combinenumber_label.AutoSize = true;
             this.st_combinenumber_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.st_combinenumber_label.Location = new System.Drawing.Point(467, 461);
+            this.st_combinenumber_label.Location = new System.Drawing.Point(263, 460);
             this.st_combinenumber_label.Name = "st_combinenumber_label";
             this.st_combinenumber_label.Size = new System.Drawing.Size(90, 21);
             this.st_combinenumber_label.TabIndex = 89;
@@ -271,39 +252,50 @@
             this.ma_qty.Size = new System.Drawing.Size(0, 21);
             this.ma_qty.TabIndex = 106;
             // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(648, 431);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(106, 21);
-            this.label1.TabIndex = 108;
-            this.label1.Text = "单片印刷次数";
-            // 
-            // enterTextBox1
-            // 
-            this.enterTextBox1.AllPower = null;
-            this.enterTextBox1.BackColor = System.Drawing.Color.White;
-            this.enterTextBox1.ID = null;
-            this.enterTextBox1.Location = new System.Drawing.Point(760, 433);
-            this.enterTextBox1.Name = "enterTextBox1";
-            this.enterTextBox1.Power = null;
-            this.enterTextBox1.Size = new System.Drawing.Size(62, 21);
-            this.enterTextBox1.Str = null;
-            this.enterTextBox1.Str1 = null;
-            this.enterTextBox1.Str2 = null;
-            this.enterTextBox1.TabIndex = 109;
-            this.enterTextBox1.Text = "1";
+            // su_singlepringqty1_label
+            // 
+            this.su_singlepringqty1_label.AutoSize = true;
+            this.su_singlepringqty1_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.su_singlepringqty1_label.Location = new System.Drawing.Point(444, 430);
+            this.su_singlepringqty1_label.Name = "su_singlepringqty1_label";
+            this.su_singlepringqty1_label.Size = new System.Drawing.Size(106, 21);
+            this.su_singlepringqty1_label.TabIndex = 108;
+            this.su_singlepringqty1_label.Text = "单片印刷次数";
+            // 
+            // SU_RETURNIFCLEAN
+            // 
+            this.SU_RETURNIFCLEAN.AutoSize = true;
+            this.SU_RETURNIFCLEAN.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SU_RETURNIFCLEAN.Location = new System.Drawing.Point(489, 459);
+            this.SU_RETURNIFCLEAN.Name = "SU_RETURNIFCLEAN";
+            this.SU_RETURNIFCLEAN.Size = new System.Drawing.Size(84, 24);
+            this.SU_RETURNIFCLEAN.TabIndex = 110;
+            this.SU_RETURNIFCLEAN.Text = "是否清洗";
+            this.SU_RETURNIFCLEAN.UseVisualStyleBackColor = true;
+            // 
+            // su_singlepringqty1
+            // 
+            this.su_singlepringqty1.AllPower = null;
+            this.su_singlepringqty1.BackColor = System.Drawing.Color.White;
+            this.su_singlepringqty1.ID = null;
+            this.su_singlepringqty1.Location = new System.Drawing.Point(556, 432);
+            this.su_singlepringqty1.Name = "su_singlepringqty1";
+            this.su_singlepringqty1.Power = null;
+            this.su_singlepringqty1.Size = new System.Drawing.Size(39, 21);
+            this.su_singlepringqty1.Str = null;
+            this.su_singlepringqty1.Str1 = null;
+            this.su_singlepringqty1.Str2 = null;
+            this.su_singlepringqty1.TabIndex = 109;
+            this.su_singlepringqty1.Text = "1";
             // 
             // st_table
             // 
             this.st_table.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.st_table.FormattingEnabled = true;
             this.st_table.Items.AddRange(new object[] {
-            "Bottom",
-            "Top"});
-            this.st_table.Location = new System.Drawing.Point(523, 432);
+            "BOTTOM",
+            "TOP"});
+            this.st_table.Location = new System.Drawing.Point(319, 431);
             this.st_table.Name = "st_table";
             this.st_table.Size = new System.Drawing.Size(121, 20);
             this.st_table.TabIndex = 107;
@@ -315,7 +307,7 @@
             this.Receive.DownImage = ((System.Drawing.Image)(resources.GetObject("Receive.DownImage")));
             this.Receive.Image = null;
             this.Receive.IsShowBorder = true;
-            this.Receive.Location = new System.Drawing.Point(828, 428);
+            this.Receive.Location = new System.Drawing.Point(828, 425);
             this.Receive.MoveImage = ((System.Drawing.Image)(resources.GetObject("Receive.MoveImage")));
             this.Receive.Name = "Receive";
             this.Receive.NormalImage = ((System.Drawing.Image)(resources.GetObject("Receive.NormalImage")));
@@ -442,7 +434,7 @@
             this.st_combinenumber.AllPower = null;
             this.st_combinenumber.BackColor = System.Drawing.Color.White;
             this.st_combinenumber.ID = null;
-            this.st_combinenumber.Location = new System.Drawing.Point(568, 464);
+            this.st_combinenumber.Location = new System.Drawing.Point(357, 461);
             this.st_combinenumber.Name = "st_combinenumber";
             this.st_combinenumber.Power = null;
             this.st_combinenumber.Size = new System.Drawing.Size(120, 21);
@@ -456,7 +448,7 @@
             this.SU_DEVCODE1.AllPower = null;
             this.SU_DEVCODE1.BackColor = System.Drawing.Color.White;
             this.SU_DEVCODE1.ID = null;
-            this.SU_DEVCODE1.Location = new System.Drawing.Point(340, 462);
+            this.SU_DEVCODE1.Location = new System.Drawing.Point(136, 461);
             this.SU_DEVCODE1.Name = "SU_DEVCODE1";
             this.SU_DEVCODE1.Power = null;
             this.SU_DEVCODE1.Size = new System.Drawing.Size(120, 21);
@@ -466,26 +458,12 @@
             this.SU_DEVCODE1.TabIndex = 88;
             this.SU_DEVCODE1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SU_DEVCODE1_KeyDown);
             // 
-            // SU_RETURNMAN
-            // 
-            this.SU_RETURNMAN.AllPower = null;
-            this.SU_RETURNMAN.BackColor = System.Drawing.Color.White;
-            this.SU_RETURNMAN.ID = null;
-            this.SU_RETURNMAN.Location = new System.Drawing.Point(134, 465);
-            this.SU_RETURNMAN.Name = "SU_RETURNMAN";
-            this.SU_RETURNMAN.Power = null;
-            this.SU_RETURNMAN.Size = new System.Drawing.Size(120, 21);
-            this.SU_RETURNMAN.Str = null;
-            this.SU_RETURNMAN.Str1 = null;
-            this.SU_RETURNMAN.Str2 = null;
-            this.SU_RETURNMAN.TabIndex = 86;
-            // 
             // SU_DEVCODE
             // 
             this.SU_DEVCODE.AllPower = null;
             this.SU_DEVCODE.BackColor = System.Drawing.Color.White;
             this.SU_DEVCODE.ID = null;
-            this.SU_DEVCODE.Location = new System.Drawing.Point(340, 432);
+            this.SU_DEVCODE.Location = new System.Drawing.Point(136, 431);
             this.SU_DEVCODE.Name = "SU_DEVCODE";
             this.SU_DEVCODE.Power = null;
             this.SU_DEVCODE.Size = new System.Drawing.Size(120, 21);
@@ -495,20 +473,6 @@
             this.SU_DEVCODE.TabIndex = 82;
             this.SU_DEVCODE.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SU_DEVCODE_KeyDown);
             // 
-            // SU_USEMAN
-            // 
-            this.SU_USEMAN.AllPower = null;
-            this.SU_USEMAN.BackColor = System.Drawing.Color.White;
-            this.SU_USEMAN.ID = null;
-            this.SU_USEMAN.Location = new System.Drawing.Point(134, 432);
-            this.SU_USEMAN.Name = "SU_USEMAN";
-            this.SU_USEMAN.Power = null;
-            this.SU_USEMAN.Size = new System.Drawing.Size(120, 21);
-            this.SU_USEMAN.Str = null;
-            this.SU_USEMAN.Str1 = null;
-            this.SU_USEMAN.Str2 = null;
-            this.SU_USEMAN.TabIndex = 80;
-            // 
             // ToolsBom
             // 
             this.ToolsBom.AllowUserToAddRows = false;
@@ -516,6 +480,8 @@
             this.ToolsBom.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.su_stcode,
             this.st_pcbcode,
+            this.su_status,
+            this.SU_LINECODE,
             this.su_stverison,
             this.su_singlepringqty,
             this.su_table,
@@ -527,6 +493,56 @@
             this.ToolsBom.Size = new System.Drawing.Size(906, 384);
             this.ToolsBom.TabIndex = 76;
             // 
+            // su_stcode
+            // 
+            this.su_stcode.DataPropertyName = "su_stcode";
+            this.su_stcode.HeaderText = "钢网编号";
+            this.su_stcode.Name = "su_stcode";
+            // 
+            // st_pcbcode
+            // 
+            this.st_pcbcode.DataPropertyName = "st_pcbcode";
+            this.st_pcbcode.HeaderText = "PCB料号";
+            this.st_pcbcode.Name = "st_pcbcode";
+            // 
+            // su_status
+            // 
+            this.su_status.DataPropertyName = "su_status";
+            this.su_status.HeaderText = "领用状态";
+            this.su_status.Name = "su_status";
+            // 
+            // SU_LINECODE
+            // 
+            this.SU_LINECODE.DataPropertyName = "SU_LINECODE";
+            this.SU_LINECODE.HeaderText = "线别";
+            this.SU_LINECODE.Name = "SU_LINECODE";
+            // 
+            // su_stverison
+            // 
+            this.su_stverison.DataPropertyName = "su_stverison";
+            this.su_stverison.HeaderText = "版本号";
+            this.su_stverison.Name = "su_stverison";
+            // 
+            // su_singlepringqty
+            // 
+            this.su_singlepringqty.DataPropertyName = "su_singlepringqty";
+            this.su_singlepringqty.HeaderText = "单片印刷次数";
+            this.su_singlepringqty.Name = "su_singlepringqty";
+            // 
+            // su_table
+            // 
+            this.su_table.DataPropertyName = "su_table";
+            this.su_table.HeaderText = "板面";
+            this.su_table.Name = "su_table";
+            // 
+            // su_usemacode
+            // 
+            this.su_usemacode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.su_usemacode.DataPropertyName = "su_usemacode";
+            this.su_usemacode.HeaderText = "领用工单";
+            this.su_usemacode.Name = "su_usemacode";
+            this.su_usemacode.Width = 61;
+            // 
             // Confirm
             // 
             this.Confirm.AllPower = null;
@@ -553,13 +569,13 @@
             this.li_code.Condition = null;
             this.li_code.DBTitle = null;
             this.li_code.FormName = null;
-            this.li_code.Location = new System.Drawing.Point(535, 9);
+            this.li_code.Location = new System.Drawing.Point(682, 430);
             this.li_code.Name = "li_code";
             this.li_code.Power = null;
             this.li_code.ReturnData = null;
             this.li_code.SelectField = null;
             this.li_code.SetValueField = null;
-            this.li_code.Size = new System.Drawing.Size(140, 21);
+            this.li_code.Size = new System.Drawing.Size(127, 21);
             this.li_code.TabIndex = 74;
             this.li_code.TableName = null;
             this.li_code.TextBoxEnable = false;
@@ -596,50 +612,16 @@
             this.ma_code.TableName = null;
             this.ma_code.Tag = "ma_code";
             this.ma_code.TextBoxEnable = true;
-            // 
-            // su_usemacode
-            // 
-            this.su_usemacode.DataPropertyName = "su_usemacode";
-            this.su_usemacode.HeaderText = "领用工单";
-            this.su_usemacode.Name = "su_usemacode";
-            // 
-            // su_table
-            // 
-            this.su_table.DataPropertyName = "su_table";
-            this.su_table.HeaderText = "板面";
-            this.su_table.Name = "su_table";
-            // 
-            // su_singlepringqty
-            // 
-            this.su_singlepringqty.DataPropertyName = "su_singlepringqty";
-            this.su_singlepringqty.HeaderText = "单片印刷次数";
-            this.su_singlepringqty.Name = "su_singlepringqty";
-            // 
-            // su_stverison
-            // 
-            this.su_stverison.DataPropertyName = "su_stverison";
-            this.su_stverison.HeaderText = "版本号";
-            this.su_stverison.Name = "su_stverison";
-            // 
-            // st_pcbcode
-            // 
-            this.st_pcbcode.DataPropertyName = "st_pcbcode";
-            this.st_pcbcode.HeaderText = "PCB料号";
-            this.st_pcbcode.Name = "st_pcbcode";
-            // 
-            // su_stcode
-            // 
-            this.su_stcode.DataPropertyName = "su_stcode";
-            this.su_stcode.HeaderText = "钢网编号";
-            this.su_stcode.Name = "su_stcode";
+            this.ma_code.TextKeyDown += new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextKeyDown(this.ma_code_TextKeyDown);
             // 
             // Make_SMTStencil
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(908, 551);
-            this.Controls.Add(this.enterTextBox1);
-            this.Controls.Add(this.label1);
+            this.Controls.Add(this.SU_RETURNIFCLEAN);
+            this.Controls.Add(this.su_singlepringqty1);
+            this.Controls.Add(this.su_singlepringqty1_label);
             this.Controls.Add(this.st_table);
             this.Controls.Add(this.ma_qty);
             this.Controls.Add(this.ma_qty_label);
@@ -661,13 +643,9 @@
             this.Controls.Add(this.st_combinenumber_label);
             this.Controls.Add(this.SU_DEVCODE1);
             this.Controls.Add(this.SU_DEVCODE1_label);
-            this.Controls.Add(this.SU_RETURNMAN);
-            this.Controls.Add(this.SU_RETURNMAN_label);
             this.Controls.Add(this.st_table_label);
             this.Controls.Add(this.SU_DEVCODE);
             this.Controls.Add(this.SU_DEVCODE_label);
-            this.Controls.Add(this.SU_USEMAN);
-            this.Controls.Add(this.SU_USEMAN_label);
             this.Controls.Add(this.RadioReturn);
             this.Controls.Add(this.RadioReceive);
             this.Controls.Add(this.ToolsBom);
@@ -702,13 +680,9 @@
         private CustomControl.DataGrid_View.DataGridViewWithSerialNum ToolsBom;
         private System.Windows.Forms.RadioButton RadioReceive;
         private System.Windows.Forms.RadioButton RadioReturn;
-        private CustomControl.TextBoxWithIcon.EnterTextBox SU_USEMAN;
-        private System.Windows.Forms.Label SU_USEMAN_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox SU_DEVCODE;
         private System.Windows.Forms.Label SU_DEVCODE_label;
         private System.Windows.Forms.Label st_table_label;
-        private CustomControl.TextBoxWithIcon.EnterTextBox SU_RETURNMAN;
-        private System.Windows.Forms.Label SU_RETURNMAN_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox SU_DEVCODE1;
         private System.Windows.Forms.Label SU_DEVCODE1_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox st_combinenumber;
@@ -730,13 +704,16 @@
         private System.Windows.Forms.Label ma_qty_label;
         private System.Windows.Forms.Label ma_qty;
         private CustomControl.ComBoxWithFocus.ComBoxWithFocus st_table;
-        private CustomControl.TextBoxWithIcon.EnterTextBox enterTextBox1;
-        private System.Windows.Forms.Label label1;
+        private CustomControl.TextBoxWithIcon.EnterTextBox su_singlepringqty1;
+        private System.Windows.Forms.Label su_singlepringqty1_label;
         private System.Windows.Forms.DataGridViewTextBoxColumn su_stcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn st_pcbcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn su_status;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SU_LINECODE;
         private System.Windows.Forms.DataGridViewTextBoxColumn su_stverison;
         private System.Windows.Forms.DataGridViewTextBoxColumn su_singlepringqty;
         private System.Windows.Forms.DataGridViewTextBoxColumn su_table;
         private System.Windows.Forms.DataGridViewTextBoxColumn su_usemacode;
+        private System.Windows.Forms.CheckBox SU_RETURNIFCLEAN;
     }
 }

UAS-MES/FunctionCode/Make/Make_SMTStencil.cs

@@ -27,9 +27,7 @@ namespace UAS_MES.Make
         public Make_SMTStencil()
         {
             InitializeComponent();
-            SU_USEMAN.Enabled = false;
             SU_DEVCODE.Enabled = false;
-            SU_RETURNMAN.Enabled = false;
             st_combinenumber.Enabled = false;
             SU_DEVCODE1.Enabled = false;
             ST_ENSIONA.Enabled = false;
@@ -37,8 +35,12 @@ namespace UAS_MES.Make
             ST_ENSIONC.Enabled = false;
             ST_ENSIOND.Enabled = false;
             ST_ENSIONE.Enabled = false;
+            st_table.Enabled = false;
+            su_singlepringqty1.Enabled = false;
+            Receive.Enabled = false;
             Return.Enabled = false;
             Scrap.Enabled = false;
+
         }
 
         private void Make_SMTStencil_Load(object sender, EventArgs e)
@@ -70,6 +72,7 @@ namespace UAS_MES.Make
         {
             Dbfind = ma_code.ReturnData;
             BaseUtil.SetFormValue(this.Controls, Dbfind);
+            Confirm.PerformClick();
         }
 
         private void Make_SMTStencil_SizeChanged(object sender, EventArgs e)
@@ -77,45 +80,174 @@ namespace UAS_MES.Make
             asc.controlAutoSize(this);
         }
 
-        private void Confirm_Click(object sender, EventArgs e)
+        private void LoadGridData()
         {
             sql.Clear();
-            sql.Append("select St_PCBCODE,su_stcode,su_table,su_usemacode,su_singlepringqty,su_stverison ");
-            sql.Append("from StencilUse left join stencil on st_code=su_stcode where su_usemacode='" + ma_code.Text + "'");
+            sql.Append("select St_PCBCODE,su_stcode,su_table,su_status,su_linecode,su_usemacode,su_singlepringqty,su_stverison ");
+            sql.Append("from StencilUse left join stencil on st_code=su_stcode where su_usemacode='" + ma_code.Text + "' and su_status='借出'");
             DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             BaseUtil.FillDgvWithDataTable(ToolsBom, dt);
         }
 
-        private void Receive_Click(object sender, EventArgs e)
+        private void Confirm_Click(object sender, EventArgs e)
         {
+            LoadGridData();
+        }
 
+        private void Receive_Click(object sender, EventArgs e)
+        {
+            if (ma_code.Text == "")
+            {
+                MessageBox.Show("工单号不能为空");
+            }
+            DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS from Stencil where st_code='" + SU_DEVCODE.Text + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                string status = dt.Rows[0]["ST_USESTATUS"].ToString();
+                if (status == "借出" || status == "报废")
+                {
+                    MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法再次领用");
+                    return;
+                }
+            }
+            else
+            {
+                MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在");
+            }
+            dt = (DataTable)dh.ExecuteSql("select 1 from STENILCANUSEPRO where sp_stcode='" + SU_DEVCODE.Text + "' and sp_prodcode='" + ma_prodcode.Text + "'", "select");
+            if (dt.Rows.Count == 0)
+            {
+                MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不能在产品" + ma_prodcode.Text + "中使用");
+                return;
+            }
+            sql.Clear();
+            sql.Append("insert into StencilUse(su_id,SU_USEPRODCODE,su_stid,su_linecode,su_stcode,su_usedate,su_useman,SU_USEMANCODE,SU_TABLE,su_usemacode,su_singlepringqty,su_stverison,SU_STATUS)");
+            sql.Append("select StencilUse_seq.nextval,'" + ma_prodcode.Text + "',st_id,'" + li_code.Text + "','" + SU_DEVCODE.Text + "',sysdate,'" + User.UserName + "','" + User.UserCode + "','" + st_table.Text + "','" + ma_code.Text + "'");
+            sql.Append(",'" + su_singlepringqty1.Text + "',st_version,'借出' from ");
+            sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
+            dh.ExecuteSql(sql.ToString(), "insert");
+            dh.ExecuteSql("update Stencil set ST_USESTATUS='借出' where st_code='" + SU_DEVCODE.Text + "'", "update");
+            MessageBox.Show("领用成功");
+            st_table.SelectedItem = null;
+            SU_DEVCODE.Text = "";
+            Receive.Enabled = false;
+            LoadGridData();
         }
 
         private void Return_Click(object sender, EventArgs e)
         {
-
+            if (ST_ENSIONA.Text != "" && ST_ENSIONB.Text != "" && ST_ENSIONC.Text != "" && ST_ENSIOND.Text != "" && ST_ENSIONE.Text != "")
+            {
+                if (SU_RETURNIFCLEAN.Checked)
+                {
+                    DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "'", "select");
+                    if (dt.Rows.Count > 0)
+                    {
+                        string status = dt.Rows[0]["ST_USESTATUS"].ToString();
+                        if (status == "在仓")
+                        {
+                            MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "未借出,无需归还");
+                            return;
+                        }
+                        if (status == "报废")
+                        {
+                            MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法退回");
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在");
+                    }
+                    string St_USECOUNT = dt.Rows[0]["St_USECOUNT"].ToString();
+                    sql.Clear();
+                    sql.Append("update StencilUse set SU_BACKDATE=sysdate,SU_ENSIONA='" + ST_ENSIONA.Text + "',SU_ENSIONB='" + ST_ENSIONB.Text + "',SU_ENSIONC='" + ST_ENSIONC.Text + "',SU_ENSIOND='" + ST_ENSIOND.Text + "',");
+                    sql.Append("SU_ENSIONE='" + ST_ENSIONE.Text + "',SU_THISUSETIMES='" + st_combinenumber.Text + "',SU_STATUS='在仓',su_usecount=" + (St_USECOUNT == "" ? "0" : St_USECOUNT) + "+" + st_combinenumber.Text);
+                    sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "')");
+                    dh.ExecuteSql(sql.ToString(), "update");
+                    sql.Clear();
+                    sql.Append("update Stencil set St_USECOUNT=nvl(St_USECOUNT,0)+" + st_combinenumber.Text + ",ST_USESTATUS='在仓',ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',");
+                    sql.Append("ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "' ");
+                    sql.Append("where st_code='" + SU_DEVCODE1.Text + "'");
+                    dh.ExecuteSql(sql.ToString(), "update");
+                    MessageBox.Show("钢网" + SU_DEVCODE1.Text + "退回成功！");
+                    SU_DEVCODE1.Text = "";
+                    st_combinenumber.Text = "";
+                    ST_ENSIONA.Text = "";
+                    ST_ENSIONB.Text = "";
+                    ST_ENSIONC.Text = "";
+                    ST_ENSIOND.Text = "";
+                    ST_ENSIONE.Text = "";
+                    SU_RETURNIFCLEAN.Checked = false;
+                    Return.Enabled = false;
+                    Confirm.PerformClick();
+                }
+                else
+                {
+                    MessageBox.Show("请确认是否清洗钢网");
+                }
+            }
+            else
+            {
+                MessageBox.Show("请维护完成的测试参数");
+            }
         }
 
         Make_StencilScrapReason form;
         private void Scrap_Click(object sender, EventArgs e)
         {
-            form = new Make_StencilScrapReason();
-            BaseUtil.SetFormCenter(form);
-            form.Controls["ConfirmScrap"].Click += Make_SMTStencil_Click;
-            form.ShowDialog();
+            DataTable dt = (DataTable)dh.ExecuteSql("select st_usestatus from stencil where st_code='" + SU_DEVCODE1.Text + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                if (dt.Rows[0]["st_usestatus"].ToString() == "报废")
+                {
+                    MessageBox.Show("钢网" + SU_DEVCODE1.Text + "已处于报废状态");
+                    return;
+                }
+                if (dt.Rows[0]["st_usestatus"].ToString() != "借出")
+                {
+                    MessageBox.Show("报废钢网必须" + SU_DEVCODE1.Text + "处于借出状态");
+                    return;
+                }
+                string closetab_confirm = MessageBox.Show(this.ParentForm, "报废后不可撤销，是否确认报废", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                if (closetab_confirm != "Yes")
+                {
+                    return;
+                }
+                form = new Make_StencilScrapReason();
+                BaseUtil.SetFormCenter(form);
+                form.Controls["ConfirmScrap"].Click += Make_SMTStencil_Click;
+                form.ShowDialog();
+            }
         }
 
         private void Make_SMTStencil_Click(object sender, EventArgs e)
         {
             string Code = "";
             string scrapreason = form.Controls["Reason"].Text;
-            LogicHandler.GetSerialNumByCaller("StencilScrap", out Code);
+            if (scrapreason == "")
+            {
+                MessageBox.Show("报废原因不能为空");
+                return;
+            }
+            DataTable dt = (DataTable)dh.ExecuteSql("select St_USECOUNT from stencil where st_code='" + SU_DEVCODE1.Text + "'", "select");
+            string St_USECOUNT = dt.Rows[0]["St_USECOUNT"].ToString();
             sql.Clear();
-            sql.Append("insert into StencilScrap(ss_id,ss_code,ss_stcode,ss_scrapreason,ss_inman,ss_indate,ss_status)");
-            sql.Append("values (StencilScrap_seq.nextval,'" + Code + "','" + SU_DEVCODE1.Text + "','" + scrapreason + "',");
-            sql.Append("'" + User.UserCode + "',sysdate,'ENTERING')");
+            sql.Append("update StencilUse set SU_IFSCRAPOLD=-1,SU_THISUSETIMES='" + st_combinenumber.Text + "',SU_STATUS='报废',su_usecount=" + (St_USECOUNT == "" ? "0" : St_USECOUNT) + "+" + st_combinenumber.Text);
+            sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "')");
+            dh.ExecuteSql(sql.ToString(), "update");
+            sql.Clear();
+            sql.Append("update STENCIL set ST_SCRAPREASON='" + scrapreason + "',ST_USESTATUS='报废' where st_code='" + SU_DEVCODE1.Text + "'");
             dh.ExecuteSql(sql.ToString(), "insert");
+            //推送人员信息
+            string[] emid = dh.GetConfig("sendEmp", "Stencil").ToString().Replace("\n", "#").Split('#');
+            for (int i = 0; i < emid.Length; i++)
+            {
+                string em_name = dh.getFieldDataByCondition("employee", "em_name", "em_id='" + emid[i] + "'").ToString();
+                LogicHandler.SendMessage(emid[i], em_name, "钢网" + SU_DEVCODE1.Text + "已报废");
+            }
             form.Close();
+            Scrap.Enabled = false;
         }
 
         private void Radio_CheckedChanged(object sender, EventArgs e)
@@ -125,9 +257,11 @@ namespace UAS_MES.Make
                 case "RadioReceive":
                     if ((sender as RadioButton).Checked)
                     {
-                        SU_USEMAN.Enabled = true;
                         SU_DEVCODE.Enabled = true;
-                        SU_RETURNMAN.Enabled = false;
+                        Receive.Enabled = true;
+                        st_table.Enabled = true;
+                        su_singlepringqty1.Enabled = true;
+                        Receive.Enabled = true;
                         st_combinenumber.Enabled = false;
                         SU_DEVCODE1.Enabled = false;
                         ST_ENSIONA.Enabled = false;
@@ -142,7 +276,6 @@ namespace UAS_MES.Make
                 case "RadioReturn":
                     if ((sender as RadioButton).Checked)
                     {
-                        SU_RETURNMAN.Enabled = true;
                         SU_DEVCODE1.Enabled = true;
                         st_combinenumber.Enabled = true;
                         ST_ENSIONA.Enabled = true;
@@ -150,8 +283,11 @@ namespace UAS_MES.Make
                         ST_ENSIONC.Enabled = true;
                         ST_ENSIOND.Enabled = true;
                         ST_ENSIONE.Enabled = true;
-                        SU_USEMAN.Enabled = false;
                         SU_DEVCODE.Enabled = false;
+                        st_table.Enabled = false;
+                        su_singlepringqty1.Enabled = false;
+                        Receive.Enabled = false;
+                        Receive.Enabled = false;
                     }
                     break;
                 default:
@@ -163,17 +299,20 @@ namespace UAS_MES.Make
         private void ST_ENSION_TextChanged(object sender, EventArgs e)
         {
             double Range = 0;
-            if (double.TryParse((sender as Control).Text, out Range))
+            if (ST_ENSIONA.Text != "" && ST_ENSIONB.Text != "" && ST_ENSIONC.Text != "" && ST_ENSIOND.Text != "" && ST_ENSIONE.Text != "")
             {
-                if (Range >= 39 && Range <= 55)
+                if (double.TryParse((sender as Control).Text, out Range))
                 {
-                    Return.Enabled = true;
-                    Scrap.Enabled = false;
-                }
-                else
-                {
-                    Return.Enabled = false;
-                    Scrap.Enabled = true;
+                    if (Range >= 39 && Range <= 55)
+                    {
+                        Return.Enabled = true;
+                        Scrap.Enabled = false;
+                    }
+                    else
+                    {
+                        Return.Enabled = false;
+                        Scrap.Enabled = true;
+                    }
                 }
             }
         }
@@ -182,7 +321,26 @@ namespace UAS_MES.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
-
+                DataTable dt = (DataTable)dh.ExecuteSql("select st_usestatus,st_table from stencil where st_code='" + SU_DEVCODE.Text + "'", "select");
+                if (dt.Rows.Count == 0)
+                {
+                    MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "不存在");
+                }
+                if (dt.Rows.Count > 0)
+                {
+                    for (int i = 0; i < st_table.Items.Count; i++)
+                    {
+                        if (st_table.Items[i].ToString() == dt.Rows[0]["st_table"].ToString())
+                        {
+                            st_table.SelectedItem = st_table.Items[i];
+                        }
+                    }
+                    Receive.Enabled = true;
+                    if (dt.Rows[0]["st_usestatus"].ToString() == "报废")
+                    {
+                        MessageBox.Show("钢网编号" + SU_DEVCODE.Text + "已报废");
+                    }
+                }
             }
         }
 
@@ -193,8 +351,21 @@ namespace UAS_MES.Make
                 DataTable dt = (DataTable)dh.ExecuteSql("select case when nvl(ST_COMBINENUMBER,1)=0 then 1 else nvl(ST_COMBINENUMBER,1) end from STENCIL where st_code='" + SU_DEVCODE1.Text + "'", "select");
                 if (dt.Rows.Count > 0)
                 {
+                    Console.WriteLine(dt.Rows[0][0].ToString());
                     st_combinenumber.Text = (int.Parse(ma_qty.Text) / int.Parse(dt.Rows[0][0].ToString())).ToString();
                 }
+                else
+                {
+                    MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在");
+                }
+            }
+        }
+
+        private void ma_code_TextKeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                Confirm.PerformClick();
             }
         }
     }

UAS-MES/FunctionCode/Make/Make_SMTStencil.resx

@@ -238,6 +238,12 @@
   <metadata name="st_pcbcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="su_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SU_LINECODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="su_stverison.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

UAS-MES/Login.cs

@@ -162,7 +162,7 @@ namespace UAS_MES
         private void SetInf()
         {
             //设置全局用户信息
-            string[] field = { "em_code,em_depart,em_type,em_name,em_position,em_professname,em_type,ug_code,ug_name" };
+            string[] field = { "em_code,em_depart,em_id,em_type,em_name,em_position,em_professname,em_type,ug_code,ug_name" };
             UserInf = dh.getFieldsDataByCondition("Employee left join cs$userresource on ur_emcode=em_code left join cs$usergroup on ug_code=ur_groupcode", field, "upper(em_code)='" + UserName.Text.ToUpper() + "'");
             DataTable dt = dh.getFieldsDataByCondition("source left join step on sc_stepcode=st_code", new string[] { "st_badgroupcode", "sc_wccode", "sc_code", "sc_stepcode", "sc_stepname", "sc_linecode" }, "upper(sc_code)='" + Source.Text.ToUpper() + "'");
             //存在岗位资源则要求添加
@@ -176,6 +176,7 @@ namespace UAS_MES
                 User.WorkCenter = dt.Rows[0]["sc_wccode"].ToString();
             }
             //通过Source表关联岗位资源编号查询出当前的执行工序
+            User.UserID = UserInf.Rows[0]["em_id"].ToString();
             User.UserCode = UserInf.Rows[0]["em_code"].ToString();
             User.UserDepartment = UserInf.Rows[0]["em_depart"].ToString();
             User.UserName = UserInf.Rows[0]["em_name"].ToString();

UAS-MES/PublicMethod/LogicHandler.cs

@@ -37,6 +37,34 @@ namespace UAS_MES.PublicMethod
             dh.ExecuteSql(sql.ToString(), "insert");
         }
 
+
+        public static void SendMessage(string iUserID, string iUserName, string iContext)
+        {
+            string id = dh.GetSEQ("pagingrelease_seq");
+            sql.Clear();
+            sql.Append("insert into pagingrelease(pr_id,pr_releaser,pr_date,pr_context,PR_FROM,pr_title,pr_caller,pr_keyvalue,pr_codevalue)");
+            sql.Append("values(" + id + ",'系统管理员',sysdate,'" + iContext + "','system','知会消息','','','')");
+            dh.ExecuteSql(sql.ToString(), "insert");
+            sql.Clear();
+            sql.Append("insert into pagingreleasedetail(prd_id,prd_prid,PRD_RECIPIENTID,PRD_RECIPIENT) ");
+            sql.Append("values(PAGINGRELEASEDETAIL_SEQ.NEXTVAL, " + id + ", " + iUserID + ", '" + iUserName + "')");
+            dh.ExecuteSql(sql.ToString(), "insert");
+            sql.Clear();
+            sql.Append("insert into pagingreleasedetail(prd_id,prd_prid,PRD_RECIPIENTID,PRD_RECIPIENT) ");
+            sql.Append("values(PAGINGRELEASEDETAIL_SEQ.NEXTVAL, " + id + ", " + iUserID + ", '" + iUserName + "')");
+            dh.ExecuteSql(sql.ToString(), "insert");
+            string id1 = dh.GetSEQ("ICQHISTORY_seq");
+            sql.Clear();
+            sql.Append("Insert into ICQHISTORY (IH_ID,IH_CALL,IH_CALLID,IH_DATE,IH_CONTEXT,IH_ATTACH,IH_FROM,IH_CODEVALUE,IH_CALLER,IH_TITLE,IH_KEYVALUE,IH_PRID) ");
+            sql.Append("select " + id1 + ",pr_releaser,pr_releaserid,pr_date,pr_context,pr_attach,pr_from,pr_codevalue,pr_caller,pr_title,pr_keyvalue,pr_id from PAGINGRELEASE  where pr_id=" + id);
+            dh.ExecuteSql(sql.ToString(), "insert");
+            sql.Clear();
+            sql.Append("Insert into ICQHISTORYdetail (IHD_ID,IHD_IHID,IHD_RECEIVE,IHD_RECEIVEID,IHD_MOBILE,IHD_READSTATUS,IHD_STATUS)  ");
+            sql.Append("select ICQHISTORYdetail_seq.nextval," + id1 + ",prd_recipient,prd_recipientid,prd_mobile,0,0 ");
+            sql.Append("from PAGINGRELEASEdetail where prd_prid=" + id);
+            dh.ExecuteSql(sql.ToString(), "insert");
+        }
+
         /// <summary>
         /// 判断工单是否已经下放
         /// </summary>