Browse Source

测试采集修改

callm 1 year ago
parent
commit
31fd5e84a4

+ 2 - 0
UAS_MES_YD/FunctionCode/Make/Make_PreFeedingCollection.cs

@@ -222,6 +222,8 @@ namespace UAS_MES_NEW.Make
                     }
                     else if (UnLoading.Checked)
                     {
+                        mainbarcode.Text = code.Text;
+                        GetItem();
                         bool finddata = false;
                         for (int i = 0; i < LabelDataGridView.Rows.Count; i++)
                         {

+ 1 - 1
UAS_MES_YD/FunctionCode/Make/Make_TestCollection.cs

@@ -890,7 +890,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("update makeserial set ms_sncode=ms_firstsn,ms_imei1='',ms_mac='',ms_bt='',ms_netcode='',ms_imei2='',ms_beforesn='' where ms_sncode='" + ms_sncode + "' and ms_makecode='" + ma_code.Text + "'", "update");
+                dh.ExecuteSql("update makeserial set ms_sncode=ms_firstsn,ms_imei1='',ms_imei3='',ms_imei4='',ms_mac='',ms_bt='',ms_netcode='',ms_imei2='',ms_beforesn='' where ms_sncode='" + ms_sncode + "' and ms_makecode='" + ma_code.Text + "'", "update");
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "解绑", "解绑成功", ms_sncode, ob_checkno.Text);
                 OperateResult.AppendText(">>" + ms_sncode + "解绑成功\n", Color.Green);
             }

+ 1 - 0
UAS_MES_YD/PublicMethod/Print.cs

@@ -7,6 +7,7 @@ using UAS_MES_NEW.Entity;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using Seagull.BarTender.Print;
+using System;
 
 namespace UAS_MES_NEW.PublicMethod
 {