维修，查询界面修改

UAS_MES_JC/FunctionCode/Make/Make_Repair.cs

@@ -159,43 +159,22 @@ namespace UAS_MES_NEW.Make
                     BadCodeTree.Nodes.Clear();
                     return;
                 }
-                dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei1='" + GetSNCode.Text + "' order by ms_id desc", "select");
-                if (dt.Rows.Count > 0)
-                {
-                    GetSNCode.Text = dt.Rows[0]["ms_sncode"].ToString();
-                }
-                else
-                {
-                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + GetSNCode.Text + "' order by ms_id desc", "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        GetSNCode.Text = dt.Rows[0]["ms_sncode"].ToString();
-                    }
-                    else
-                    {
-                        dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei1='" + GetSNCode.Text + "' order by mil_id desc", "select");
-                        if (dt.Rows.Count > 0)
-                        {
-                            GetSNCode.Text = dt.Rows[0]["mil_sncode"].ToString();
-                        }
-                        else
-                        {
-                            dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei2='" + GetSNCode.Text + "' order by mil_id desc", "select");
-                            if (dt.Rows.Count > 0)
-                            {
-                                GetSNCode.Text = dt.Rows[0]["mil_sncode"].ToString();
-                            }
-                        }
-                    }
-                }
                 sql.Clear();
-                sql.Append("select ms_status,ms_outboxcode,ms_paststep,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework from makeserial left join make ");
+                sql.Append("select ms_status,ms_wccode,ms_outboxcode,ms_paststep,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework from makeserial left join make ");
                 sql.Append("on ms_makecode=ma_code where ms_sncode = '" + GetSNCode.Text + "' order by ms_id desc");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 string ms_paststep = "";
                 if (dt.Rows.Count > 0)
                 {
                     string ms_status = dt.Rows[0]["ms_status"].ToString();
+                    string ms_wccode = dt.Rows[0]["ms_wccode"].ToString();
+                    if (ms_wccode != User.WorkCenter)
+                    {
+                        OperatResult.AppendText(">>序列号工作中心:【" + ms_wccode + "】与当前资源【" + User.WorkCenter + "】不对应，不允许维修\n", Color.Red);
+                        BaseUtil.CleanForm(this);
+                        BadCodeTree.Nodes.Clear();
+                        return;
+                    }
                     ms_paststep = dt.Rows[0]["ms_paststep"].ToString();
                     ifrework = dt.Rows[0]["ms_ifrework"].ToString();
                     reworkstatus = dt.Rows[0]["ms_reworkstatus"].ToString();
@@ -295,7 +274,7 @@ namespace UAS_MES_NEW.Make
                             //sql.Append("sp_craftcode=v_v_mscraftcode and sp_stepcode='' And sp_mothercode ='"+ms_prodcode.Text+"' and sp_tracekind=1");
                             sql.Append("and not exists(select 1 from craftmaterial where cm_sncode in (select '" + firstsn + "' from dual union ");
                             sql.Append("select sn from makesnrelation where firstsn='" + firstsn + "') and cm_makecode='" + macode + "' and ");
-                            sql.Append("cm_fsoncode=sp_fsoncode and cm_status=0) and instr((select ms_paststep from makeserial where ms_firstsn='" + firstsn + "' and ms_makecode='"+ macode + "'),sp_stepcode)>0 order by SP_DETNO asc");
+                            sql.Append("cm_fsoncode=sp_fsoncode and cm_status=0) and instr((select ms_paststep from makeserial where ms_firstsn='" + firstsn + "' and ms_makecode='" + macode + "'),sp_stepcode)>0 order by SP_DETNO asc");
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count > 0)
                             {

UAS_MES_JC/FunctionCode/Query/Query_ExeProgress.cs

@@ -65,34 +65,10 @@ namespace UAS_MES_NEW.Query
         {
             if (e.KeyCode == Keys.Enter)
             {
-                dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei1='" + sn_code.Text + "' order by ms_id desc", "select");
+                dt = (DataTable)dh.ExecuteSql("select cm_sncode from craftmaterial where cm_barcode='" + sn_code.Text + "' and nvl(cm_status,0)=0", "select");
                 if (dt.Rows.Count > 0)
                 {
-                    sn_code.Text = dt.Rows[0]["ms_sncode"].ToString();
-                }
-                else
-                {
-                    dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + sn_code.Text + "' order by ms_id desc", "select");
-                    if (dt.Rows.Count > 0)
-                    {
-                        sn_code.Text = dt.Rows[0]["ms_sncode"].ToString();
-                    }
-                    else
-                    {
-                        dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei1='" + sn_code.Text + "' order by mil_id desc", "select");
-                        if (dt.Rows.Count > 0)
-                        {
-                            sn_code.Text = dt.Rows[0]["mil_sncode"].ToString();
-                        }
-                        else
-                        {
-                            dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei2='" + sn_code.Text + "' order by mil_id desc", "select");
-                            if (dt.Rows.Count > 0)
-                            {
-                                sn_code.Text = dt.Rows[0]["mil_sncode"].ToString();
-                            }
-                        }
-                    }
+                    sn_code.Text = dt.Rows[0]["cm_sncode"].ToString();
                 }
                 ms_id = (DataTable)dh.ExecuteSql("select beforesn,sn from makesnrelation where beforesn='" + sn_code.Text + "' or sn='" + sn_code.Text + "'", "select");
                 if (ms_id.Rows.Count > 0)

UAS_MES_JC/PublicMethod/LogicHandler.cs

@@ -1173,8 +1173,8 @@ namespace UAS_MES_NEW.PublicMethod
                     {
                         if (dt.Rows[0]["ms_status"].ToString() != "2")
                         {
-                            ErrMessage = "条码" + iSN + "未完成测试，不允许上料";
-                            return false;
+                          /*  ErrMessage = "条码" + iSN + "未完成测试，不允许上料";
+                            return false;*/
                         }
                     }
                     //若有多个，以|分割