核对window信息

UAS_MES_PW/FunctionCode/Make/Make_CollectElec.cs

@@ -70,7 +70,7 @@ namespace UAS_MES_NEW.Make
                     KEY.Text = arr[3];
                     MAC.Text = arr[4];
                     IMEI.Text = arr[5];
-                    if (dh.CheckExist("wincheck", "WC_SNCODE<>'" + TSN.Text + "' and (WC_PSN='" + PSN.Text + "' "))
+                    if (dh.CheckExist("wincheck", "WC_SNCODE<>'" + TSN.Text + "' and (WC_PSN='" + PSN.Text + "')"))
                     {
                         OperateResult.AppendText(">>PSN重复信息\n", Color.Red);
                         return;
@@ -80,7 +80,7 @@ namespace UAS_MES_NEW.Make
                         OperateResult.AppendText(">>MAC重复信息\n", Color.Red);
                         return;
                     }
-                    if (dh.CheckExist("wincheck", "WC_SNCODE<>'" + TSN.Text + "' and (WC_PKID='" + PKID.Text + "')")&& PKID.Text!="NONE")
+                    if (dh.CheckExist("wincheck", "WC_SNCODE<>'" + TSN.Text + "' and (WC_PKID='" + PKID.Text + "')") && PKID.Text != "NONE")
                     {
                         OperateResult.AppendText(">>PKID重复信息\n", Color.Red);
                         return;
@@ -106,7 +106,13 @@ namespace UAS_MES_NEW.Make
                     {
                         //判断界面工单是否为空时的序列号是否自动归属工单
                         string oStatus = "";
-                        if (!LogicHandler.GetMakeInfo(sncode.Text, out oMakeCode, out oStatus, out ErrorMessage2))
+                        string sn_code = "";
+                        dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_sncode ='" + TSN.Text + "' or ms_firstsn='" + TSN.Text + "' order by ms_id desc", "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            sn_code = dt.Rows[0]["ms_sncode"].ToString();
+                        }
+                        if (!LogicHandler.GetMakeInfo(sn_code, out oMakeCode, out oStatus, out ErrorMessage2))
                         {
                             if (ms_makecode.Text == "")
                             {
@@ -114,9 +120,9 @@ namespace UAS_MES_NEW.Make
                                 return;
                             }
                         }
-                        OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Black);
+                        OperateResult.AppendText("<<" + sn_code + "\n", Color.Black);
                         // 获取工单归属工单下一工序是否正确
-                        if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text == "" ? oMakeCode : ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
+                        if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text == "" ? oMakeCode : ms_makecode.Text, User.UserSourceCode, sn_code, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
                         {
                             sql.Clear();
                             sql.Append("select ms_makecode,ms_prodcode,pr_detail,nvl(pr_electricmax,0)pr_electricmax,nvl(pr_electricmin,0)pr_electricmin from makeserial left join product on ");
@@ -361,7 +367,14 @@ namespace UAS_MES_NEW.Make
                     return false;
             }
             string ErrorMessage2;
-            if (!LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, TSN.Text, "核对标签信息", "核对成功", User.UserCode, out ErrorMessage2))
+
+            string sn_code = "";
+            dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_sncode ='" + TSN.Text + "' or ms_firstsn='" + TSN.Text + "' order by ms_id desc", "select");
+            if (dt.Rows.Count > 0)
+            {
+                sn_code = dt.Rows[0]["ms_sncode"].ToString();
+            }
+            if (!LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, sn_code, "核对标签信息", "核对成功", User.UserCode, out ErrorMessage2))
             {
                 OperateResult.AppendText(">>" + ErrorMessage2 + "\n", Color.Red);
             }