SPI XRAY采集界面快速维修功能复原

UAS-MES/FunctionCode/Make/Make_SpiTestCollection.cs

@@ -717,32 +717,32 @@ namespace UAS_MES.Make
                     }
                     dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_id", "nvl(ms_ifrework,0) ms_ifrework", "ms_paststep" }, "ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + ma_code.Text + "' ");
                     string St_ifqccheck = dh.getFieldDataByCondition("source LEFT JOIN STEP on st_code=sc_stepcode", "nvl(St_ifqccheck,0)", "sc_code='" + User.UserSourceCode + "'").ToString();
-                    //List<string> SQLS = new List<string>();
-                    //LogicHandler.InsertMakeProcess(ms_sncode.Text, ma_code.Text, User.UserSourceCode, "快速维修采集", "完成快速维修", User.UserCode);
-                    //LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "快速维修采集", "完成快速维修", ms_sncode.Text, ob_checkno.Text);
-                    //if (dt.Rows.Count > 0)
-                    //{
-                    //    string ms_id = dt.Rows[0]["ms_id"].ToString();
-                    //    string ms_ifrework = dt.Rows[0]["ms_ifrework"].ToString();
-                    //    if (St_ifqccheck != "-1")
-                    //    {
-                    //        if (ms_ifrework == "0")
-                    //            SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + User.CurrentStepCode + "',ms_status=1,ms_stepcode='SMT_REPAIR' where ms_id='" + ms_id + "'");
-                    //        else
-                    //            SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + User.CurrentStepCode + "',ms_reworkstatus=1,ms_stepcode='SMT_REPAIR' where ms_id='" + ms_id + "'");
-                    //    }
-                    //    else
-                    //    {
-                    //        if (ms_ifrework == "0")
-                    //            SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + ms_nextstepcode + "',ms_status=1,ms_stepcode='SMT_REPAIR',ms_paststep = REPLACE(ms_paststep,','||'" + ms_nextstepcode + "') where ms_id='" + ms_id + "'");
-                    //        else
-                    //            SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + ms_nextstepcode + "',ms_reworkstatus=1,ms_stepcode='SMT_REPAIR',ms_paststep = REPLACE(ms_paststep,','||'" + ms_nextstepcode + "')  where ms_id='" + ms_id + "'");
-                    //        if (status == "2")
-                    //            SQLS.Add("update makeserial set ms_status='2' where ms_id='" + ms_id + "'");
-                    //    }
-                    //}
-                    //SQLS.Add("update makebad set mb_status=-1 where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "' and MB_STEPCODE = '" + User.CurrentStepCode + "'");
-                    //dh.ExecuteSQLTran(SQLS.ToArray());
+                    List<string> SQLS = new List<string>();
+                    LogicHandler.InsertMakeProcess(ms_sncode.Text, ma_code.Text, User.UserSourceCode, "快速维修采集", "完成快速维修", User.UserCode);
+                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "快速维修采集", "完成快速维修", ms_sncode.Text, ob_checkno.Text);
+                    if (dt.Rows.Count > 0)
+                    {
+                        string ms_id = dt.Rows[0]["ms_id"].ToString();
+                        string ms_ifrework = dt.Rows[0]["ms_ifrework"].ToString();
+                        if (St_ifqccheck != "-1")
+                        {
+                            if (ms_ifrework == "0")
+                                SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + User.CurrentStepCode + "',ms_status=1,ms_stepcode='SMT_REPAIR' where ms_id='" + ms_id + "'");
+                            else
+                                SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + User.CurrentStepCode + "',ms_reworkstatus=1,ms_stepcode='SMT_REPAIR' where ms_id='" + ms_id + "'");
+                        }
+                        else
+                        {
+                            if (ms_ifrework == "0")
+                                SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + ms_nextstepcode + "',ms_status=1,ms_stepcode='SMT_REPAIR',ms_paststep = REPLACE(ms_paststep,','||'" + ms_nextstepcode + "') where ms_id='" + ms_id + "'");
+                            else
+                                SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + ms_nextstepcode + "',ms_reworkstatus=1,ms_stepcode='SMT_REPAIR',ms_paststep = REPLACE(ms_paststep,','||'" + ms_nextstepcode + "')  where ms_id='" + ms_id + "'");
+                            if (status == "2")
+                                SQLS.Add("update makeserial set ms_status='2' where ms_id='" + ms_id + "'");
+                        }
+                    }
+                    SQLS.Add("update makebad set mb_status=-1 where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "' and MB_STEPCODE = '" + User.CurrentStepCode + "'");
+                    dh.ExecuteSQLTran(SQLS.ToArray());
 
                     //保存不良原因
                     LastSncode = ms_sncode.Text;

UAS-MES/FunctionCode/Make/Make_XrayTestCollection.cs

@@ -713,32 +713,32 @@ namespace UAS_MES.Make
                     }
                     dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_id", "nvl(ms_ifrework,0) ms_ifrework", "ms_paststep" }, "ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + ma_code.Text + "' ");
                     string St_ifqccheck = dh.getFieldDataByCondition("source LEFT JOIN STEP on st_code=sc_stepcode", "nvl(St_ifqccheck,0)", "sc_code='" + User.UserSourceCode + "'").ToString();
-                    //List<string> SQLS = new List<string>();
-                    //LogicHandler.InsertMakeProcess(ms_sncode.Text, ma_code.Text, User.UserSourceCode, "快速维修采集", "完成快速维修", User.UserCode);
-                    //LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "快速维修采集", "完成快速维修", ms_sncode.Text, ob_checkno.Text);
-                    //if (dt.Rows.Count > 0)
-                    //{
-                    //    string ms_id = dt.Rows[0]["ms_id"].ToString();
-                    //    string ms_ifrework = dt.Rows[0]["ms_ifrework"].ToString();
-                    //    if (St_ifqccheck != "-1")
-                    //    {
-                    //        if (ms_ifrework == "0")
-                    //            SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + User.CurrentStepCode + "',ms_status=1,ms_stepcode='SMT_REPAIR' where ms_id='" + ms_id + "'");
-                    //        else
-                    //            SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + User.CurrentStepCode + "',ms_reworkstatus=1,ms_stepcode='SMT_REPAIR' where ms_id='" + ms_id + "'");
-                    //    }
-                    //    else
-                    //    {
-                    //        if (ms_ifrework == "0")
-                    //            SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + ms_nextstepcode + "',ms_status=1,ms_stepcode='SMT_REPAIR',ms_paststep = REPLACE(ms_paststep,','||'" + ms_nextstepcode + "') where ms_id='" + ms_id + "'");
-                    //        else
-                    //            SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + ms_nextstepcode + "',ms_reworkstatus=1,ms_stepcode='SMT_REPAIR',ms_paststep = REPLACE(ms_paststep,','||'" + ms_nextstepcode + "')  where ms_id='" + ms_id + "'");
-                    //        if (status == "2")
-                    //            SQLS.Add("update makeserial set ms_status='2' where ms_id='" + ms_id + "'");
-                    //    }
-                    //}
-                    //SQLS.Add("update makebad set mb_status=-1 where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "' and MB_STEPCODE = '" + User.CurrentStepCode + "'");
-                    //dh.ExecuteSQLTran(SQLS.ToArray());
+                    List<string> SQLS = new List<string>();
+                    LogicHandler.InsertMakeProcess(ms_sncode.Text, ma_code.Text, User.UserSourceCode, "快速维修采集", "完成快速维修", User.UserCode);
+                    LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "快速维修采集", "完成快速维修", ms_sncode.Text, ob_checkno.Text);
+                    if (dt.Rows.Count > 0)
+                    {
+                        string ms_id = dt.Rows[0]["ms_id"].ToString();
+                        string ms_ifrework = dt.Rows[0]["ms_ifrework"].ToString();
+                        if (St_ifqccheck != "-1")
+                        {
+                            if (ms_ifrework == "0")
+                                SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + User.CurrentStepCode + "',ms_status=1,ms_stepcode='SMT_REPAIR' where ms_id='" + ms_id + "'");
+                            else
+                                SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + User.CurrentStepCode + "',ms_reworkstatus=1,ms_stepcode='SMT_REPAIR' where ms_id='" + ms_id + "'");
+                        }
+                        else
+                        {
+                            if (ms_ifrework == "0")
+                                SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + ms_nextstepcode + "',ms_status=1,ms_stepcode='SMT_REPAIR',ms_paststep = REPLACE(ms_paststep,','||'" + ms_nextstepcode + "') where ms_id='" + ms_id + "'");
+                            else
+                                SQLS.Add("update makeserial set ms_checkno='', ms_nextstepcode ='" + ms_nextstepcode + "',ms_reworkstatus=1,ms_stepcode='SMT_REPAIR',ms_paststep = REPLACE(ms_paststep,','||'" + ms_nextstepcode + "')  where ms_id='" + ms_id + "'");
+                            if (status == "2")
+                                SQLS.Add("update makeserial set ms_status='2' where ms_id='" + ms_id + "'");
+                        }
+                    }
+                    SQLS.Add("update makebad set mb_status=-1 where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "' and MB_STEPCODE = '" + User.CurrentStepCode + "'");
+                    dh.ExecuteSQLTran(SQLS.ToArray());
                     //保存不良原因
                     LastSncode = ms_sncode.Text;
                     //采集完不良，聚焦序列号