拆解不良处理

UAS_MES_JC/FunctionCode/Make/Make_Decompose_Ex.cs

@@ -401,14 +401,14 @@ namespace UAS_MES_NEW.Make
                                     {
                                         //更新子件序列号为待维修                               
                                         sql.Clear();
-                                        sql.Append("update makeserial set ms_status=1 ,ms_nextstepcode='单板测试',ms_badtimes = ms_badtimes+1,ms_nextmacode = '' where ms_id='" + mss_id + "' ");
+                                        sql.Append("update makeserial set ms_status=3 ,ms_nextstepcode='',ms_badtimes = ms_badtimes+1,ms_nextmacode = '' where ms_id='" + mss_id + "' ");
                                         dh.ExecuteSql(sql.GetString(), "update");
                                     }
                                     else if (wccode == "模块")
                                     {
                                         //更新子件序列号为待维修                               
                                         sql.Clear();
-                                        sql.Append("update makeserial set ms_status=1 ,ms_nextstepcode='模块测试',ms_badtimes = ms_badtimes+1,ms_nextmacode = '' where ms_id='" + mss_id + "' ");
+                                        sql.Append("update makeserial set ms_status=3 ,ms_nextstepcode='',ms_badtimes = ms_badtimes+1,ms_nextmacode = '' where ms_id='" + mss_id + "' ");
                                         dh.ExecuteSql(sql.GetString(), "update");
                                     }
                                     else

UAS_MES_JC/FunctionCode/Make/Make_FeedingCollection.cs

@@ -349,35 +349,6 @@ namespace UAS_MES_NEW.Make
                 OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
                 return;
             }
-            dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei1='" + code.Text + "' order by ms_id desc", "select");
-            if (dt.Rows.Count > 0)
-            {
-                code.Text = dt.Rows[0]["ms_sncode"].ToString();
-            }
-            else
-            {
-                dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + code.Text + "' order by ms_id desc", "select");
-                if (dt.Rows.Count > 0)
-                {
-                    code.Text = dt.Rows[0]["ms_sncode"].ToString();
-                }
-                else
-                {
-                    dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei1='" + code.Text + "' order by mil_id desc", "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        code.Text = dt.Rows[0]["mil_sncode"].ToString();
-                    }
-                    else
-                    {
-                        dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei2='" + code.Text + "' order by mil_id desc", "select");
-                        if (dt.Rows.Count > 0)
-                        {
-                            code.Text = dt.Rows[0]["mil_sncode"].ToString();
-                        }
-                    }
-                }
-            }
             if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, code.Text, User.UserCode, out oMakeCode, out oMsid, out ErrorMessage))
             {
                 nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsid + "'").ToString();