4IMEI接口修改

UAS_MesInterface(LGDZ)/MesHelper.cs

@@ -22,10 +22,10 @@ namespace UMESDLLService
         bool GetRcardMOInfo(string iSN, out string oMoCode, out string oErrMessage);
         bool CheckUserAndResourcePassed(string iUserCode, string iResCode, string iPassWord, out string oErrMessage);
         bool GetAddressRangeByMO(string iSN, out string oInfo, out string oErrMessage);
-        bool SetAddressInfo(string iSN, string iMac, string iBT, string iNetCard, string iCode1, string iCode2, string iCode3, out string oErrorMessage);
+        bool SetAddressInfo(string iSN, string iMac, string iBT,  string iCode1, string iCode2, string iCode3, out string oErrorMessage);
         bool SetTestDetail(string iSN, string iTestResult, string iResCode, string[,] iTestDetail, out string oErrMessage);
         bool GetMEIOrNetCodeRange(string iSnCode, string iIMEI1, string iNetCode, out string oInfo, out string oErrMessage);
-        bool SetIMEIInfo(string iSN, string iIMEI1, string iIMEI2, string iIMEI3, string iMEID, string iNETCODE, string iID1, string iID2, string iID3, out string oErrMessage);
+        bool SetIMEIInfo(string iSN, string iIMEI1, string iIMEI2, string iIMEI3, string iIMEI4, string iMEID, string iNETCODE, string iID1, string iID2, string iID3, out string oErrMessage);
         bool GetMobileAllInfo(string iSnCode, out string oInfo, out string oErrorMessage);
         bool SetMobileData(string iTSN, string iSN, string iSourceCode, string iOperator, string iResult, string iErrCode, string flag, out string oErrorMessage);
         bool SetPcbaData(string iSN, string iResCode, string iOperator, string iResult, string iErrCode, out string oErrMessage);
@@ -48,7 +48,7 @@ namespace UMESDLLService
 
         string Master = "N_MES";
         //系统默认的的连接字符串
-        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)));";
+        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 OracleConnection connection;
         //用户选择的数据库的连接字符串
@@ -277,6 +277,7 @@ namespace UMESDLLService
             oInfo = "";
             string oWIFI = "";
             string oBT = "";
+            string oNetCard = "";
             string oCode1 = "";
             string oCode2 = "";
             string oCdoe3 = "";
@@ -288,7 +289,7 @@ namespace UMESDLLService
             oErrMessage = "";
             string omakeCode = "";
             GetRcardMOInfo(iSN, out omakeCode, out oErrMessage);
-            string[] param = new string[] { iSN, omakeCode, oWIFI, oBT, "", oCode1, oCode2, oCdoe3, oErrMessage };
+            string[] param = new string[] { iSN, omakeCode, oWIFI, oBT, oNetCard, oCode1, oCode2, oCdoe3, oErrMessage };
             string[] ParamName = new string[] { "v_i_sncode", "v_i_macode", "v_o_mac", "v_o_bt", "v_o_netcard", "v_o_code1", "v_o_code2", "v_o_code3", "v_o_errmsg" };
             CallProcedure("CS_GETADDRESSBYMAKECODE_FIMEI", ParamName, ref param);
             oInfo += "MAC:" + param[2].ToString() + "^".Replace("null", "");
@@ -328,29 +329,35 @@ namespace UMESDLLService
             string oIMEI1 = "";
             string oIMEI2 = "";
             string oIMEI3 = "";
+            string oIMEI4 = "";
             string oMEID = "";
             string oNetCode = "";
             string oPSN = "";
             string oID1 = "";
             string oID2 = "";
             string oID3 = "";
+
             if (iSN == "")
             {
                 oErrMessage = "SN不能为空";
                 return false;
             }
+
             oErrMessage = "";
-            string[] param = new string[] { iSN, "", iIMEI1, iNetCode, oIMEI1, oIMEI2, oIMEI3, 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" };
-            CallProcedure("CS_GETIMEIORNETCODERANGE", ParamName, ref param);
-            oInfo = oInfo + "IMEI1:" + param[4].ToString() + "^".Replace("null", "");
-            oInfo = oInfo + "IMEI2:" + param[5].ToString() + "^".Replace("null", "");
-            oInfo = oInfo + "MEID:" + param[7].ToString() + "^".Replace("null", "");
-            oInfo = oInfo + "NETCODE:" + param[8].ToString() + "^".Replace("null", "");
-            oInfo = oInfo + "PSN:" + param[9].ToString() + "^".Replace("null", "");
-            oInfo = oInfo + "ID1:" + param[10].ToString() + "^".Replace("null", "");
-            oInfo = oInfo + "ID2:" + param[11].ToString() + "^".Replace("null", "");
-            oInfo = oInfo + "ID3:" + param[12].ToString() + "".Replace("null", "");
+            string[] param = new string[] { iSN, "", iIMEI1, iNetCode, oIMEI1, oIMEI2, oIMEI3, oIMEI4, 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_imei4", "v_o_meid", "v_o_netcode", "v_o_psn", "v_o_id1", "v_o_id2", "v_o_id3", "v_o_errmsg" };
+            CallProcedure("CS_GETIMEIORNETCODERANGE_FIMEI", ParamName, ref param);
+
+            oInfo += "IMEI1:" + param[4].ToString() + "^".Replace("null", "");
+            oInfo += "IMEI2:" + param[5].ToString() + "^".Replace("null", "");
+            oInfo += "IMEI3:" + param[6].ToString() + "^".Replace("null", "");
+            oInfo += "IMEI4:" + param[7].ToString() + "^".Replace("null", "");
+            oInfo += "MEID:" + param[8].ToString() + "^".Replace("null", "");
+            oInfo += "NETCODE:" + param[9].ToString() + "^".Replace("null", "");
+            oInfo += "PSN:" + param[10].ToString() + "^".Replace("null", "");
+            oInfo += "ID1:" + param[11].ToString() + "^".Replace("null", "");
+            oInfo += "ID2:" + param[12].ToString() + "^".Replace("null", "");
+            oInfo += "ID3:" + param[13].ToString() + "".Replace("null", "");
             oErrMessage = param[13];
             if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
                 return true;
@@ -470,7 +477,7 @@ namespace UMESDLLService
             //        return false;
             //}
             //通过序列号获取最近操作的工单号
-            string ms_id = getFieldDataByCondition("makeserial", "max(ms_id)", "ms_sncode='" + iSN + "' or ms_firstsn='" + iSN + "' or ms_imei1='" + iSN + "' or ms_imei2='" + iSN + "'").ToString();
+            string ms_id = getFieldDataByCondition("makeserial", "max(ms_id)", "ms_sncode='" + iSN + "' or ms_imei1='" + iSN + "' or ms_imei2='+iSN+'").ToString();
             if (ms_id != "")
             {
                 DataTable dt = getFieldsDataByCondition("MakeSerial", new string[] { "ms_id", "ms_mac", "ms_bt", "ms_meid", "ms_netcode", "ms_psn", "ms_imei1", "ms_imei2", "ms_imei3", "ms_othcode1", "ms_othcode2", "ms_othcode3", "ms_othid1", "ms_othid2", "ms_othid3" }, "ms_id='" + ms_id + "'");
@@ -565,7 +572,7 @@ namespace UMESDLLService
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
         [Description("写入SN的Wifi,BT信息")]
-        public bool SetAddressInfo(string iSN, string iMac, string iBT, string iNetCard, string iCode1, string iCode2, string iCode3, out string oErrMessage)
+        public bool SetAddressInfo(string iSN, string iMac, string iBT, string iCode1, string iCode2, string iCode3, out string oErrMessage)
         {
             if (iSN == "")
             {
@@ -573,7 +580,7 @@ namespace UMESDLLService
                 return false;
             }
             oErrMessage = "";
-            string[] param = new string[] { iSN, iMac, iBT, iNetCard, iCode1, iCode2, iCode3, oErrMessage };
+            string[] param = new string[] { iSN, iMac, iBT, "", iCode1, iCode2, iCode3, oErrMessage };
             string[] ParamName = new string[] { "v_i_sncode", "v_i_mac", "v_i_bt", "v_i_netcard", "v_i_code1", "v_i_code2", "v_i_code3", "v_o_errmsg" };
             CallProcedure("CS_SETADDRESSINFO_FIMEI", ParamName, ref param);
             oErrMessage = param[6];
@@ -776,7 +783,7 @@ namespace UMESDLLService
         /// <param name="oErrorMessage"></param>
         /// <returns></returns>
         [Description("设置IMEI信息")]
-        public bool SetIMEIInfo(string iSN, string iIMEI1, string iIMEI2, string iIMEI3, string iMEID, string iNETCODE, string iID1, string iID2, string iID3, out string oErrMessage)
+        public bool SetIMEIInfo(string iSN, string iIMEI1, string iIMEI2, string iIMEI3, string iIMEI4, string iMEID, string iNETCODE, string iID1, string iID2, string iID3, out string oErrMessage)
         {
             if (iSN == "")
             {
@@ -784,9 +791,9 @@ namespace UMESDLLService
                 return false;
             }
             oErrMessage = "";
-            string[] param = new string[] { iSN, iIMEI1, iIMEI2, iIMEI3, iMEID, iNETCODE, "", iID1, iID2, iID3, oErrMessage };
-            string[] ParamName = new string[] { "v_i_sncode", "v_i_imei1", "v_i_imei2", "v_i_imei3", "v_i_meid", "v_i_netcode", "v_i_psn", "v_i_id1", "v_i_id2", "v_i_id3", "v_o_errmsg" };
-            CallProcedure("CS_SETIMEIINFO", ParamName, ref param);
+            string[] param = new string[] { iSN, iIMEI1, iIMEI2, iIMEI3, iIMEI4, iMEID, iNETCODE, "", iID1, iID2, iID3, oErrMessage };
+            string[] ParamName = new string[] { "v_i_sncode", "v_i_imei1", "v_i_imei2", "v_i_imei3", "v_i_imei4", "v_i_meid", "v_i_netcode", "v_i_psn", "v_i_id1", "v_i_id2", "v_i_id3", "v_o_errmsg" };
+            CallProcedure("CS_SETIMEIINFO_FIMEI", ParamName, ref param);
             oErrMessage = param[10];
             if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
                 return true;
@@ -1295,7 +1302,7 @@ namespace UMESDLLService
             oErrorMessage = "";
             try
             {
-                string url = "http://172.16.30.253:8099/mes/mobile/login.action";//html调用的地址              
+                string url = "http://10.11.28.21:8099/mes/mobile/login.action";//html调用的地址              
                 HttpWebRequest webrequest = (HttpWebRequest)WebRequest.Create(url);
                 if (webrequest == null)
                 {