调整刮刀 钢网、自定义标签打印

UAS_MES_HGS/FunctionCode/Make/Make_CustomLabelPrint.cs

@@ -178,12 +178,12 @@ namespace UAS_MES_NEW.Make
                     for (int i = 0; i < btFormat.NamedSubStrings.Count; i++)
                     {
                         //找到对应的变量名
-                        if (btFormat.NamedSubStrings.Item(i).Name == paramsInfo.Rows[currentIndex - 1]["lp_name"].ToString())
+                        if (btFormat.NamedSubStrings.Item(paramsInfo.Rows[currentIndex - 1]["lp_name"].ToString()).Name == paramsInfo.Rows[currentIndex - 1]["lp_name"].ToString())
                         {
                             //如果当时采集行的 lp_valuetype=’INPUT’,并且lp_sql 为空，则直接将采集的值赋给标签打印
                             if (paramsInfo.Rows[currentIndex - 1]["lp_valuetype"].ToString() == "INPUT" && paramsInfo.Rows[currentIndex - 1]["lp_sql"].ToString() == "")
                             {
-                                btFormat.NamedSubStrings.Item(i).Value = inputText.Text;
+                                btFormat.SetNamedSubStringValue(btFormat.NamedSubStrings.Item(paramsInfo.Rows[currentIndex - 1]["lp_name"].ToString()).Name, inputText.Text);
                             }
                             else
                             {
@@ -195,10 +195,10 @@ namespace UAS_MES_NEW.Make
                                     string x = mch.Value.Trim();
                                     sql = sql.Replace(x, "'" + inputText.Text + "'");
                                 }
-                                btFormat.NamedSubStrings.Item(i).Value = dh.GetLabelParam(sql).ToString();
-                                sb.AppendLine("打印参数【" + btFormat.NamedSubStrings.Item(i).Name + "】赋值，" + "取值SQL:" + sql + "，取到值" + btFormat.NamedSubStrings.Item(i).Value);
+                                btFormat.SetNamedSubStringValue(btFormat.NamedSubStrings.Item(paramsInfo.Rows[currentIndex - 1]["lp_name"].ToString()).Name, dh.GetLabelParam(sql).ToString());
+                                sb.AppendLine("打印参数【" + btFormat.NamedSubStrings.Item(paramsInfo.Rows[currentIndex - 1]["lp_name"].ToString()).Name + "】赋值，" + "取值SQL:" + sql + "，取到值" + btFormat.NamedSubStrings.Item(paramsInfo.Rows[currentIndex - 1]["lp_name"].ToString()).Value);
                             }
-                            inputValues[currentIndex - 1] = btFormat.NamedSubStrings.Item(i).Value;
+                            inputValues[currentIndex - 1] = btFormat.NamedSubStrings.Item(paramsInfo.Rows[currentIndex - 1]["lp_name"].ToString()).Value;
                         }
                     }
                     if (currentIndex == paramsInfo.Rows.Count)
@@ -213,11 +213,12 @@ namespace UAS_MES_NEW.Make
                         //format.Print();
                         btFormat.PrintSetup.Printer = Printer.Text;
                         btFormat.PrintSetup.IdenticalCopiesOfLabel = int.Parse(PrintNum.Text);
-                        btFormat.PrintOut();
+                        btFormat.PrintSetup.NumberSerializedLabels = 1;
+                        btFormat.PrintOut(false, false);
 
                         for (int i = 0; i < btFormat.NamedSubStrings.Count; i++)
                         {
-                            btFormat.NamedSubStrings.Item(i).Value = null;
+                            btFormat.SetNamedSubStringValue(btFormat.NamedSubStrings.Item(paramsInfo.Rows[i]["lp_name"].ToString()).Name, null);
                         }
                         //讲文件最后写入时间改成数据库中拿到的时间
                         //记录打印日志
@@ -309,10 +310,10 @@ namespace UAS_MES_NEW.Make
                     for (int j = 0; j < paramsInfo.Rows.Count; j++)
                     {
                         //找到对应的变量名
-                        if (btFormat.NamedSubStrings.Item(i).Name == paramsInfo.Rows[j]["lp_name"].ToString())
+                        if (btFormat.NamedSubStrings.Item(paramsInfo.Rows[j]["lp_name"].ToString()).Name == paramsInfo.Rows[j]["lp_name"].ToString())
                         {
                             //直接赋值
-                            btFormat.NamedSubStrings.Item(i).Value = inputValues[j];
+                            btFormat.SetNamedSubStringValue(btFormat.NamedSubStrings.Item(paramsInfo.Rows[j]["lp_name"].ToString()).Name, inputValues[j]);
                         }
                     }
                 }
@@ -324,11 +325,12 @@ namespace UAS_MES_NEW.Make
                 //format.Print();
                 btFormat.PrintSetup.Printer = Printer.Text;
                 btFormat.PrintSetup.IdenticalCopiesOfLabel = int.Parse(PrintNum.Text);
-                btFormat.PrintOut();
+                btFormat.PrintSetup.NumberSerializedLabels = 1;
+                btFormat.PrintOut(false, false);
 
                 for (int i = 0; i < btFormat.NamedSubStrings.Count; i++)
                 {
-                    btFormat.NamedSubStrings.Item(i).Value = null;
+                    btFormat.SetNamedSubStringValue(btFormat.NamedSubStrings.Item(paramsInfo.Rows[i]["lp_name"].ToString()).Name, null);
                 }
                 //讲文件最后写入时间改成数据库中拿到的时间
                 //记录打印日志

UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.Designer.cs

@@ -80,6 +80,15 @@
             this.li_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.ma_prodcode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.cleanEmpVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.cleanEmpLab = new System.Windows.Forms.Label();
+            this.cleanCodeVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.cleanCodeLab = new System.Windows.Forms.Label();
+            this.qaConfrimVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.qaConfrimLab = new System.Windows.Forms.Label();
+            this.qaConfrimCodeVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.qaConfrimCodeLab = new System.Windows.Forms.Label();
+            this.Confrim = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             ((System.ComponentModel.ISupportInitialize)(this.ToolsBom)).BeginInit();
             this.SuspendLayout();
             // 
@@ -170,7 +179,7 @@
             // 
             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(89, 828);
+            this.SU_DEVCODE1_label.Location = new System.Drawing.Point(89, 826);
             this.SU_DEVCODE1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.SU_DEVCODE1_label.Name = "SU_DEVCODE1_label";
             this.SU_DEVCODE1_label.Size = new System.Drawing.Size(110, 31);
@@ -181,7 +190,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(1170, 921);
+            this.st_combinenumber_label.Location = new System.Drawing.Point(1049, 874);
             this.st_combinenumber_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.st_combinenumber_label.Name = "st_combinenumber_label";
             this.st_combinenumber_label.Size = new System.Drawing.Size(134, 31);
@@ -226,13 +235,14 @@
             // 
             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(410, 831);
+            this.SU_RETURNIFCLEAN.Location = new System.Drawing.Point(1061, 937);
             this.SU_RETURNIFCLEAN.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.SU_RETURNIFCLEAN.Name = "SU_RETURNIFCLEAN";
             this.SU_RETURNIFCLEAN.Size = new System.Drawing.Size(122, 32);
             this.SU_RETURNIFCLEAN.TabIndex = 110;
             this.SU_RETURNIFCLEAN.Text = "是否清洗";
             this.SU_RETURNIFCLEAN.UseVisualStyleBackColor = true;
+            this.SU_RETURNIFCLEAN.Visible = false;
             // 
             // em_code_label
             // 
@@ -344,10 +354,11 @@
             // 
             this.normalButton1.AllPower = null;
             this.normalButton1.BackColor = System.Drawing.Color.Transparent;
+            this.normalButton1.Cursor = System.Windows.Forms.Cursors.Hand;
             this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
             this.normalButton1.Image = null;
             this.normalButton1.IsShowBorder = true;
-            this.normalButton1.Location = new System.Drawing.Point(540, 823);
+            this.normalButton1.Location = new System.Drawing.Point(555, 669);
             this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
@@ -363,10 +374,11 @@
             // 
             this.Scrap.AllPower = null;
             this.Scrap.BackColor = System.Drawing.Color.Transparent;
+            this.Scrap.Cursor = System.Windows.Forms.Cursors.Hand;
             this.Scrap.DownImage = ((System.Drawing.Image)(resources.GetObject("Scrap.DownImage")));
             this.Scrap.Image = null;
             this.Scrap.IsShowBorder = true;
-            this.Scrap.Location = new System.Drawing.Point(868, 826);
+            this.Scrap.Location = new System.Drawing.Point(570, 819);
             this.Scrap.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Scrap.MoveImage = ((System.Drawing.Image)(resources.GetObject("Scrap.MoveImage")));
             this.Scrap.Name = "Scrap";
@@ -530,6 +542,7 @@
             // 
             this.Receive.AllPower = null;
             this.Receive.BackColor = System.Drawing.Color.Transparent;
+            this.Receive.Cursor = System.Windows.Forms.Cursors.Hand;
             this.Receive.DownImage = ((System.Drawing.Image)(resources.GetObject("Receive.DownImage")));
             this.Receive.Image = null;
             this.Receive.IsShowBorder = true;
@@ -549,10 +562,11 @@
             // 
             this.Return.AllPower = null;
             this.Return.BackColor = System.Drawing.Color.Transparent;
+            this.Return.Cursor = System.Windows.Forms.Cursors.Hand;
             this.Return.DownImage = ((System.Drawing.Image)(resources.GetObject("Return.DownImage")));
             this.Return.Image = null;
             this.Return.IsShowBorder = true;
-            this.Return.Location = new System.Drawing.Point(729, 823);
+            this.Return.Location = new System.Drawing.Point(431, 819);
             this.Return.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Return.MoveImage = ((System.Drawing.Image)(resources.GetObject("Return.MoveImage")));
             this.Return.Name = "Return";
@@ -569,7 +583,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(1166, 888);
+            this.st_combinenumber.Location = new System.Drawing.Point(1176, 877);
             this.st_combinenumber.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.st_combinenumber.Name = "st_combinenumber";
             this.st_combinenumber.Power = null;
@@ -585,7 +599,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(208, 829);
+            this.SU_DEVCODE1.Location = new System.Drawing.Point(208, 827);
             this.SU_DEVCODE1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.SU_DEVCODE1.Name = "SU_DEVCODE1";
             this.SU_DEVCODE1.Power = null;
@@ -631,7 +645,7 @@
             this.ToolsBom.Name = "ToolsBom";
             this.ToolsBom.RowHeadersWidth = 51;
             this.ToolsBom.RowTemplate.Height = 27;
-            this.ToolsBom.Size = new System.Drawing.Size(1359, 671);
+            this.ToolsBom.Size = new System.Drawing.Size(1359, 593);
             this.ToolsBom.TabIndex = 76;
             // 
             // su_stcode
@@ -775,11 +789,152 @@
             this.ma_code.TextBoxEnable = true;
             this.ma_code.TextKeyDown += new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextKeyDown(this.ma_code_TextKeyDown);
             // 
+            // cleanEmpVal
+            // 
+            this.cleanEmpVal.AllPower = null;
+            this.cleanEmpVal.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.cleanEmpVal.BackColor = System.Drawing.Color.White;
+            this.cleanEmpVal.ID = null;
+            this.cleanEmpVal.Location = new System.Drawing.Point(58, 677);
+            this.cleanEmpVal.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.cleanEmpVal.Name = "cleanEmpVal";
+            this.cleanEmpVal.Power = null;
+            this.cleanEmpVal.Size = new System.Drawing.Size(178, 28);
+            this.cleanEmpVal.Str = null;
+            this.cleanEmpVal.Str1 = null;
+            this.cleanEmpVal.Str2 = null;
+            this.cleanEmpVal.TabIndex = 130;
+            // 
+            // cleanEmpLab
+            // 
+            this.cleanEmpLab.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.cleanEmpLab.AutoSize = true;
+            this.cleanEmpLab.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cleanEmpLab.Location = new System.Drawing.Point(10, 677);
+            this.cleanEmpLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.cleanEmpLab.Name = "cleanEmpLab";
+            this.cleanEmpLab.Size = new System.Drawing.Size(86, 31);
+            this.cleanEmpLab.TabIndex = 129;
+            this.cleanEmpLab.Text = "清洗人";
+            // 
+            // cleanCodeVal
+            // 
+            this.cleanCodeVal.AllPower = null;
+            this.cleanCodeVal.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.cleanCodeVal.BackColor = System.Drawing.Color.White;
+            this.cleanCodeVal.ID = null;
+            this.cleanCodeVal.Location = new System.Drawing.Point(355, 677);
+            this.cleanCodeVal.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.cleanCodeVal.Name = "cleanCodeVal";
+            this.cleanCodeVal.Power = null;
+            this.cleanCodeVal.Size = new System.Drawing.Size(178, 28);
+            this.cleanCodeVal.Str = null;
+            this.cleanCodeVal.Str1 = null;
+            this.cleanCodeVal.Str2 = null;
+            this.cleanCodeVal.TabIndex = 132;
+            // 
+            // cleanCodeLab
+            // 
+            this.cleanCodeLab.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.cleanCodeLab.AutoSize = true;
+            this.cleanCodeLab.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cleanCodeLab.Location = new System.Drawing.Point(262, 677);
+            this.cleanCodeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.cleanCodeLab.Name = "cleanCodeLab";
+            this.cleanCodeLab.Size = new System.Drawing.Size(158, 31);
+            this.cleanCodeLab.TabIndex = 131;
+            this.cleanCodeLab.Text = "清洗刮刀编号";
+            // 
+            // qaConfrimVal
+            // 
+            this.qaConfrimVal.AllPower = null;
+            this.qaConfrimVal.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.qaConfrimVal.BackColor = System.Drawing.Color.White;
+            this.qaConfrimVal.ID = null;
+            this.qaConfrimVal.Location = new System.Drawing.Point(793, 677);
+            this.qaConfrimVal.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.qaConfrimVal.Name = "qaConfrimVal";
+            this.qaConfrimVal.Power = null;
+            this.qaConfrimVal.Size = new System.Drawing.Size(178, 28);
+            this.qaConfrimVal.Str = null;
+            this.qaConfrimVal.Str1 = null;
+            this.qaConfrimVal.Str2 = null;
+            this.qaConfrimVal.TabIndex = 134;
+            // 
+            // qaConfrimLab
+            // 
+            this.qaConfrimLab.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.qaConfrimLab.AutoSize = true;
+            this.qaConfrimLab.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.qaConfrimLab.Location = new System.Drawing.Point(714, 677);
+            this.qaConfrimLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.qaConfrimLab.Name = "qaConfrimLab";
+            this.qaConfrimLab.Size = new System.Drawing.Size(134, 31);
+            this.qaConfrimLab.TabIndex = 133;
+            this.qaConfrimLab.Text = "品质确认人";
+            // 
+            // qaConfrimCodeVal
+            // 
+            this.qaConfrimCodeVal.AllPower = null;
+            this.qaConfrimCodeVal.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.qaConfrimCodeVal.BackColor = System.Drawing.Color.White;
+            this.qaConfrimCodeVal.ID = null;
+            this.qaConfrimCodeVal.Location = new System.Drawing.Point(1087, 677);
+            this.qaConfrimCodeVal.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.qaConfrimCodeVal.Name = "qaConfrimCodeVal";
+            this.qaConfrimCodeVal.Power = null;
+            this.qaConfrimCodeVal.Size = new System.Drawing.Size(178, 28);
+            this.qaConfrimCodeVal.Str = null;
+            this.qaConfrimCodeVal.Str1 = null;
+            this.qaConfrimCodeVal.Str2 = null;
+            this.qaConfrimCodeVal.TabIndex = 136;
+            // 
+            // qaConfrimCodeLab
+            // 
+            this.qaConfrimCodeLab.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.qaConfrimCodeLab.AutoSize = true;
+            this.qaConfrimCodeLab.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.qaConfrimCodeLab.Location = new System.Drawing.Point(994, 677);
+            this.qaConfrimCodeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.qaConfrimCodeLab.Name = "qaConfrimCodeLab";
+            this.qaConfrimCodeLab.Size = new System.Drawing.Size(158, 31);
+            this.qaConfrimCodeLab.TabIndex = 135;
+            this.qaConfrimCodeLab.Text = "确认刮刀编号";
+            // 
+            // Confrim
+            // 
+            this.Confrim.AllPower = null;
+            this.Confrim.BackColor = System.Drawing.Color.Transparent;
+            this.Confrim.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Confrim.DownImage = ((System.Drawing.Image)(resources.GetObject("Confrim.DownImage")));
+            this.Confrim.Image = null;
+            this.Confrim.IsShowBorder = true;
+            this.Confrim.Location = new System.Drawing.Point(1281, 668);
+            this.Confrim.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Confrim.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confrim.MoveImage")));
+            this.Confrim.Name = "Confrim";
+            this.Confrim.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confrim.NormalImage")));
+            this.Confrim.Power = null;
+            this.Confrim.Size = new System.Drawing.Size(102, 42);
+            this.Confrim.TabIndex = 137;
+            this.Confrim.Text = "确认";
+            this.Confrim.UseVisualStyleBackColor = false;
+            this.Confrim.Click += new System.EventHandler(this.Confrim_Click);
+            // 
             // Make_SMTSStencil
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1362, 983);
+            this.Controls.Add(this.Confrim);
+            this.Controls.Add(this.qaConfrimCodeVal);
+            this.Controls.Add(this.qaConfrimCodeLab);
+            this.Controls.Add(this.qaConfrimVal);
+            this.Controls.Add(this.qaConfrimLab);
+            this.Controls.Add(this.cleanCodeVal);
+            this.Controls.Add(this.cleanCodeLab);
+            this.Controls.Add(this.cleanEmpVal);
+            this.Controls.Add(this.cleanEmpLab);
             this.Controls.Add(this.normalButton1);
             this.Controls.Add(this.st_usecount);
             this.Controls.Add(this.Scrap);
@@ -889,5 +1044,14 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn su_singlepringqty;
         private System.Windows.Forms.DataGridViewTextBoxColumn su_table;
         private System.Windows.Forms.DataGridViewTextBoxColumn su_usemacode;
+        private CustomControl.TextBoxWithIcon.EnterTextBox cleanEmpVal;
+        private System.Windows.Forms.Label cleanEmpLab;
+        private CustomControl.TextBoxWithIcon.EnterTextBox cleanCodeVal;
+        private System.Windows.Forms.Label cleanCodeLab;
+        private CustomControl.TextBoxWithIcon.EnterTextBox qaConfrimVal;
+        private System.Windows.Forms.Label qaConfrimLab;
+        private CustomControl.TextBoxWithIcon.EnterTextBox qaConfrimCodeVal;
+        private System.Windows.Forms.Label qaConfrimCodeLab;
+        private CustomControl.ButtonUtil.NormalButton Confrim;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.cs

@@ -108,7 +108,7 @@ namespace UAS_MES_NEW.Make
             }
             DataTable dt1 = (DataTable)dh.ExecuteSql($@"SELECT * FROM stenciluse, stencil WHERE su_status = '上线' 
                 AND su_usemacode = '{ma_code.Text}' AND su_linecode = '{li_code.Text}' AND su_stcode = st_code AND st_kind = '刮刀'", "select");
-            if(dt1.Rows.Count > 0)
+            if (dt1.Rows.Count > 0)
             {
                 string suid = dt1.Rows[0]["SU_ID"].ToString();
                 string stcode = dt1.Rows[0]["SU_STCODE"].ToString();
@@ -130,7 +130,7 @@ namespace UAS_MES_NEW.Make
                 }
             }
 
-            int WaringCount =int.Parse(dh.GetConfig("WaringCount", "Stencil").ToString());
+            int WaringCount = int.Parse(dh.GetConfig("WaringCount", "Stencil").ToString());
             DataTable 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='" + SU_DEVCODE.Text + "' and st_statuscode='AUDITED' and st_kind = '刮刀'", "select");
             string status = "";
             string version = "";
@@ -140,7 +140,7 @@ namespace UAS_MES_NEW.Make
             {
                 status = dt.Rows[0]["ST_USESTATUS"].ToString();
                 version = dt.Rows[0]["st_version"].ToString();
-                st_maxusecount =Convert.ToDouble( dt.Rows[0]["st_maxusecount"].ToString());
+                st_maxusecount = Convert.ToDouble(dt.Rows[0]["st_maxusecount"].ToString());
                 st_usecount = Convert.ToDouble(dt.Rows[0]["st_usecount"].ToString());
                 if (status == "在线" || status == "报废" || status == "在仓")
                 {
@@ -156,7 +156,7 @@ namespace UAS_MES_NEW.Make
             //使用次数预警
             if (st_maxusecount - st_usecount < WaringCount)
             {
-                string close = MessageBox.Show(this.ParentForm, "刮刀已使用"+ st_usecount+"，距离使用上限还有"+(st_maxusecount - st_usecount)+"次", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                string close = MessageBox.Show(this.ParentForm, "刮刀已使用" + st_usecount + "，距离使用上限还有" + (st_maxusecount - st_usecount) + "次", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                 if (close != "Yes")
                 {
                     return;
@@ -185,44 +185,44 @@ namespace UAS_MES_NEW.Make
             //}
             //else
             //{
-                dt = (DataTable)dh.ExecuteSql("select em_name from employee where em_code='" + User.UserCode + "'", "select");
-                if (dt.Rows.Count > 0)
+            dt = (DataTable)dh.ExecuteSql("select em_name from employee where em_code='" + User.UserCode + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                string em_name = dt.Rows[0]["em_name"].ToString();
+                sql.Clear();
+                sql.Append("insert into StencilUse(su_id,SU_USEPRODCODE,SU_CLEANNUMS,su_stid,su_linecode,su_stcode,su_usedate,su_useman,SU_USEMANCODE,SU_TABLE,su_usemacode,su_singlepringqty,su_stverison,SU_STATUS,su_indate)");
+                sql.Append("select StencilUse_seq.nextval,'" + ma_prodcode.Text + "',ST_CLEANNUMS,st_id,'" + li_code.Text + "','" + SU_DEVCODE.Text + "',sysdate,'" + em_name + "','" + User.UserCode + "','" + st_table.Text + "','" + ma_code.Text + "'");
+                sql.Append(",'" + su_singlepringqty1.Text + "',st_version,'上线',sysdate from ");
+                sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
+                dh.ExecuteSql(sql.ToString(), "insert");
+                dh.ExecuteSql($"update Stencil set ST_USESTATUS='在线',ST_LINE = '{li_code.Text}' where st_code='" + SU_DEVCODE.Text + "'", "update");
+                MessageBox.Show("上线成功");
+                st_table.SelectedItem = null;
+                SU_DEVCODE.Text = "";
+                em_code.Text = "";
+                //Receive.Enabled = false;
+                LoadGridData();
+
+                /*if (int.Parse(su_singlepringqty1.Text) > 0)
                 {
-                    string em_name = dt.Rows[0]["em_name"].ToString();
-                    sql.Clear();
-                    sql.Append("insert into StencilUse(su_id,SU_USEPRODCODE,SU_CLEANNUMS,su_stid,su_linecode,su_stcode,su_usedate,su_useman,SU_USEMANCODE,SU_TABLE,su_usemacode,su_singlepringqty,su_stverison,SU_STATUS,su_indate)");
-                    sql.Append("select StencilUse_seq.nextval,'" + ma_prodcode.Text + "',ST_CLEANNUMS,st_id,'" + li_code.Text + "','" + SU_DEVCODE.Text + "',sysdate,'" + em_name + "','" + User.UserCode + "','" + st_table.Text + "','" + ma_code.Text + "'");
-                    sql.Append(",'" + su_singlepringqty1.Text + "',st_version,'上线',sysdate from ");
-                    sql.Append("Stencil where st_code='" + SU_DEVCODE.Text + "'");
-                    dh.ExecuteSql(sql.ToString(), "insert");
-                    dh.ExecuteSql($"update Stencil set ST_USESTATUS='在线',ST_LINE = '{li_code.Text}' where st_code='" + SU_DEVCODE.Text + "'", "update");
-                    MessageBox.Show("上线成功");
-                    st_table.SelectedItem = null;
-                    SU_DEVCODE.Text = "";
-                    em_code.Text = "";
-                    //Receive.Enabled = false;
-                    LoadGridData();
-
-                    /*if (int.Parse(su_singlepringqty1.Text) > 0)
-                    {
-                    }
-                    else
-                    {
-                        MessageBox.Show("单片次数必须大于0");
-                    }*/
                 }
                 else
                 {
-                    MessageBox.Show("人员编号" + User.UserCode + "不存在");
-                }
-    //        }
+                    MessageBox.Show("单片次数必须大于0");
+                }*/
+            }
+            else
+            {
+                MessageBox.Show("人员编号" + User.UserCode + "不存在");
+            }
+            //        }
         }
 
         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)
+            if (SU_RETURNIFCLEAN.Checked)
             {
                 DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED' and st_kind = '刮刀' ", "select");
                 if (dt.Rows.Count > 0)
@@ -272,17 +272,17 @@ namespace UAS_MES_NEW.Make
 
 
                     MessageBox.Show("刮刀" + SU_DEVCODE1.Text + "下线成功！");
-                        SU_DEVCODE1.Text = "";
-                        st_combinenumber.Text = "";
-                        em_code1.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();
+                    SU_DEVCODE1.Text = "";
+                    st_combinenumber.Text = "";
+                    em_code1.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
                     //{
@@ -298,12 +298,12 @@ namespace UAS_MES_NEW.Make
             {
                 MessageBox.Show("请确认是否清洗刮刀");
             }
-        //}
-        //    else
-        //    {
-        //        MessageBox.Show("请维护完成的测试参数");
-        //    }
-}
+            //}
+            //    else
+            //    {
+            //        MessageBox.Show("请维护完成的测试参数");
+            //    }
+        }
 
         private void Radio_CheckedChanged(object sender, EventArgs e)
         {
@@ -403,7 +403,7 @@ namespace UAS_MES_NEW.Make
                 //}
 
 
-                 dt = (DataTable)dh.ExecuteSql("select nvl(st_usecount,0)st_usecount,case when nvl(ST_COMBINENUMBER,1)=0 then 1 else nvl(ST_COMBINENUMBER,1) end from STENCIL where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED' and st_kind = '刮刀'", "select");
+                dt = (DataTable)dh.ExecuteSql("select nvl(st_usecount,0)st_usecount,case when nvl(ST_COMBINENUMBER,1)=0 then 1 else nvl(ST_COMBINENUMBER,1) end from STENCIL where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED' and st_kind = '刮刀'", "select");
                 if (dt.Rows.Count == 0)
                 {
                     MessageBox.Show("刮刀编号" + SU_DEVCODE1.Text + "不存在或者未审核");
@@ -563,44 +563,56 @@ namespace UAS_MES_NEW.Make
 
         private void normalButton1_Click(object sender, EventArgs e)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED' and st_kind = '刮刀'", "select");
+            if (string.IsNullOrEmpty(cleanEmpVal.Text))
+            {
+                MessageBox.Show("请填写清洗人员");
+                return;
+            }
+            if (string.IsNullOrEmpty(cleanCodeVal.Text))
+            {
+                MessageBox.Show("请扫描刮刀编号");
+                return;
+            }
+            DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + cleanCodeVal.Text + "' and st_statuscode='AUDITED' and st_kind = '刮刀'", "select");
             if (dt.Rows.Count > 0)
             {
                 string status = dt.Rows[0]["ST_USESTATUS"].ToString();
                 if (status == "在仓" || status == "借出")
                 {
-                    MessageBox.Show("当前刮刀" + SU_DEVCODE.Text + "未在线,无法操作");
+                    MessageBox.Show("当前刮刀" + cleanCodeVal.Text + "未在线,无法操作");
                     return;
                 }
                 if (status == "报废")
                 {
-                    MessageBox.Show("当前刮刀" + SU_DEVCODE.Text + "处于" + status + "状态,无法操作");
+                    MessageBox.Show("当前刮刀" + cleanCodeVal.Text + "处于" + status + "状态,无法操作");
                     return;
                 }
             }
             else
             {
-                MessageBox.Show("刮刀编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+                MessageBox.Show("刮刀编号" + cleanCodeVal.Text + "不存在或者未审核");
                 return;
             }
             sql.Clear();
-            sql.Append("select nvl(su_cleannums,0)+1 su_cleannums from StencilUse nvl where su_id = (select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "')");
+            sql.Append("select nvl(su_cleannums,0)+1 su_cleannums from StencilUse nvl where su_id = (select max(su_id) from stenciluse where su_stcode='" + cleanCodeVal.Text + "')");
             dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             string su_cleannums = dt.Rows[0]["su_cleannums"].ToString();
 
             sql.Clear();
             sql.Append($@"INSERT INTO stenciluse (su_id,su_stid,su_stcode,su_indate,su_useman,su_status,
                 su_returnifclean,su_cleannums)
-                SELECT stenciluse_seq.NEXTVAL,st_id,'{SU_DEVCODE1.Text.Trim()}',sysdate,'{User.UserName}','12小时清洗',
-                '{(SU_RETURNIFCLEAN.Checked ? "-1" : "0")}', '{su_cleannums}' FROM stencil WHERE st_code = '" + SU_DEVCODE1.Text.Trim() + "'");
+                SELECT stenciluse_seq.NEXTVAL,st_id,'{cleanCodeVal.Text.Trim()}',sysdate,'{cleanEmpVal.Text}','12小时清洗',
+                '-1', '{su_cleannums}' FROM stencil WHERE st_code = '" + cleanCodeVal.Text.Trim() + "'");
             dh.ExecuteSql(sql.ToString(), "insert");
 
             /*sql.Clear();
             sql.Append("update StencilUse set  su_cleannums=nvl(su_cleannums,0)+1, su_auditdate=sysdate");
             sql.Append("  where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
             dh.ExecuteSql(sql.ToString(), "update");*/
-            MessageBox.Show("刮刀" + SU_DEVCODE1.Text + "12小时清洗成功！");
-            SU_DEVCODE1.Text = "";
+            MessageBox.Show("刮刀" + cleanCodeVal.Text + "12小时清洗成功！");
+            cleanCodeVal.Text = "";
+            cleanEmpVal.Text = "";
+            /*SU_DEVCODE1.Text = "";
             st_combinenumber.Text = "";
             em_code1.Text = "";
             ST_ENSIONA.Text = "";
@@ -608,7 +620,50 @@ namespace UAS_MES_NEW.Make
             ST_ENSIONC.Text = "";
             ST_ENSIOND.Text = "";
             ST_ENSIONE.Text = "";
-            Confirm.PerformClick();
+            Confirm.PerformClick();*/
+        }
+
+        private void Confrim_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(qaConfrimVal.Text))
+            {
+                MessageBox.Show("请填写品质确认人员");
+                return;
+            }
+            if (string.IsNullOrEmpty(qaConfrimCodeVal.Text))
+            {
+                MessageBox.Show("请扫描确认刮刀编号");
+                return;
+            }
+
+            DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + qaConfrimCodeVal.Text + "' and st_statuscode='AUDITED' and st_kind = '刮刀'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                string status = dt.Rows[0]["ST_USESTATUS"].ToString();
+                if (status == "在仓" || status == "借出")
+                {
+                    MessageBox.Show("当前刮刀" + qaConfrimCodeVal.Text + "未在线,无法操作");
+                    return;
+                }
+                if (status == "报废")
+                {
+                    MessageBox.Show("当前刮刀" + qaConfrimCodeVal.Text + "处于" + status + "状态,无法操作");
+                    return;
+                }
+            }
+            else
+            {
+                MessageBox.Show("刮刀编号" + qaConfrimCodeVal.Text + "不存在或者未审核");
+                return;
+            }
+
+            dh.ExecuteSql($@"INSERT INTO stenciluse (su_id,su_stid,su_stcode,su_indate,su_useman,su_status)
+                SELECT stenciluse_seq.NEXTVAL,st_id,'{qaConfrimCodeVal.Text.Trim()}',sysdate,'{qaConfrimVal.Text}','品质确认'
+                FROM stencil WHERE st_code = '" + qaConfrimCodeVal.Text.Trim() + "'", "insert");
+
+            MessageBox.Show("刮刀" + qaConfrimCodeVal.Text + "已确认！");
+            qaConfrimVal.Text = "";
+            qaConfrimCodeVal.Text = "";
         }
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.resx

@@ -330,6 +330,44 @@
         2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
         zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Confrim.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Confrim.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="Confrim.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
 </root>

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.Designer.cs

@@ -80,6 +80,15 @@
             this.Scrap = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.st_usecount = new System.Windows.Forms.Label();
             this.normalButton1 = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.Confrim = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.qaConfrimCodeVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.qaConfrimCodeLab = new System.Windows.Forms.Label();
+            this.qaConfrimVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.qaConfrimLab = new System.Windows.Forms.Label();
+            this.cleanCodeVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.cleanCodeLab = new System.Windows.Forms.Label();
+            this.cleanEmpVal = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.cleanEmpLab = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.ToolsBom)).BeginInit();
             this.SuspendLayout();
             // 
@@ -170,7 +179,7 @@
             // 
             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(89, 828);
+            this.SU_DEVCODE1_label.Location = new System.Drawing.Point(89, 822);
             this.SU_DEVCODE1_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.SU_DEVCODE1_label.Name = "SU_DEVCODE1_label";
             this.SU_DEVCODE1_label.Size = new System.Drawing.Size(110, 31);
@@ -226,13 +235,14 @@
             // 
             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(410, 826);
+            this.SU_RETURNIFCLEAN.Location = new System.Drawing.Point(1154, 887);
             this.SU_RETURNIFCLEAN.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.SU_RETURNIFCLEAN.Name = "SU_RETURNIFCLEAN";
             this.SU_RETURNIFCLEAN.Size = new System.Drawing.Size(122, 32);
             this.SU_RETURNIFCLEAN.TabIndex = 110;
             this.SU_RETURNIFCLEAN.Text = "是否清洗";
             this.SU_RETURNIFCLEAN.UseVisualStyleBackColor = true;
+            this.SU_RETURNIFCLEAN.Visible = false;
             // 
             // em_code_label
             // 
@@ -297,6 +307,7 @@
             // 
             this.Receive.AllPower = null;
             this.Receive.BackColor = System.Drawing.Color.Transparent;
+            this.Receive.Cursor = System.Windows.Forms.Cursors.Hand;
             this.Receive.DownImage = ((System.Drawing.Image)(resources.GetObject("Receive.DownImage")));
             this.Receive.Image = null;
             this.Receive.IsShowBorder = true;
@@ -316,10 +327,11 @@
             // 
             this.Return.AllPower = null;
             this.Return.BackColor = System.Drawing.Color.Transparent;
+            this.Return.Cursor = System.Windows.Forms.Cursors.Hand;
             this.Return.DownImage = ((System.Drawing.Image)(resources.GetObject("Return.DownImage")));
             this.Return.Image = null;
             this.Return.IsShowBorder = true;
-            this.Return.Location = new System.Drawing.Point(729, 818);
+            this.Return.Location = new System.Drawing.Point(427, 815);
             this.Return.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Return.MoveImage = ((System.Drawing.Image)(resources.GetObject("Return.MoveImage")));
             this.Return.Name = "Return";
@@ -352,7 +364,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(208, 829);
+            this.SU_DEVCODE1.Location = new System.Drawing.Point(208, 822);
             this.SU_DEVCODE1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.SU_DEVCODE1.Name = "SU_DEVCODE1";
             this.SU_DEVCODE1.Power = null;
@@ -398,7 +410,7 @@
             this.ToolsBom.Name = "ToolsBom";
             this.ToolsBom.RowHeadersWidth = 51;
             this.ToolsBom.RowTemplate.Height = 27;
-            this.ToolsBom.Size = new System.Drawing.Size(1359, 671);
+            this.ToolsBom.Size = new System.Drawing.Size(1359, 594);
             this.ToolsBom.TabIndex = 76;
             // 
             // su_stcode
@@ -720,10 +732,11 @@
             // 
             this.Scrap.AllPower = null;
             this.Scrap.BackColor = System.Drawing.Color.Transparent;
+            this.Scrap.Cursor = System.Windows.Forms.Cursors.Hand;
             this.Scrap.DownImage = ((System.Drawing.Image)(resources.GetObject("Scrap.DownImage")));
             this.Scrap.Image = null;
             this.Scrap.IsShowBorder = true;
-            this.Scrap.Location = new System.Drawing.Point(1027, 920);
+            this.Scrap.Location = new System.Drawing.Point(561, 813);
             this.Scrap.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.Scrap.MoveImage = ((System.Drawing.Image)(resources.GetObject("Scrap.MoveImage")));
             this.Scrap.Name = "Scrap";
@@ -749,10 +762,11 @@
             // 
             this.normalButton1.AllPower = null;
             this.normalButton1.BackColor = System.Drawing.Color.Transparent;
+            this.normalButton1.Cursor = System.Windows.Forms.Cursors.Hand;
             this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
             this.normalButton1.Image = null;
             this.normalButton1.IsShowBorder = true;
-            this.normalButton1.Location = new System.Drawing.Point(540, 818);
+            this.normalButton1.Location = new System.Drawing.Point(561, 667);
             this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
@@ -764,11 +778,152 @@
             this.normalButton1.UseVisualStyleBackColor = false;
             this.normalButton1.Click += new System.EventHandler(this.normalButton1_Click);
             // 
+            // Confrim
+            // 
+            this.Confrim.AllPower = null;
+            this.Confrim.BackColor = System.Drawing.Color.Transparent;
+            this.Confrim.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Confrim.DownImage = ((System.Drawing.Image)(resources.GetObject("Confrim.DownImage")));
+            this.Confrim.Image = null;
+            this.Confrim.IsShowBorder = true;
+            this.Confrim.Location = new System.Drawing.Point(1283, 667);
+            this.Confrim.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.Confrim.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confrim.MoveImage")));
+            this.Confrim.Name = "Confrim";
+            this.Confrim.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confrim.NormalImage")));
+            this.Confrim.Power = null;
+            this.Confrim.Size = new System.Drawing.Size(102, 42);
+            this.Confrim.TabIndex = 146;
+            this.Confrim.Text = "确认";
+            this.Confrim.UseVisualStyleBackColor = false;
+            this.Confrim.Click += new System.EventHandler(this.Confrim_Click);
+            // 
+            // qaConfrimCodeVal
+            // 
+            this.qaConfrimCodeVal.AllPower = null;
+            this.qaConfrimCodeVal.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.qaConfrimCodeVal.BackColor = System.Drawing.Color.White;
+            this.qaConfrimCodeVal.ID = null;
+            this.qaConfrimCodeVal.Location = new System.Drawing.Point(1089, 676);
+            this.qaConfrimCodeVal.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.qaConfrimCodeVal.Name = "qaConfrimCodeVal";
+            this.qaConfrimCodeVal.Power = null;
+            this.qaConfrimCodeVal.Size = new System.Drawing.Size(178, 28);
+            this.qaConfrimCodeVal.Str = null;
+            this.qaConfrimCodeVal.Str1 = null;
+            this.qaConfrimCodeVal.Str2 = null;
+            this.qaConfrimCodeVal.TabIndex = 145;
+            // 
+            // qaConfrimCodeLab
+            // 
+            this.qaConfrimCodeLab.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.qaConfrimCodeLab.AutoSize = true;
+            this.qaConfrimCodeLab.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.qaConfrimCodeLab.Location = new System.Drawing.Point(996, 676);
+            this.qaConfrimCodeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.qaConfrimCodeLab.Name = "qaConfrimCodeLab";
+            this.qaConfrimCodeLab.Size = new System.Drawing.Size(158, 31);
+            this.qaConfrimCodeLab.TabIndex = 144;
+            this.qaConfrimCodeLab.Text = "确认钢网编号";
+            // 
+            // qaConfrimVal
+            // 
+            this.qaConfrimVal.AllPower = null;
+            this.qaConfrimVal.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.qaConfrimVal.BackColor = System.Drawing.Color.White;
+            this.qaConfrimVal.ID = null;
+            this.qaConfrimVal.Location = new System.Drawing.Point(795, 676);
+            this.qaConfrimVal.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.qaConfrimVal.Name = "qaConfrimVal";
+            this.qaConfrimVal.Power = null;
+            this.qaConfrimVal.Size = new System.Drawing.Size(178, 28);
+            this.qaConfrimVal.Str = null;
+            this.qaConfrimVal.Str1 = null;
+            this.qaConfrimVal.Str2 = null;
+            this.qaConfrimVal.TabIndex = 143;
+            // 
+            // qaConfrimLab
+            // 
+            this.qaConfrimLab.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.qaConfrimLab.AutoSize = true;
+            this.qaConfrimLab.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.qaConfrimLab.Location = new System.Drawing.Point(716, 676);
+            this.qaConfrimLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.qaConfrimLab.Name = "qaConfrimLab";
+            this.qaConfrimLab.Size = new System.Drawing.Size(134, 31);
+            this.qaConfrimLab.TabIndex = 142;
+            this.qaConfrimLab.Text = "品质确认人";
+            // 
+            // cleanCodeVal
+            // 
+            this.cleanCodeVal.AllPower = null;
+            this.cleanCodeVal.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.cleanCodeVal.BackColor = System.Drawing.Color.White;
+            this.cleanCodeVal.ID = null;
+            this.cleanCodeVal.Location = new System.Drawing.Point(357, 676);
+            this.cleanCodeVal.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.cleanCodeVal.Name = "cleanCodeVal";
+            this.cleanCodeVal.Power = null;
+            this.cleanCodeVal.Size = new System.Drawing.Size(178, 28);
+            this.cleanCodeVal.Str = null;
+            this.cleanCodeVal.Str1 = null;
+            this.cleanCodeVal.Str2 = null;
+            this.cleanCodeVal.TabIndex = 141;
+            // 
+            // cleanCodeLab
+            // 
+            this.cleanCodeLab.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.cleanCodeLab.AutoSize = true;
+            this.cleanCodeLab.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cleanCodeLab.Location = new System.Drawing.Point(264, 676);
+            this.cleanCodeLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.cleanCodeLab.Name = "cleanCodeLab";
+            this.cleanCodeLab.Size = new System.Drawing.Size(158, 31);
+            this.cleanCodeLab.TabIndex = 140;
+            this.cleanCodeLab.Text = "清洗钢网编号";
+            // 
+            // cleanEmpVal
+            // 
+            this.cleanEmpVal.AllPower = null;
+            this.cleanEmpVal.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.cleanEmpVal.BackColor = System.Drawing.Color.White;
+            this.cleanEmpVal.ID = null;
+            this.cleanEmpVal.Location = new System.Drawing.Point(60, 676);
+            this.cleanEmpVal.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.cleanEmpVal.Name = "cleanEmpVal";
+            this.cleanEmpVal.Power = null;
+            this.cleanEmpVal.Size = new System.Drawing.Size(178, 28);
+            this.cleanEmpVal.Str = null;
+            this.cleanEmpVal.Str1 = null;
+            this.cleanEmpVal.Str2 = null;
+            this.cleanEmpVal.TabIndex = 139;
+            // 
+            // cleanEmpLab
+            // 
+            this.cleanEmpLab.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.cleanEmpLab.AutoSize = true;
+            this.cleanEmpLab.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cleanEmpLab.Location = new System.Drawing.Point(12, 676);
+            this.cleanEmpLab.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.cleanEmpLab.Name = "cleanEmpLab";
+            this.cleanEmpLab.Size = new System.Drawing.Size(86, 31);
+            this.cleanEmpLab.TabIndex = 138;
+            this.cleanEmpLab.Text = "清洗人";
+            // 
             // Make_SMTStencil
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1362, 983);
+            this.Controls.Add(this.Confrim);
+            this.Controls.Add(this.qaConfrimCodeVal);
+            this.Controls.Add(this.qaConfrimCodeLab);
+            this.Controls.Add(this.qaConfrimVal);
+            this.Controls.Add(this.qaConfrimLab);
+            this.Controls.Add(this.cleanCodeVal);
+            this.Controls.Add(this.cleanCodeLab);
+            this.Controls.Add(this.cleanEmpVal);
+            this.Controls.Add(this.cleanEmpLab);
             this.Controls.Add(this.normalButton1);
             this.Controls.Add(this.st_usecount);
             this.Controls.Add(this.Scrap);
@@ -878,5 +1033,14 @@
         private CustomControl.ButtonUtil.NormalButton Scrap;
         private System.Windows.Forms.Label st_usecount;
         private CustomControl.ButtonUtil.NormalButton normalButton1;
+        private CustomControl.ButtonUtil.NormalButton Confrim;
+        private CustomControl.TextBoxWithIcon.EnterTextBox qaConfrimCodeVal;
+        private System.Windows.Forms.Label qaConfrimCodeLab;
+        private CustomControl.TextBoxWithIcon.EnterTextBox qaConfrimVal;
+        private System.Windows.Forms.Label qaConfrimLab;
+        private CustomControl.TextBoxWithIcon.EnterTextBox cleanCodeVal;
+        private System.Windows.Forms.Label cleanCodeLab;
+        private CustomControl.TextBoxWithIcon.EnterTextBox cleanEmpVal;
+        private System.Windows.Forms.Label cleanEmpLab;
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.cs

@@ -540,53 +540,107 @@ namespace UAS_MES_NEW.Make
 
         private void normalButton1_Click(object sender, EventArgs e)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + SU_DEVCODE1.Text + "' and st_statuscode='AUDITED' and st_kind = '钢网'", "select");
+            if (string.IsNullOrEmpty(cleanEmpVal.Text))
+            {
+                MessageBox.Show("请填写清洗人员");
+                return;
+            }
+            if (string.IsNullOrEmpty(cleanCodeVal.Text))
+            {
+                MessageBox.Show("请扫描钢网编号");
+                return;
+            }
+            DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + cleanCodeVal.Text + "' and st_statuscode='AUDITED' and st_kind = '钢网'", "select");
             if (dt.Rows.Count > 0)
             {
                 string status = dt.Rows[0]["ST_USESTATUS"].ToString();
                 if (status == "在仓" || status == "借出")
                 {
-                    MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "未在线,无法操作");
+                    MessageBox.Show("当前钢网" + cleanCodeVal.Text + "未在线,无法操作");
                     return;
                 }
                 if (status == "报废")
                 {
-                    MessageBox.Show("当前钢网" + SU_DEVCODE.Text + "处于" + status + "状态,无法操作");
+                    MessageBox.Show("当前钢网" + cleanCodeVal.Text + "处于" + status + "状态,无法操作");
                     return;
                 }
             }
             else
             {
-                MessageBox.Show("钢网编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+                MessageBox.Show("钢网编号" + cleanCodeVal.Text + "不存在或者未审核");
                 return;
             }
 
             sql.Clear();
-            sql.Append("select nvl(su_cleannums,0)+1 su_cleannums from StencilUse nvl where su_id = (select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "')");
+            sql.Append("select nvl(su_cleannums,0)+1 su_cleannums from StencilUse nvl where su_id = (select max(su_id) from stenciluse where su_stcode='" + cleanCodeVal.Text + "')");
             dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             string su_cleannums = dt.Rows[0]["su_cleannums"].ToString();
 
             sql.Clear();
             sql.Append($@"INSERT INTO stenciluse (su_id,su_stid,su_stcode,su_indate,su_useman,su_status,
                 su_returnifclean,su_cleannums)
-                SELECT stenciluse_seq.NEXTVAL,st_id,'{SU_DEVCODE1.Text.Trim()}',sysdate,'{User.UserName}','12小时清洗',
-                '{(SU_RETURNIFCLEAN.Checked ? "-1" : "0")}', '{su_cleannums}' FROM stencil WHERE st_code = '" + SU_DEVCODE1.Text.Trim() + "'");
+                SELECT stenciluse_seq.NEXTVAL,st_id,'{cleanCodeVal.Text.Trim()}',sysdate,'{cleanEmpVal.Text}','12小时清洗',
+                '-1', '{su_cleannums}' FROM stencil WHERE st_code = '" + cleanCodeVal.Text.Trim() + "'");
             dh.ExecuteSql(sql.ToString(), "insert");
 
             /*sql.Clear();
             sql.Append("update StencilUse set  su_cleannums=nvl(su_cleannums,0)+1, su_auditdate=sysdate");
             sql.Append("  where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
             dh.ExecuteSql(sql.ToString(), "update");*/
-            MessageBox.Show("钢网" + SU_DEVCODE1.Text + "12小时清洗成功！");
-            SU_DEVCODE1.Text = "";
-            st_combinenumber.Text = "";
+            MessageBox.Show("钢网" + cleanCodeVal.Text + "12小时清洗成功！");
+            cleanCodeVal.Text = "";
+            cleanEmpVal.Text = "";
+            /*st_combinenumber.Text = "";
             em_code1.Text = "";
             ST_ENSIONA.Text = "";
             ST_ENSIONB.Text = "";
             ST_ENSIONC.Text = "";
             ST_ENSIOND.Text = "";
             ST_ENSIONE.Text = "";
-            Confirm.PerformClick();
+            Confirm.PerformClick();*/
+        }
+
+        private void Confrim_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(qaConfrimVal.Text))
+            {
+                MessageBox.Show("请填写品质确认人员");
+                return;
+            }
+            if (string.IsNullOrEmpty(qaConfrimCodeVal.Text))
+            {
+                MessageBox.Show("请扫描确认钢网编号");
+                return;
+            }
+
+            DataTable dt = (DataTable)dh.ExecuteSql("select ST_USESTATUS,St_USECOUNT from Stencil where st_code='" + qaConfrimCodeVal.Text + "' and st_statuscode='AUDITED' and st_kind = '钢网'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                string status = dt.Rows[0]["ST_USESTATUS"].ToString();
+                if (status == "在仓" || status == "借出")
+                {
+                    MessageBox.Show("当前钢网" + qaConfrimCodeVal.Text + "未在线,无法操作");
+                    return;
+                }
+                if (status == "报废")
+                {
+                    MessageBox.Show("当前钢网" + qaConfrimCodeVal.Text + "处于" + status + "状态,无法操作");
+                    return;
+                }
+            }
+            else
+            {
+                MessageBox.Show("钢网编号" + qaConfrimCodeVal.Text + "不存在或者未审核");
+                return;
+            }
+
+            dh.ExecuteSql($@"INSERT INTO stenciluse (su_id,su_stid,su_stcode,su_indate,su_useman,su_status)
+                SELECT stenciluse_seq.NEXTVAL,st_id,'{qaConfrimCodeVal.Text.Trim()}',sysdate,'{qaConfrimVal.Text}','品质确认'
+                FROM stencil WHERE st_code = '" + qaConfrimCodeVal.Text.Trim() + "'", "insert");
+
+            MessageBox.Show("钢网" + qaConfrimCodeVal.Text + "已确认！");
+            qaConfrimVal.Text = "";
+            qaConfrimCodeVal.Text = "";
         }
     }
 }

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.resx

@@ -330,6 +330,44 @@
         2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
         zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Confrim.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Confrim.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="Confrim.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
 </root>