修改希沃验证

UAS_MES_PW/FunctionCode/Make/Make_CollectElec.Designer.cs

@@ -290,6 +290,7 @@
             this.StepCount.Source = null;
             this.StepCount.StepCode = null;
             this.StepCount.TabIndex = 200;
+            this.StepCount.Load += new System.EventHandler(this.StepCount_Load);
             // 
             // Delete
             // 
@@ -412,7 +413,7 @@
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.ms_makecode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_CollectElec";
             this.Tag = "Make!CollectElec";
             this.Text = "电量采集";

UAS_MES_PW/FunctionCode/Make/Make_CollectElec.cs

@@ -70,11 +70,32 @@ 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 + "' or WC_PKID='" + PKID.Text + "' or WC_KEY='" + KEY.Text + "' or WC_MAC='" + IMEI.Text + "' or  WC_IMEI='" + IMEI.Text + "')"))
+                    if (dh.CheckExist("wincheck", "WC_SNCODE<>'" + TSN.Text + "' and (WC_PSN='" + PSN.Text + "' "))
                     {
-                        OperateResult.AppendText(">>包含重复信息\n", Color.Red);
+                        OperateResult.AppendText(">>PSN重复信息\n", Color.Red);
                         return;
                     }
+                    if (dh.CheckExist("wincheck", "WC_SNCODE<>'" + TSN.Text + "' and (WC_MAC='" + MAC.Text + "' )"))
+                    {
+                        OperateResult.AppendText(">>MAC重复信息\n", Color.Red);
+                        return;
+                    }
+                    if (dh.CheckExist("wincheck", "WC_SNCODE<>'" + TSN.Text + "' and (WC_PKID='" + PKID.Text + "')")&& PKID.Text!="NONE")
+                    {
+                        OperateResult.AppendText(">>PKID重复信息\n", Color.Red);
+                        return;
+                    }
+                    if (dh.CheckExist("wincheck", "WC_SNCODE<>'" + TSN.Text + "' and (WC_KEY='" + KEY.Text + "')") && KEY.Text != "NONE")
+                    {
+                        OperateResult.AppendText(">>KEY重复信息\n", Color.Red);
+                        return;
+                    }
+                    if (dh.CheckExist("wincheck", "WC_SNCODE<>'" + TSN.Text + "' and (WC_IMEI='" + IMEI.Text + "')"))
+                    {
+                        OperateResult.AppendText(">>IMEI重复信息\n", Color.Red);
+                        return;
+                    }
+
                     sncode.Text = TSN.Text;
                     if (sncode.Text == "")
                     {
@@ -130,6 +151,7 @@ namespace UAS_MES_NEW.Make
                                         isnetcode = false;
                                         sncode.Text = "";
                                         sncode.Focus();
+                                        CleanData();
                                         return;
                                     }
                                     return;
@@ -157,6 +179,7 @@ namespace UAS_MES_NEW.Make
                                         isnetcode = false;
                                         sncode.Text = "";
                                         sncode.Focus();
+                                        CleanData();
                                         return;
                                     }
                                     return;
@@ -184,6 +207,7 @@ namespace UAS_MES_NEW.Make
                                         isnetcode = false;
                                         sncode.Text = "";
                                         sncode.Focus();
+                                        CleanData();
                                         return;
                                     }
                                     return;
@@ -211,6 +235,7 @@ namespace UAS_MES_NEW.Make
                                         isnetcode = false;
                                         sncode.Text = "";
                                         sncode.Focus();
+                                        CleanData();
                                         return;
                                     }
                                     return;
@@ -238,6 +263,7 @@ namespace UAS_MES_NEW.Make
                                         isnetcode = false;
                                         sncode.Text = "";
                                         sncode.Focus();
+                                        CleanData();
                                         return;
                                     }
                                     return;
@@ -265,6 +291,7 @@ namespace UAS_MES_NEW.Make
                                         isnetcode = false;
                                         sncode.Text = "";
                                         sncode.Focus();
+                                        CleanData();
                                         return;
                                     }
                                     return;
@@ -281,6 +308,24 @@ namespace UAS_MES_NEW.Make
             }
         }
 
+        private void CleanData()
+        {
+
+            TSN.Clear();
+            PSN.Clear();
+            PKID.Clear();
+            IMEI.Clear();
+            MAC.Clear();
+            KEY.Clear();
+            TSN_CHECK.Clear();
+            PSN_CHECK.Clear();
+            PKID.Clear();
+            IMEI.Clear();
+            MAC.Clear();
+            KEY.Clear();
+            OperateResult.AppendText(">>核对完成，请重新输入SN号\n", Color.Green);
+        }
+
         private bool CheckInfoPass()
         {
             if (CheckTSN.Checked)
@@ -319,6 +364,10 @@ namespace UAS_MES_NEW.Make
             if (!LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, TSN.Text, "核对标签信息", "核对成功", User.UserCode, out ErrorMessage2))
             {
                 OperateResult.AppendText(">>" + ErrorMessage2 + "\n", Color.Red);
+            }
+            else
+            {
+
             }
             return true;
         }
@@ -335,19 +384,12 @@ namespace UAS_MES_NEW.Make
 
         private void deleteButton1_Click(object sender, EventArgs e)
         {
-            if (isnetcode)
-            {
-                BaseUtil.CleanForm(this);
-                OperateResult.AppendText(">>清除完成，清重新输入SN号\n", Color.Green);
-                isnetcode = false;
-                sncode.Focus();
-                TSN.Clear();
-                PSN.Clear();
-                PKID.Clear();
-                IMEI.Clear();
-                MAC.Clear();
-                KEY.Clear();
-            }
+            CleanData();
+        }
+
+        private void StepCount_Load(object sender, EventArgs e)
+        {
+
         }
     }
 }

UAS_MES_PW/FunctionCode/Make/Make_TestCollection.cs

@@ -795,6 +795,7 @@ namespace UAS_MES_NEW.Make
                 string ms_makecode = dt.Rows[0]["ms_makecode"].ToString();
                 dh.ExecuteSql("delete from sninfo where si_sn='" + ms_sncode + "'", "delete");
                 dh.ExecuteSql("delete from makesnrelation where sn='" + ms_sncode + "' and makecode='" + ms_makecode + "'", "delete");
+                dh.ExecuteSql("delete from wincheck where WC_SNCODE='" + ms_sncode + "'", "delete");
                 dh.ExecuteSql("update makeserial set ms_sncode=ms_firstsn,ms_imei1='',ms_mac='',ms_bt='',ms_netcode='',ms_imei2='',ms_beforesn='',ms_nextstepcode='B_WRITE' where ms_sncode='" + ms_sncode + "' and ms_makecode='" + ms_makecode + "'", "update");
                 LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode, ms_makecode, User.UserLineCode,User.UserSourceCode,"取消绑定","取消绑定成功",ms_sncode,"");
                 OperateResult.AppendText(">>" + ms_sncode + "解绑成功\n", Color.Green);

UAS_MES_PW/FunctionCode/Packing/Packing_PackageCollection.cs

@@ -245,10 +245,12 @@ namespace UAS_MES_NEW.Packing
                             return;
                         }
                         object data= dh.GetConfig("CheckSN", "sys");
-                        if (!LogicHandler.CheckSeeWoSN(sn_code.Text, out ErrorMessage)&& data.ToString()=="1")
-                        {
-                            OperateResult.AppendText(">>条码" + sn_code.Text + "已激活\n");
-                            return;
+                        if (data.ToString() == "1") {
+                            if (!LogicHandler.CheckSeeWoSN(sn_code.Text, out ErrorMessage)  )
+                            {
+                                OperateResult.AppendText(">>条码" + sn_code.Text + "已激活\n");
+                                return;
+                            }
                         }
                         PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code and cr_prodcode = ms_prodcode", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sn_code.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
                         //获取序列号信息