上料采集修改

UAS_MES_JC/FunctionCode/Make/Make_FeedingCollection_Ex.cs

@@ -344,35 +344,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();
-                        }
-                    }
-                }
-            }
             //将录入框的值给序列号
             sn_code.Text = code.Text;
             sql.Clear();
@@ -447,14 +418,15 @@ namespace UAS_MES_NEW.Make
                 }
                 else
                 {
-                    dt = (DataTable)dh.ExecuteSql("select ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_sncode='" + code.Text + "' and ms_makecode='" + ma_code.Text + "' order by ms_id desc", "select");
+                    dt = (DataTable)dh.ExecuteSql("select ms_id,ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_sncode='" + code.Text + "' and ms_makecode='" + ma_code.Text + "' order by ms_id desc", "select");
                     nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
                     ms_status = dt.Rows[0]["ms_status"].ToString();
+                    ms_id = dt.Rows[0]["ms_id"].ToString();
                     sn_code.Text = code.Text;
                     sql.Clear();
                     sql.Append("select ma_code,ma_softversion,ma_ecncode,ma_prodcode,pr_spec,ma_qty from makeserial left join product ");
                     sql.Append(" on ms_prodcode=pr_code left join make on ms_makecode=ma_code left join ");
-                    sql.Append("makecraftdetail_view on mcd_macode=ms_makecode where ms_id='" + oMsid + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+                    sql.Append("makecraftdetail_view on mcd_macode=ms_makecode where ms_id='" + ms_id + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     BaseUtil.SetFormValue(this.Controls, dt);
                     OperateResult.AppendText(">>获取序列号" + code.Text + "成功\n", Color.Green);