功能修改提交

UAS_MES_LGDZ/CustomControl/HeadBar/HeadBar.cs

@@ -122,7 +122,7 @@ namespace UAS_MES_NEW.CustomControl
                 if (logout_confirm == "Yes")
                 {
                     //注销的时候切换回默认数据库
-                    SystemInf.ConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.11.28.21)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+                    SystemInf.ConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=172.16.30.253)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
                     DataHelper.DBConnectionString = SystemInf.ConnectionString;
                     //清除上个用户的权限信息
                     SystemInf.Caller.Clear();

UAS_MES_LGDZ/DataOperate/DataHelper.cs

@@ -10,11 +10,11 @@ namespace UAS_MES_NEW.DataOperate
     class DataHelper
     {
         //系统默认的的连接字符串
-        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.11.28.21)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=172.16.30.253)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
 
         //public static readonly string ERPAddesss = "http://218.64.89.153:8099/mes/";
 
-        public static readonly string ERPAddesss = "http://10.11.28.21:8099/mes/";
+        public static readonly string ERPAddesss = "http://172.16.30.253:8099/mes/";
 
         //用户选择的数据库的连接字符串
         public static string DBConnectionString;
@@ -556,7 +556,7 @@ namespace UAS_MES_NEW.DataOperate
                     catch (Exception)
                     {
                         connection = new OracleConnection(DBConnectionString);
-                        connection.Open();  
+                        connection.Open();
                         command = new OracleCommand(SQL, connection);
                         ad = new OracleDataAdapter();
                         ad.SelectCommand = command;

UAS_MES_LGDZ/FunctionCode/Make/Make_ColorBoxWeigh_ReadLine.cs

@@ -260,16 +260,13 @@ namespace UAS_MES_NEW.Make
                             try
                             {
                                 int len = serialPort1.BytesToRead;
-
                                 Byte[] readBuffer = new Byte[len];
                                 serialPort1.Read(readBuffer, 0, len); //将数据读入缓存
                                 string weigh = Encoding.Default.GetString(readBuffer);
-                                //Remark.AppendText(weigh.Trim() + "\n");
-                                string str = re.Match(weigh.Trim()).Groups[0].Value;
-                                if (str != "")
+                                Remark.AppendText(weigh.Trim() + "\n");
+                                if (weigh != "")
                                 {
-                                    weight.Text = str;
-                                    Remark.AppendText(weight.Text + "\n");
+                                    weight.Text = re.Match(weigh).Groups[0].Value;
                                 }
                             }
                             catch (Exception)

UAS_MES_LGDZ/FunctionCode/Make/Make_FeedingCollection.cs

@@ -261,6 +261,35 @@ namespace UAS_MES_NEW.Make
                 OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
                 return;
             }
+            dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei1='" + code.Text + "' order by ms_id desc", "select");
+            if (dt.Rows.Count > 0)
+            {
+                code.Text = dt.Rows[0]["ms_sncode"].ToString();
+            }
+            else
+            {
+                dt = (DataTable)dh.ExecuteSql("select ms_sncode from makeserial where ms_imei2='" + code.Text + "' order by ms_id desc", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    code.Text = dt.Rows[0]["ms_sncode"].ToString();
+                }
+                else
+                {
+                    dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei1='" + code.Text + "' order by mil_id desc", "select");
+                    if (dt.Rows.Count > 0)
+                    {
+                        code.Text = dt.Rows[0]["mil_sncode"].ToString();
+                    }
+                    else
+                    {
+                        dt = (DataTable)dh.ExecuteSql("select mil_sncode from makeimeilist where mil_imei2='" + code.Text + "' order by mil_id desc", "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            code.Text = dt.Rows[0]["mil_sncode"].ToString();
+                        }
+                    }
+                }
+            }
             if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, code.Text, User.UserCode, out oMakeCode, out oMsid, out ErrorMessage))
             {
                 if (!LogicHandler.CheckDiffMakeCodeAfterStepCheck(code.Text, oMakeCode, NoteForChange.Checked, NoteAlready, ma_code, out ErrorMessage))

UAS_MES_LGDZ/FunctionCode/Make/Make_FuselageLabelPrintGetIMEI.cs

@@ -226,7 +226,17 @@ namespace UAS_MES_NEW.Make
                             string oID1 = "";
                             string oID2 = "";
                             string oID3 = "";
-                            LogicHandler.GetMEIOrNetCodeRange(sncode.Text, "", "", out oIMEI1, out oIMEI2, out oMEID, out oNetcode, out oPSN, out oID1, out oID2, out oID3, out oErrorMessage);
+                            string BarCode = "";
+                            if (!LogicHandler.GetBarcode(sncode.Text, out BarCode, out oErrorMessage))
+                            {
+                                OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red);
+                                return;
+                            }
+                            if (!LogicHandler.GetMEIOrNetCodeRange(BarCode, ma_code.Text,"", "", out oIMEI1, out oIMEI2, out oMEID, out oNetcode, out oPSN, out oID1, out oID2, out oID3, out oErrorMessage))
+                            {
+                                OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red);
+                                return;
+                            };
                             dh.ExecuteSql("update makeserial set ms_sncode='" + oPSN + "',ms_firstsn='" + oPSN + "',ms_tsn='" + sncode.Text + "' where ms_id='" + oMsId + "' ", "update");
                             string oBT = "";
                             string oWifi = "";
@@ -236,7 +246,7 @@ namespace UAS_MES_NEW.Make
                             LogicHandler.GetAddressRangeByMO(oPSN, out oWifi, out oBT, out oCode1, out oCode2, out oCode3, out oErrorMessage);
                             //清空输入框的值，聚焦
                             //doc = lbl.Documents.Open(PrintLabel.Text);
-                            if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "机身标", "0", out oErrorMessage))
+                            if (Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, oPSN, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "机身标", "0", out oErrorMessage))
                             {
                                 //提示用户打印成功
                                 OperateResult.AppendText(">>序列号:" + sncode.Text + "打印结束\n", Color.Green);
@@ -266,7 +276,7 @@ namespace UAS_MES_NEW.Make
                                 {
                                     LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, ma_prodcode.Text, Remark.Text);
                                 }
-                              
+
                                 sncode.Text = "";
                                 sncode.Focus();
                                 //刷新打印数量和剩余数量

UAS_MES_LGDZ/FunctionCode/Make/Make_RePrintLabel.cs

@@ -165,7 +165,7 @@ namespace UAS_MES_NEW.Make
                 //打印类型为卡通箱
                 else if (CartonBox.Checked)
                 {
-                    dt = (DataTable)dh.ExecuteSql("select ms_outboxcode from makeserial where ms_imei1='" + inputText.Text + "' order by ms_id desc", "select");
+                    dt = (DataTable)dh.ExecuteSql("select ms_outboxcode from makeserial where ms_outboxcode='"+inputText.Text+"' or ms_imei2='"+inputText.Text+"' or ms_imei1='" + inputText.Text + "' order by ms_id desc", "select");
                     if (dt.Rows.Count > 0)
                     {
                         inputText.Text = dt.Rows[0]["ms_outboxcode"].ToString();

UAS_MES_LGDZ/FunctionCode/Packing/Packing_PackageCollectionWeigh_ReadLine.cs

@@ -136,11 +136,10 @@ namespace UAS_MES_NEW.Packing
                                 Byte[] readBuffer = new Byte[len];
                                 serialPort1.Read(readBuffer, 0, len); //将数据读入缓存
                                 string weigh = Encoding.Default.GetString(readBuffer);
-                                string str = re.Match(weigh.Trim()).Groups[0].Value;
-                                if (str != "")
+                                pa_remark.AppendText(weight.Text + "\n");
+                                if (weigh != "")
                                 {
-                                    weight.Text = str;
-                                    pa_remark.AppendText(weight.Text + "\n");
+                                    weight.Text = re.Match(weigh.Trim()).Groups[0].Value;
                                 }
                             }
                             catch (Exception)

UAS_MES_LGDZ/FunctionCode/Query/Query_ExeProgress.cs

@@ -73,7 +73,7 @@ namespace UAS_MES_NEW.Query
                 else
                 {
                     //没有过转号
-                    ms_id = (DataTable)dh.ExecuteSql("select ms_id,ms_makecode,ms_firstsn,ms_checkno from makeserial where ms_sncode='" + sn_code.Text + "' order by ms_id", "select");
+                    ms_id = (DataTable)dh.ExecuteSql("select ms_id,ms_makecode,ms_firstsn,ms_checkno from makeserial where ms_sncode='" + sn_code.Text + "' or ms_imei1='"+sn_code.Text+"' or ms_imei2='"+sn_code.Text+"' order by ms_id", "select");
                 }
                 if (ms_id.Rows.Count == 0)
                 {

UAS_MES_LGDZ/FunctionCode/Special/Special_Delete.cs

@@ -77,6 +77,7 @@ namespace UAS_MES_NEW.Special
                 //删除IMIE分配记录
                 sqls.Add("update  makeimeilist set mil_status=0 where mil_sncode='" + ms_sncode + "' and mil_makecode='" + ms_makecode + "'");
                 //更新MAC使用记录
+                sqls.Add("update makeserial set ms_nextmacode='' where ms_sncode='"+ms_sncode+"' and ms_nextmacode='" + ms_makecode + "'");
                 sqls.Add("update  makeaddresslist set mal_status=0 where mal_sncode='" + ms_sncode + "' and mal_makecode='" + ms_makecode + "'");
                 //初始化导入数据状态
                 sqls.Add("update makesnlist set msl_status=0 where msl_sncode='" + ms_sncode + "' and msl_makecode='" + ms_makecode + "' and msl_type='before'");
@@ -275,7 +276,8 @@ namespace UAS_MES_NEW.Special
                     ReSN(dt.Rows[i]["ms_sncode"].ToString());
                     RemainSN.Text = "已解绑" + (i + 1);
                 }
-                dh.ExecuteSql("update make set ma_inqty=0,ma_endty=0 where ma_code='" + ma_code.Text + "'", "update");
+                dh.ExecuteSql("update make set ma_inqty=0,ma_endqty=0 where ma_code='" + ma_code.Text + "'", "update");
+                dh.ExecuteSql("update makecraftdetail set MCD_INQTY=0, MCD_OUTQTY=0, MCD_OKQTY=0 where mcd_macode='"+ma_code.Text+"'","update");
             }
             else
             {

UAS_MES_LGDZ/FunctionCode/SystemSetting/SystemSetting_PrinterTest.cs

@@ -84,7 +84,7 @@ namespace UAS_MES_NEW.SystemSetting
                         switch (format.SubStrings[j].Name)
                         {
                             case "SN":
-                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyyyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp).ToString()));
+                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp).ToString()));
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_makecode='" + ma_code.Text + "'"))
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type,msl_printstatus)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before',-1)", "insert");
                                 break;
@@ -117,12 +117,12 @@ namespace UAS_MES_NEW.SystemSetting
                         switch (format.SubStrings[j].Name)
                         {
                             case "SN":
-                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyyyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp).ToString()));
+                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp).ToString()));
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_makecode='" + ma_code.Text + "'"))
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type,msl_printstatus)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before',-1)", "insert");
                                 break;
                             case "SN2":
-                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyyyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 1).ToString()));
+                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 1).ToString()));
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_makecode='" + ma_code.Text + "'"))
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type,msl_printstatus)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before',-1)", "insert");
                                 break;
@@ -155,17 +155,17 @@ namespace UAS_MES_NEW.SystemSetting
                         switch (format.SubStrings[j].Name)
                         {
                             case "SN":
-                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyyyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp).ToString()));
+                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp).ToString()));
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_makecode='" + ma_code.Text + "'"))
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type,msl_printstatus)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before',-1)", "insert");
                                 break;
                             case "SN2":
-                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyyyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 1).ToString()));
+                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 1).ToString()));
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_makecode='" + ma_code.Text + "'"))
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type,msl_printstatus)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before',-1)", "insert");
                                 break;
                             case "SN3":
-                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyyyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 2).ToString()));
+                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 2).ToString()));
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_makecode='" + ma_code.Text + "'"))
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type,msl_printstatus)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before',-1)", "insert");
                                 break;
@@ -198,22 +198,22 @@ namespace UAS_MES_NEW.SystemSetting
                         switch (format.SubStrings[j].Name)
                         {
                             case "SN":
-                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyyyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp).ToString()));
+                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp).ToString()));
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_makecode='" + ma_code.Text + "'"))
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type,msl_printstatus)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before',-1)", "insert");
                                 break;
                             case "SN2":
-                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyyyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 1).ToString()));
+                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 1).ToString()));
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_makecode='" + ma_code.Text + "'"))
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type,msl_printstatus)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before',-1)", "insert");
                                 break;
                             case "SN3":
-                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyyyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 2).ToString()));
+                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 2).ToString()));
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_makecode='" + ma_code.Text + "'"))
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type,msl_printstatus)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before',-1)", "insert");
                                 break;
                             case "SN4":
-                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyyyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 3).ToString()));
+                                format.SubStrings[j].Value = (ma_code.Text + Date.Value.ToString("yyMMdd") + lpad(int.Parse(numericUpDown1.Value.ToString()), (temp + 3).ToString()));
                                 if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "' and msl_makecode='" + ma_code.Text + "'"))
                                     dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type,msl_printstatus)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before',-1)", "insert");
                                 break;

UAS_MES_LGDZ/Login.cs

@@ -47,7 +47,7 @@ namespace UAS_MES_NEW
         {
             BaseUtil.FormStepInOrOut(this, true);
             //设置默认数据库
-            SystemInf.DefaultDB = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.11.28.21)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+            SystemInf.DefaultDB = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=172.16.30.253)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
             SystemInf.ProcessesID = System.Diagnostics.Process.GetCurrentProcess().Id;
             CheckForIllegalCrossThreadCalls = false;
             LoadMasterInf = new Thread(LoadMaster);

UAS_MES_LGDZ/Main.cs

@@ -357,7 +357,7 @@ namespace UAS_MES_NEW
             if (logout_confirm == "Yes")
             {
                 //注销的时候切换回默认数据库
-                SystemInf.ConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.11.28.21)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+                SystemInf.ConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=172.16.30.253)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
                 DataHelper.DBConnectionString = SystemInf.ConnectionString;
                 //清除上个用户的权限信息
                 SystemInf.Caller.Clear();

UAS_MES_LGDZ/PublicMethod/LogicHandler.cs

@@ -195,7 +195,7 @@ namespace UAS_MES_NEW.PublicMethod
         }
 
         [Description("分配IMEI和NetCode信息")]
-        public static bool GetMEIOrNetCodeRange(string iSN, string iIMEI1, string iNetCode, out string oIMEI1, out string oIMEI2, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3, out string oErrMessage)
+        public static bool GetMEIOrNetCodeRange(string iSN,string iMacode, string iIMEI1, string iNetCode, out string oIMEI1, out string oIMEI2, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3, out string oErrMessage)
         {
             oIMEI1 = "";
             oIMEI2 = "";
@@ -211,7 +211,7 @@ namespace UAS_MES_NEW.PublicMethod
                 return false;
             }
             oErrMessage = "";
-            string[] param = new string[] { iSN, "", iIMEI1, iNetCode, oIMEI1, oIMEI2, "", oMEID, oNetCode, oPSN, oID1, oID2, oID3, oErrMessage };
+            string[] param = new string[] { iSN, iMacode, iIMEI1, iNetCode, oIMEI1, oIMEI2, "", oMEID, oNetCode, oPSN, oID1, oID2, oID3, oErrMessage };
             string[] ParamName = new string[] { "v_i_sncode", "v_i_macode", "v_i_imei", "v_i_netcode", "v_o_imei1", "v_o_imei2", "v_o_imei3", "v_o_meid", "v_o_netcode", "v_o_psn", "v_o_id1", "v_o_id2", "v_o_id3", "v_o_errmsg" };
             dh.CallProcedure("CS_GETIMEIORNETCODERANGE_TEST", ParamName, ref param);
             oIMEI1 = param[4];
@@ -229,6 +229,27 @@ namespace UAS_MES_NEW.PublicMethod
                 return false;
         }
 
+        public static bool GetBarcode(string iSN,out string oPSN, out string oErrMessage)
+        {
+            oPSN = "";
+         
+            if (iSN == "")
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            oErrMessage = "";
+            string[] param = new string[] { iSN, oPSN, oErrMessage };
+            string[] ParamName = new string[] { "v_i_sncode", "v_o_sncode", "v_o_errmsg" };
+            dh.CallProcedure("CS_GETBARCODE", ParamName, ref param);
+            oPSN = param[1];
+            oErrMessage = param[2];
+            if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
+                return true;
+            else
+                return false;
+        }
+
         /// <summary>
         /// 记录登陆信息
         /// </summary>

UAS_MES_LGDZ/PublicMethod/Print.cs

@@ -279,7 +279,7 @@ namespace UAS_MES_NEW.PublicMethod
                                 string fp_path = label.Rows[0]["FP_PATH"].ToString().Replace("/app/uas/webapps/", "");
                                 fp_name = label.Rows[0]["fp_name"].ToString();
                                 WebClient wc = new WebClient();
-                                wc.DownloadFile("http://10.11.28.21:8099/" + fp_path, @"C:\打印标签\" + fp_name);
+                                wc.DownloadFile("http://172.16.30.253:8099/" + fp_path, @"C:\打印标签\" + fp_name);
                             }
                         }
                     }
@@ -308,7 +308,7 @@ namespace UAS_MES_NEW.PublicMethod
                                     string fp_path = label.Rows[0]["FP_PATH"].ToString().Replace("/app/uas/webapps/", "");
                                     fp_name = label.Rows[0]["fp_name"].ToString();
                                     WebClient wc = new WebClient();
-                                    wc.DownloadFile("http://10.11.28.21:8099/" + fp_path, @"C:\打印标签\" + fp_name);
+                                    wc.DownloadFile("http://172.16.30.253:8099/" + fp_path, @"C:\打印标签\" + fp_name);
                                     FileInfo file = new FileInfo(@"C:\打印标签\" + fp_name);
                                     file.CreationTime = Convert.ToDateTime(filelastwritetime);
                                 }