彩盒标签打印BUG，标签核对处理

UAS_MES_LGDZ/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -172,10 +172,25 @@ namespace UAS_MES_NEW.Make
                         {
                             sncode.Text = dt.Rows[0]["ms_sncode"].ToString();
                         }
+                        else
+                        {
+                            dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei1='" + sncode.Text + "' order by mil_id desc", "select");
+                            if (dt.Rows.Count > 0)
+                            {
+                                sncode.Text = dt.Rows[0]["mil_sncode"].ToString();
+                            }
+                            else
+                            {
+                                dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei2='" + sncode.Text + "' order by mil_id desc", "select");
+                                if (dt.Rows.Count > 0)
+                                {
+                                    sncode.Text = dt.Rows[0]["mil_sncode"].ToString();
+                                }
+                            }
+                        }
                     }
                     LogicHandler.GetMakeInfo(sncode.Text, out oMakeCode, out status, out ErrorMessage);
-
-                    if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
+                    if (LogicHandler.CheckStepSNAndMacode(oMakeCode == "" ? ma_code.Text : oMakeCode, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage))
                     {
                         string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsID + "'").ToString();
                         if (nextstepcode != User.CurrentStepCode)
@@ -326,7 +341,7 @@ namespace UAS_MES_NEW.Make
             if (_dt.Rows.Count > 0)
             {
                 string la_id = _dt.Rows[0]["la_id"].ToString();
-                _dt = (DataTable)dh.ExecuteSql("select fp_name la_url,'"+ la_id + "' la_id from FILEPATH where fp_id in (select *  from table(select parsestring(LA_SOFTTYPE,';') from label where la_templatetype='彩盒标') where COLUMN_VALUE is not null)", "select");
+                _dt = (DataTable)dh.ExecuteSql("select fp_name la_url,'" + la_id + "' la_id from FILEPATH where fp_id in (select *  from table(select parsestring(LA_SOFTTYPE,';') from label where la_templatetype='彩盒标' and la_id='" + la_id + "') where COLUMN_VALUE is not null)", "select");
                 PrintLabel.DataSource = _dt;
                 PrintLabel.DisplayMember = "la_url";
                 PrintLabel.ValueMember = "la_id";

UAS_MES_LGDZ/FunctionCode/Make/Make_ImeiCheck.cs

@@ -91,14 +91,24 @@ namespace UAS_MES_NEW.Make
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                             {
-                                OperateResult.AppendText("<<SN错误，序列号" + sncode.Text + "不存在\n", Color.Red, sncode);
-                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
-                                return;
+                                sql.Clear();
+                                sql.Append("select max(ms_id) ms_id from makeimeilist left join makeserial on mil_makecode=ms_makecode and mil_sncode=ms_sncode where mil_imei1 ='" + sncode.Text + "'");
+                                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
+                                {
+                                    sql.Clear();
+                                    sql.Append("select max(ms_id) ms_id from makeimeilist left join makeserial on mil_makecode=ms_makecode and mil_sncode=ms_sncode where mil_imei2 ='" + sncode.Text + "'");
+                                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                    if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
+                                    {
+                                        OperateResult.AppendText("<<SN错误，序列号" + sncode.Text + "不存在\n", Color.Red, sncode);
+                                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                                    }
+                                }
                             }
                         }
                     }
                     //存在该SN号
-
                     //根据该ms_id查询ms_imei1,ms_makecode信息
                     sql.Clear();
                     sql.Append("select ms_sncode from  makeserial  where ms_id='" + dt.Rows[0]["ms_id"].ToString() + "'");
@@ -142,8 +152,20 @@ namespace UAS_MES_NEW.Make
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
                             {
-                                OperateResult.AppendText("<<SN错误，序列号" + sncode.Text + "不存在\n", Color.Red, sncode);
-                                OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                                sql.Clear();
+                                sql.Append("select max(ms_id) ms_id from makeimeilist left join makeserial on mil_makecode=ms_makecode and mil_sncode=ms_sncode where mil_imei1 ='" + sncode.Text + "'");
+                                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
+                                {
+                                    sql.Clear();
+                                    sql.Append("select max(ms_id) ms_id from makeimeilist left join makeserial on mil_makecode=ms_makecode and mil_sncode=ms_sncode where mil_imei2 ='" + sncode.Text + "'");
+                                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                                    if (dt.Rows.Count == 0 || dt.Rows[0]["ms_id"].ToString() == "")
+                                    {
+                                        OperateResult.AppendText("<<SN错误，序列号" + sncode.Text + "不存在\n", Color.Red, sncode);
+                                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                                    }
+                                }
                             }
                         }
                     }
@@ -175,7 +197,7 @@ namespace UAS_MES_NEW.Make
                                 //调用  SETSTEPRESULT ，获取返回的工单号，
                                 if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, checksn, "标签核对", "OK", User.UserCode, out oErrorMessage))
                                 {
-                                  
+
                                     //提示正确返回时传递的信息
                                     if (oErrorMessage.Contains("AFTERSUCCESS"))
                                         OperateResult.AppendText(">>" + oErrorMessage + "\n");