优化清洗处理

UAS_MES_WEIP/FunctionCode/Make/Make_SMTSStencil.cs

@@ -222,82 +222,83 @@ namespace UAS_MES_NEW.Make
         {
             //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 + "' and st_statuscode='AUDITED' and st_kind = '刮刀' ", "select");
+            if (dt.Rows.Count > 0)
             {
-                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)
+                string status = dt.Rows[0]["ST_USESTATUS"].ToString();
+                if (status == "在仓" || status == "借出")
                 {
-                    string status = dt.Rows[0]["ST_USESTATUS"].ToString();
-                    if (status == "在仓" || status == "借出")
-                    {
-                        MessageBox.Show("当前刮刀" + SU_DEVCODE.Text + "未在线,无需归还");
-                        return;
-                    }
-                    if (status == "报废")
-                    {
-                        MessageBox.Show("当前刮刀" + SU_DEVCODE.Text + "处于" + status + "状态,无法退回");
-                        return;
-                    }
+                    MessageBox.Show("当前刮刀" + SU_DEVCODE.Text + "未在线,无需归还");
+                    return;
                 }
-                else
+                if (status == "报废")
                 {
-                    MessageBox.Show("刮刀编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+                    MessageBox.Show("当前刮刀" + SU_DEVCODE.Text + "处于" + status + "状态,无法退回");
+                    return;
                 }
-                string St_USECOUNT = dt.Rows[0]["St_USECOUNT"].ToString();
-                dt = (DataTable)dh.ExecuteSql("select em_name from employee where em_code='" + User.UserCode + "'", "select");
-                if (dt.Rows.Count > 0)
-                {
-                    //if (int.Parse(st_combinenumber.Text) >= 0)
-                    //{
-                    /*sql.Clear();
-                    sql.Append("update StencilUse set SU_ENSIONA='" + ST_ENSIONA.Text + "',SU_ENSIONB='" + ST_ENSIONB.Text + "',SU_ENSIONC='" + ST_ENSIONC.Text + "',SU_ENSIOND='" + ST_ENSIOND.Text + "',SU_ENSIONE='" + ST_ENSIONE.Text + "', su_cleannums=nvl(su_cleannums,0)+1, SU_BACKDATE=sysdate,su_returnman='" + dt.Rows[0]["em_name"].ToString() + "',su_returnmancode='" + em_code1.Text + "',");
-                    sql.Append("SU_THISUSETIMES='" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + "',SU_STATUS='借出'");
-                    sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
-                    dh.ExecuteSql(sql.ToString(), "update");
-                    sql.Clear();
-                    sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "',St_USECOUNT=nvl(St_USECOUNT,0)+" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + ",ST_USESTATUS='借出' where st_code='" + SU_DEVCODE1.Text + "'");
-                    dh.ExecuteSql(sql.ToString(), "update");*/
-
-                    sql.Clear();
-                    sql.Append($@"INSERT INTO stenciluse (su_id,su_ensiona,su_ensionb,su_ensionc,su_ensiond,su_ensione,su_stid,su_stcode,su_indate,su_useman,
+            }
+            else
+            {
+                MessageBox.Show("刮刀编号" + SU_DEVCODE1.Text + "不存在或者未审核");
+            }
+            string St_USECOUNT = dt.Rows[0]["St_USECOUNT"].ToString();
+            dt = (DataTable)dh.ExecuteSql("select em_name from employee where em_code='" + User.UserCode + "'", "select");
+            if (dt.Rows.Count > 0)
+            {
+                //if (int.Parse(st_combinenumber.Text) >= 0)
+                //{
+                /*sql.Clear();
+                sql.Append("update StencilUse set SU_ENSIONA='" + ST_ENSIONA.Text + "',SU_ENSIONB='" + ST_ENSIONB.Text + "',SU_ENSIONC='" + ST_ENSIONC.Text + "',SU_ENSIOND='" + ST_ENSIOND.Text + "',SU_ENSIONE='" + ST_ENSIONE.Text + "', su_cleannums=nvl(su_cleannums,0)+1, SU_BACKDATE=sysdate,su_returnman='" + dt.Rows[0]["em_name"].ToString() + "',su_returnmancode='" + em_code1.Text + "',");
+                sql.Append("SU_THISUSETIMES='" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + "',SU_STATUS='借出'");
+                sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
+                dh.ExecuteSql(sql.ToString(), "update");
+                sql.Clear();
+                sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "',St_USECOUNT=nvl(St_USECOUNT,0)+" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + ",ST_USESTATUS='借出' where st_code='" + SU_DEVCODE1.Text + "'");
+                dh.ExecuteSql(sql.ToString(), "update");*/
+
+                sql.Clear();
+                sql.Append($@"INSERT INTO stenciluse (su_id,su_ensiona,su_ensionb,su_ensionc,su_ensiond,su_ensione,su_stid,su_stcode,su_indate,su_useman,
                             su_cleannums,su_backdate,su_returnman,su_returnmancode,su_status,su_returnifclean)
                             SELECT stenciluse_seq.NEXTVAL,'{ST_ENSIONA.Text}', '{ST_ENSIONB.Text}', '{ST_ENSIONC.Text}','{ST_ENSIOND.Text}','{ST_ENSIONE.Text}',st_id,'{SU_DEVCODE1.Text.Trim()}',sysdate,'{dt.Rows[0]["em_name"].ToString()}',
                             '{(SU_RETURNIFCLEAN.Checked ? 1 : 0)}', sysdate,'{User.UserName}','{User.UserCode}','下线', '{(SU_RETURNIFCLEAN.Checked ? "-1" : "0")}'
                             FROM stencil WHERE st_code = '" + SU_DEVCODE1.Text.Trim() + "'");
-                    dh.ExecuteSql(sql.ToString(), "insert");
+                dh.ExecuteSql(sql.ToString(), "insert");
 
-                    dh.ExecuteSql($@"UPDATE stencil SET st_cleannums = nvl(st_cleannums, 0) + 1,st_ensiona = '{ST_ENSIONA.Text}',st_ensionb = '{ST_ENSIONB.Text}',
+                dh.ExecuteSql($@"UPDATE stencil SET st_ensiona = '{ST_ENSIONA.Text}',st_ensionb = '{ST_ENSIONB.Text}',
                             st_ensionc = '{ST_ENSIONC.Text}',st_ensiond = '{ST_ENSIOND.Text}',st_ensione = '{ST_ENSIONE.Text}',st_usestatus = '借出',ST_LINE = ''
                             WHERE st_code = '{SU_DEVCODE1.Text}'", "update");
 
 
-                    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();
-                    //}
-                    //else
-                    //{
-                    //    MessageBox.Show("加工小板数必须大于等于0");
-                    //}
-                }
-                else
-                {
-                    MessageBox.Show("人员编号" + User.UserCode + "不存在");
-                }
+                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();
+                //}
+                //else
+                //{
+                //    MessageBox.Show("加工小板数必须大于等于0");
+                //}
             }
             else
             {
-                MessageBox.Show("请确认是否清洗刮刀");
+                MessageBox.Show("人员编号" + User.UserCode + "不存在");
             }
+            /*if (SU_RETURNIFCLEAN.Checked)
+            {
+                
+            }
+            else
+            {
+                MessageBox.Show("请确认是否清洗刮刀");
+            }*/
             //}
             //    else
             //    {
@@ -605,13 +606,15 @@ namespace UAS_MES_NEW.Make
                 '-1', '{su_cleannums}' FROM stencil WHERE st_code = '" + cleanCodeVal.Text.Trim() + "'");
             dh.ExecuteSql(sql.ToString(), "insert");
 
+            dh.ExecuteSql($@"UPDATE stencil SET st_cleannums = nvl(st_cleannums, 0) + 1 WHERE st_code = '{cleanCodeVal.Text.Trim()}'", "update");
             /*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("刮刀" + cleanCodeVal.Text + "12小时清洗成功！");
             cleanCodeVal.Text = "";
-            cleanEmpVal.Text = "";
+            //cleanEmpVal.Text = "";
+
             /*SU_DEVCODE1.Text = "";
             st_combinenumber.Text = "";
             em_code1.Text = "";
@@ -662,7 +665,7 @@ namespace UAS_MES_NEW.Make
                 FROM stencil WHERE st_code = '" + qaConfrimCodeVal.Text.Trim() + "'", "insert");
 
             MessageBox.Show("刮刀" + qaConfrimCodeVal.Text + "已确认！");
-            qaConfrimVal.Text = "";
+            //qaConfrimVal.Text = "";
             qaConfrimCodeVal.Text = "";
         }
     }

UAS_MES_WEIP/FunctionCode/Make/Make_SMTStencil.cs

@@ -106,7 +106,7 @@ namespace UAS_MES_NEW.Make
                 MessageBox.Show("工单号不能为空");
                 return;
             }
-            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'", "select");
             string status = "";
             string version = "";
@@ -132,7 +132,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;
@@ -161,44 +161,42 @@ 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)
-                {
-                    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 + "','" + em_code.Text + "','" + 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 + "不存在");
-                }
-          //  }
+            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 + "','" + em_code.Text + "','" + 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 + "不存在");
+            }
+            //  }
         }
 
         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 + "' and st_statuscode='AUDITED' and st_kind = '钢网'", "select");
                 if (dt.Rows.Count > 0)
@@ -223,43 +221,43 @@ namespace UAS_MES_NEW.Make
                 dt = (DataTable)dh.ExecuteSql("select em_name from employee where em_code='" + User.UserCode + "'", "select");
                 if (dt.Rows.Count > 0)
                 {
-                        //if (int.Parse(st_combinenumber.Text) >= 0)
-                        //{
-
-                        /*sql.Clear();
-                        sql.Append("update StencilUse set SU_ENSIONA='" + ST_ENSIONA.Text + "',SU_ENSIONB='" + ST_ENSIONB.Text + "',SU_ENSIONC='" + ST_ENSIONC.Text + "',SU_ENSIOND='" + ST_ENSIOND.Text + "',SU_ENSIONE='" + ST_ENSIONE.Text + "', su_cleannums=nvl(su_cleannums,0)+1, SU_BACKDATE=sysdate,su_returnman='" + dt.Rows[0]["em_name"].ToString() + "',su_returnmancode='" + em_code1.Text + "',");
-                        sql.Append("SU_THISUSETIMES='" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + "',SU_STATUS='借出'");
-                        sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
-                        dh.ExecuteSql(sql.ToString(), "update");
-                        sql.Clear();
-                        sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "',St_USECOUNT=nvl(St_USECOUNT,0)+" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + ",ST_USESTATUS='借出' where st_code='" + SU_DEVCODE1.Text + "'");
-                        dh.ExecuteSql(sql.ToString(), "update");*/
-
-                        
-                        sql.Clear();
-                        sql.Append($@"INSERT INTO stenciluse (su_id,su_ensiona,su_ensionb,su_ensionc,su_ensiond,su_ensione,su_stid,su_stcode,su_indate,su_useman,
+                    //if (int.Parse(st_combinenumber.Text) >= 0)
+                    //{
+
+                    /*sql.Clear();
+                    sql.Append("update StencilUse set SU_ENSIONA='" + ST_ENSIONA.Text + "',SU_ENSIONB='" + ST_ENSIONB.Text + "',SU_ENSIONC='" + ST_ENSIONC.Text + "',SU_ENSIOND='" + ST_ENSIOND.Text + "',SU_ENSIONE='" + ST_ENSIONE.Text + "', su_cleannums=nvl(su_cleannums,0)+1, SU_BACKDATE=sysdate,su_returnman='" + dt.Rows[0]["em_name"].ToString() + "',su_returnmancode='" + em_code1.Text + "',");
+                    sql.Append("SU_THISUSETIMES='" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + "',SU_STATUS='借出'");
+                    sql.Append(",SU_RETURNIFCLEAN='" + (SU_RETURNIFCLEAN.Checked ? "-1" : "0") + "' where su_id=(select max(su_id) from stenciluse where su_stcode='" + SU_DEVCODE1.Text + "' and su_status='在线')");
+                    dh.ExecuteSql(sql.ToString(), "update");
+                    sql.Clear();
+                    sql.Append("update Stencil set st_cleannums=nvl(st_cleannums,0)+1,ST_ENSIONA='" + ST_ENSIONA.Text + "',ST_ENSIONB='" + ST_ENSIONB.Text + "',ST_ENSIONC='" + ST_ENSIONC.Text + "',ST_ENSIOND='" + ST_ENSIOND.Text + "',ST_ENSIONE='" + ST_ENSIONE.Text + "',St_USECOUNT=nvl(St_USECOUNT,0)+" + (st_combinenumber.Text == "" ? "0" : st_combinenumber.Text) + ",ST_USESTATUS='借出' where st_code='" + SU_DEVCODE1.Text + "'");
+                    dh.ExecuteSql(sql.ToString(), "update");*/
+
+
+                    sql.Clear();
+                    sql.Append($@"INSERT INTO stenciluse (su_id,su_ensiona,su_ensionb,su_ensionc,su_ensiond,su_ensione,su_stid,su_stcode,su_indate,su_useman,
                             su_cleannums,su_backdate,su_returnman,su_returnmancode,su_status,su_returnifclean)
                             SELECT stenciluse_seq.NEXTVAL,'{ST_ENSIONA.Text}', '{ST_ENSIONB.Text}', '{ST_ENSIONC.Text}','{ST_ENSIOND.Text}','{ST_ENSIONE.Text}',st_id,'{SU_DEVCODE1.Text.Trim()}',sysdate,'{dt.Rows[0]["em_name"].ToString()}',
                             '{(SU_RETURNIFCLEAN.Checked ? 1 : 0)}', sysdate,'{User.UserName}','{User.UserCode}','下线', '{(SU_RETURNIFCLEAN.Checked ? "-1" : "0")}'
                             FROM stencil WHERE st_code = '" + SU_DEVCODE1.Text.Trim() + "'");
-                        dh.ExecuteSql(sql.ToString(), "insert");
+                    dh.ExecuteSql(sql.ToString(), "insert");
 
-                        dh.ExecuteSql($@"UPDATE stencil SET st_cleannums = nvl(st_cleannums, 0) + 1,st_ensiona = '{ST_ENSIONA.Text}',st_ensionb = '{ST_ENSIONB.Text}',
+                    dh.ExecuteSql($@"UPDATE stencil SET st_ensiona = '{ST_ENSIONA.Text}',st_ensionb = '{ST_ENSIONB.Text}',
                             st_ensionc = '{ST_ENSIONC.Text}',st_ensiond = '{ST_ENSIOND.Text}',st_ensione = '{ST_ENSIONE.Text}',st_usestatus = '借出',ST_LINE = ''
                             WHERE st_code = '{SU_DEVCODE1.Text}'", "update");
 
-                        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();
+                    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();
                     //}
                     //else
                     //{
@@ -270,17 +268,20 @@ namespace UAS_MES_NEW.Make
                 {
                     MessageBox.Show("人员编号" + User.UserCode + "不存在");
                 }
+
+                /*if (SU_RETURNIFCLEAN.Checked)
+                {
+                }
+                else
+                {
+                    MessageBox.Show("请确认是否清洗钢网");
+                }*/
             }
-            else
-            {
-                MessageBox.Show("请确认是否清洗钢网");
-            }
-        }
             else
             {
                 MessageBox.Show("请维护完成的测试参数");
             }
-}
+        }
 
         private void Radio_CheckedChanged(object sender, EventArgs e)
         {
@@ -380,7 +381,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 + "不存在或者未审核");
@@ -540,6 +541,32 @@ namespace UAS_MES_NEW.Make
 
         private void normalButton1_Click(object sender, EventArgs e)
         {
+            if (ST_ENSIONA.Text.Trim() == "")
+            {
+                MessageBox.Show("请维护张力结果");
+                return;
+            }
+            if(ST_ENSIONB.Text.Trim() == "")
+            {
+                MessageBox.Show("请维护张力结果");
+                return;
+            }
+            if (ST_ENSIONC.Text.Trim() == "")
+            {
+                MessageBox.Show("请维护张力结果");
+                return;
+            }
+            if (ST_ENSIOND.Text.Trim() == "")
+            {
+                MessageBox.Show("请维护张力结果");
+                return;
+            }
+            if (ST_ENSIONE.Text.Trim() == "")
+            {
+                MessageBox.Show("请维护张力结果");
+                return;
+            }
+
             if (string.IsNullOrEmpty(cleanEmpVal.Text))
             {
                 MessageBox.Show("请填写清洗人员");
@@ -583,20 +610,25 @@ namespace UAS_MES_NEW.Make
                 '-1', '{su_cleannums}' FROM stencil WHERE st_code = '" + cleanCodeVal.Text.Trim() + "'");
             dh.ExecuteSql(sql.ToString(), "insert");
 
+            dh.ExecuteSql($@"UPDATE stencil SET st_cleannums = nvl(st_cleannums, 0) + 1,st_ensiona = '{ST_ENSIONA.Text}',
+                st_ensionb = '{ST_ENSIONB.Text}',st_ensionc = '{ST_ENSIONC.Text}',st_ensiond = '{ST_ENSIOND.Text}',st_ensione = '{ST_ENSIONE.Text}'
+                WHERE st_code = '{cleanCodeVal.Text.Trim()}'", "update");
+
             /*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("钢网" + cleanCodeVal.Text + "12小时清洗成功！");
             cleanCodeVal.Text = "";
-            cleanEmpVal.Text = "";
-            /*st_combinenumber.Text = "";
-            em_code1.Text = "";
+            //cleanEmpVal.Text = "";
             ST_ENSIONA.Text = "";
             ST_ENSIONB.Text = "";
             ST_ENSIONC.Text = "";
             ST_ENSIOND.Text = "";
             ST_ENSIONE.Text = "";
+
+            /*st_combinenumber.Text = "";
+            em_code1.Text = "";
             Confirm.PerformClick();*/
         }
 
@@ -639,7 +671,7 @@ namespace UAS_MES_NEW.Make
                 FROM stencil WHERE st_code = '" + qaConfrimCodeVal.Text.Trim() + "'", "insert");
 
             MessageBox.Show("钢网" + qaConfrimCodeVal.Text + "已确认！");
-            qaConfrimVal.Text = "";
+            //qaConfrimVal.Text = "";
             qaConfrimCodeVal.Text = "";
         }
     }