采集二维码不允许重复

UAS_MES_JH/FunctionCode/Make/Make_TestCollectionqrcode.cs

@@ -102,7 +102,7 @@ namespace UAS_MES_NEW.Make
             US_ID.TableName = "upcsku";
             US_ID.SelectField = "US_ID # ID,US_PRODUCTCOLOR  # PRODUCT_COLOR,US_COLORCODE  # 颜色号,US_SKU # SKU,US_UPC # UPC,US_LOCATION # 出货地";
             US_ID.FormName = Name;
-            US_ID.SetValueField = new string[] { "US_ID","US_SKU", "US_PRODUCTCOLOR", "US_COLORCODE", "US_UPC","US_LOCATION" };
+            US_ID.SetValueField = new string[] { "US_ID", "US_SKU", "US_PRODUCTCOLOR", "US_COLORCODE", "US_UPC", "US_LOCATION" };
             US_ID.Condition = "1=1";
             US_ID.DbChange += US_SKU_DbChange;
 
@@ -156,7 +156,7 @@ namespace UAS_MES_NEW.Make
         }
 
 
-    
+
 
         private void CleanInfo_Click(object sender, EventArgs e)
         {
@@ -165,7 +165,7 @@ namespace UAS_MES_NEW.Make
 
         private void ms_code_KeyDown(object sender, KeyEventArgs e)
         {
-       
+
             if (e.KeyCode == Keys.Enter)
             {
                 string softversion = "";
@@ -185,9 +185,9 @@ namespace UAS_MES_NEW.Make
                     bt = message[1];
                     mac = message[2];
                     softversion = message[3];
-                    othid  = message[4]; 
-                    mmi1 = message[5]; 
-                    mmi2 = message[6];  
+                    othid = message[4];
+                    mmi1 = message[5];
+                    mmi2 = message[6];
                     opentime = message[7];
 
 
@@ -258,7 +258,7 @@ namespace UAS_MES_NEW.Make
                         if (ms_netcode != " " && dh.CheckExist("makeserial", "ms_netcode = '" + ms_netcode + "' and ms_sncode <>'" + ms_sncode.Text + "'"))
                         {
                             string othersn = dh.getFieldDataByCondition("makeserial", "ms_sncode", "ms_netcode = '" + ms_netcode + "' and ms_sncode <>'" + ms_sncode.Text + "'").ToString();
-                            OperateResult.AppendText(">>" + ms_sncode.Text + "对应wifibox:"+ms_netcode+"已被SN:"+othersn+"使用\n", Color.Red, ms_sncode);
+                            OperateResult.AppendText(">>" + ms_sncode.Text + "对应wifibox:" + ms_netcode + "已被SN:" + othersn + "使用\n", Color.Red, ms_sncode);
                             return;
                         }
                         if (sncode != ms_sncode.Text)
@@ -280,8 +280,8 @@ namespace UAS_MES_NEW.Make
                         //}
                         if (dh.CheckExist("product", "pr_code  = '" + ma_prodcode.Text + "' and pr_length = -1 ") && mmi1.Contains("UNKNOWN"))
                         {
-                               OperateResult.AppendText("<<序列号：" + ms_sncode.Text + " MMI1信息异常\n", Color.Red);
-                               return;
+                            OperateResult.AppendText("<<序列号：" + ms_sncode.Text + " MMI1信息异常\n", Color.Red);
+                            return;
                         }
                         if (dh.CheckExist("product", "pr_code  = '" + ma_prodcode.Text + "' and pr_width = -1 ") && mmi2.Contains("UNKNOWN"))
                         {
@@ -303,13 +303,19 @@ namespace UAS_MES_NEW.Make
                             OperateResult.AppendText("<<序列号：" + ms_sncode.Text + " 相框ID信息异常\n", Color.Red);
                             return;
                         }
-                        listmac = dh.getFieldDataByCondition("makesnlist", "msl_mac", "msl_sncode ='" + ms_sncode.Text + "' and msl_makecode = '"+ma_code.Text+"'").ToString();
+                        listmac = dh.getFieldDataByCondition("makesnlist", "msl_mac", "msl_sncode ='" + ms_sncode.Text + "' and msl_makecode = '" + ma_code.Text + "'").ToString();
                         if (listmac != "" && listmac != mac.ToUpper())
                         {
-                            OperateResult.AppendText("<<序列号：" + ms_sncode.Text + " 导入WIFI为:"+listmac+",与二维码mac:"+mac+"不一致\n", Color.Red);
+                            OperateResult.AppendText("<<序列号：" + ms_sncode.Text + " 导入WIFI为:" + listmac + ",与二维码mac:" + mac + "不一致\n", Color.Red);
                             return;
                         }
 
+                        listmac = dh.getFieldDataByCondition("makeserial", "ms_sncode", "ms_mac='" + mac + "' and  ms_sncode <>'" + ms_sncode.Text + "'").ToString();
+                        if (listmac != "")
+                        {
+                            OperateResult.AppendText("<<序列号：" + listmac + " 已使用MAC:[" + mac + "]\n", Color.Red);
+                            return;
+                        }
 
                         listbt = dh.getFieldDataByCondition("makesnlist", "msl_bt", "msl_sncode ='" + ms_sncode.Text + "' and msl_makecode = '" + ma_code.Text + "'").ToString();
                         if (listbt != "" && listbt != bt.ToUpper())
@@ -318,7 +324,12 @@ namespace UAS_MES_NEW.Make
                             return;
                         }
 
-
+                        listbt = dh.getFieldDataByCondition("makeserial", "ms_sncode", "ms_mac='" + bt + "' and ms_sncode <>'" + ms_sncode.Text + "'").ToString();
+                        if (listbt != "")
+                        {
+                            OperateResult.AppendText("<<序列号：" + listbt + " 已使用BT:[" + bt + "]\n", Color.Red);
+                            return;
+                        }
 
                         dh.ExecuteSql("update makeserial set MS_SOFTVERSION = '" + softversion + "',ms_othid1 = '" + othid + "',MS_MMI1 = '" + mmi1 + "',MS_MMI2 = '" + mmi2 + "'," +
                             "ms_mac = '" + mac + "',ms_bt = '" + bt + "',MS_OPENTIME = '" + opentime + "' where ms_sncode = '" + ms_sncode.Text + "' and ms_makecode = '" + ma_code.Text + "'", "update");
@@ -365,7 +376,7 @@ namespace UAS_MES_NEW.Make
                             }
                         }
 
-                   
+
 
 
                         SetCollectResult();
@@ -380,7 +391,7 @@ namespace UAS_MES_NEW.Make
 
 
 
-    
+
 
 
 
@@ -477,7 +488,7 @@ namespace UAS_MES_NEW.Make
             }
             if (GoodProduct.Checked)
                 ms_code_KeyDown(sender, new KeyEventArgs(Keys.Enter));
-          
+
         }
 
 
@@ -559,7 +570,7 @@ namespace UAS_MES_NEW.Make
 
         private void button1_Click(object sender, EventArgs e)
         {
-           
+
         }
     }
 }

UAS_MES_JH/FunctionCode/SystemSetting/SystemSetting_ScaleTest.cs

@@ -40,45 +40,32 @@ namespace UAS_MES_NEW.SystemSetting
 
         private void StartTest_Click(object sender, EventArgs e)
         {
-            using (SerialPort port = new SerialPort(ComList.Text, 9600, Parity.None, 8, StopBits.One))
+            if (this.ComList.Text == "")
             {
-                try
-                {
-                    port.Open();
-                    MessageBox.Show("串口打开成功！");
-                    port.Close();
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show($"失败: {ex.Message}");
-                }
+                MessageBox.Show("端口号不可为空");
+                return;
+            }
+            if (this.BaudRate.Text == "")
+            {
+                MessageBox.Show("波特率不可为空");
+                return;
+            }
+            thread = new Thread(GetSerialData);
+            try
+            {
+                ReadData = true;
+                serialPort1.PortName = "COM3";      // 确保是存在的端口
+                serialPort1.BaudRate = 9600;        // 必须与设备一致
+                serialPort1.DataBits = 8;           // 通常为8
+                serialPort1.Parity = Parity.None;   // 通常为None
+                serialPort1.StopBits = StopBits.One; // 通常为1
+                serialPort1.Handshake = Handshake.None; // 通常为None
+                BaseUtil.SetCacheData("PortName", this.ComList.Text);
+                BaseUtil.SetCacheData("BaudRate", BaudRate.Text);
+                serialPort1.Open();
+                thread.Start();
             }
-            //if (this.ComList.Text == "")
-            //{
-            //    MessageBox.Show("端口号不可为空");
-            //    return;
-            //}
-            //if (this.BaudRate.Text == "")
-            //{
-            //    MessageBox.Show("波特率不可为空");
-            //    return;
-            //}
-            //thread = new Thread(GetSerialData);
-            //try
-            //{
-            //    ReadData = true;
-            //    serialPort1.PortName = "COM3";      // 确保是存在的端口
-            //    serialPort1.BaudRate = 9600;        // 必须与设备一致
-            //    serialPort1.DataBits = 8;           // 通常为8
-            //    serialPort1.Parity = Parity.None;   // 通常为None
-            //    serialPort1.StopBits = StopBits.One; // 通常为1
-            //    serialPort1.Handshake = Handshake.None; // 通常为None
-            //    BaseUtil.SetCacheData("PortName", this.ComList.Text);
-            //    BaseUtil.SetCacheData("BaudRate", BaudRate.Text);
-            //    serialPort1.Open();
-            //    thread.Start();
-            //}
-            //catch (Exception mes) { MessageBox.Show(mes.Message + mes.StackTrace); }
+            catch (Exception mes) { MessageBox.Show(mes.Message + mes.StackTrace); }
         }
 
         private void GetSerialData()