|
|
@@ -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=10.98.0.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=218.64.89.153)(PORT=61521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
|
|
|
//用户选择的数据库的连接字符串
|
|
|
private OracleConnection connection;
|
|
|
//用户选择的数据库的连接字符串
|
|
|
@@ -327,6 +327,7 @@ namespace UMESDLLService
|
|
|
oInfo = "";
|
|
|
string oIMEI1 = "";
|
|
|
string oIMEI2 = "";
|
|
|
+ string oIMEI3 = "";
|
|
|
string oMEID = "";
|
|
|
string oNetCode = "";
|
|
|
string oPSN = "";
|
|
|
@@ -341,12 +342,13 @@ namespace UMESDLLService
|
|
|
}
|
|
|
|
|
|
oErrMessage = "";
|
|
|
- string[] param = new string[] { iSN, "", iIMEI1, iNetCode, oIMEI1, oIMEI2, "", oMEID, oNetCode, oPSN, oID1, oID2, oID3, 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 += "IMEI1:" + param[4].ToString() + "^".Replace("null", "");
|
|
|
oInfo += "IMEI2:" + param[5].ToString() + "^".Replace("null", "");
|
|
|
+ oInfo += "IMEI3:" + param[6].ToString() + "^".Replace("null", "");
|
|
|
oInfo += "MEID:" + param[7].ToString() + "^".Replace("null", "");
|
|
|
oInfo += "NETCODE:" + param[8].ToString() + "^".Replace("null", "");
|
|
|
oInfo += "PSN:" + param[9].ToString() + "^".Replace("null", "");
|
|
|
@@ -428,48 +430,49 @@ namespace UMESDLLService
|
|
|
return false;
|
|
|
}
|
|
|
string MacInfo;
|
|
|
- //if (!GetAddressRangeByMO(iSN, out MacInfo, out oErrMessage))
|
|
|
- //{
|
|
|
- // if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
|
|
|
- // return true;
|
|
|
- // else
|
|
|
- // return false;
|
|
|
- //}
|
|
|
- //string MAC = MacInfo.Split('^')[0].Replace("MAC:", "");
|
|
|
- //string BT = MacInfo.Split('^')[1].Replace("BT:", "");
|
|
|
- //string TCode1 = MacInfo.Split('^')[2].Replace("Code1:", "");
|
|
|
- //string TCode2 = MacInfo.Split('^')[3].Replace("Code2:", "");
|
|
|
- //string TCode3 = MacInfo.Split('^')[4].Replace("Code3:", "");
|
|
|
- //if (!SetAddressInfo(iSN, MAC == "null" ? "" : MAC, BT == "null" ? "" : BT, TCode1 == "null" ? "" : TCode1, TCode2 == "null" ? "" : TCode2, TCode3 == "null" ? "" : TCode3, out oErrMessage))
|
|
|
- //{
|
|
|
- // if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
|
|
|
- // return true;
|
|
|
- // else
|
|
|
- // return false;
|
|
|
- //}
|
|
|
- //string ImeiInfo;
|
|
|
- //if (!GetMEIOrNetCodeRange(iSN, "", "", out ImeiInfo, out oErrMessage))
|
|
|
- //{
|
|
|
- // if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
|
|
|
- // return true;
|
|
|
- // else
|
|
|
- // return false;
|
|
|
- //}
|
|
|
- //string IMEI1 = ImeiInfo.Split('^')[0].Replace("IMEI1:", "");
|
|
|
- //string IMEI2 = ImeiInfo.Split('^')[1].Replace("IMEI2:", "");
|
|
|
- //string MEID = ImeiInfo.Split('^')[2].Replace("MEID:", "");
|
|
|
- //string NETCODE = ImeiInfo.Split('^')[3].Replace("NETCODE:", "");
|
|
|
- //string PSN = ImeiInfo.Split('^')[4].Replace("PSN:", "");
|
|
|
- //string ID1 = ImeiInfo.Split('^')[5].Replace("ID1:", "");
|
|
|
- //string ID2 = ImeiInfo.Split('^')[6].Replace("ID2:", "");
|
|
|
- //string ID3 = ImeiInfo.Split('^')[7].Replace("ID3:", "");
|
|
|
- //if (!SetIMEIInfo(iSN, IMEI1 == "null" ? "" : IMEI1, IMEI2 == "null" ? "" : IMEI2, "", MEID == "null" ? "" : MEID, NETCODE == "null" ? "" : NETCODE, ID1 == "null" ? "" : ID1, ID2 == "null" ? "" : ID2, ID3 == "null" ? "" : ID3, out oErrMessage))
|
|
|
- //{
|
|
|
- // if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
|
|
|
- // return true;
|
|
|
- // else
|
|
|
- // return false;
|
|
|
- //}
|
|
|
+ if (!GetAddressRangeByMO(iSN, out MacInfo, out oErrMessage))
|
|
|
+ {
|
|
|
+ if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
|
|
|
+ return true;
|
|
|
+ else
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ string MAC = MacInfo.Split('^')[0].Replace("MAC:", "");
|
|
|
+ string BT = MacInfo.Split('^')[1].Replace("BT:", "");
|
|
|
+ string TCode1 = MacInfo.Split('^')[2].Replace("Code1:", "");
|
|
|
+ string TCode2 = MacInfo.Split('^')[3].Replace("Code2:", "");
|
|
|
+ string TCode3 = MacInfo.Split('^')[4].Replace("Code3:", "");
|
|
|
+ if (!SetAddressInfo(iSN, MAC == "null" ? "" : MAC, BT == "null" ? "" : BT, TCode1 == "null" ? "" : TCode1, TCode2 == "null" ? "" : TCode2, TCode3 == "null" ? "" : TCode3, out oErrMessage))
|
|
|
+ {
|
|
|
+ if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
|
|
|
+ return true;
|
|
|
+ else
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ string ImeiInfo;
|
|
|
+ if (!GetMEIOrNetCodeRange(iSN, "", "", out ImeiInfo, out oErrMessage))
|
|
|
+ {
|
|
|
+ if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
|
|
|
+ return true;
|
|
|
+ else
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ string IMEI1 = ImeiInfo.Split('^')[0].Replace("IMEI1:", "");
|
|
|
+ string IMEI2 = ImeiInfo.Split('^')[1].Replace("IMEI2:", "");
|
|
|
+ string IMEI3 = ImeiInfo.Split('^')[2].Replace("IMEI3:", "");
|
|
|
+ string MEID = ImeiInfo.Split('^')[3].Replace("MEID:", "");
|
|
|
+ string NETCODE = ImeiInfo.Split('^')[4].Replace("NETCODE:", "");
|
|
|
+ string PSN = ImeiInfo.Split('^')[5].Replace("PSN:", "");
|
|
|
+ string ID1 = ImeiInfo.Split('^')[6].Replace("ID1:", "");
|
|
|
+ string ID2 = ImeiInfo.Split('^')[7].Replace("ID2:", "");
|
|
|
+ string ID3 = ImeiInfo.Split('^')[8].Replace("ID3:", "");
|
|
|
+ if (!SetIMEIInfo(iSN, IMEI1 == "null" ? "" : IMEI1, IMEI2 == "null" ? "" : IMEI2, IMEI3 == "null" ? "" : IMEI3, MEID == "null" ? "" : MEID, NETCODE == "null" ? "" : NETCODE, ID1 == "null" ? "" : ID1, ID2 == "null" ? "" : ID2, ID3 == "null" ? "" : ID3, out oErrMessage))
|
|
|
+ {
|
|
|
+ if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
|
|
|
+ return true;
|
|
|
+ else
|
|
|
+ return false;
|
|
|
+ }
|
|
|
//通过序列号获取最近操作的工单号
|
|
|
string ms_id = getFieldDataByCondition("makeserial", "max(ms_id)", "ms_sncode='" + iSN + "' or ms_firstsn='" + iSN + "'").ToString();
|
|
|
if (ms_id != "")
|
|
|
@@ -863,6 +866,11 @@ namespace UMESDLLService
|
|
|
ms_nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
|
|
|
}
|
|
|
string stepcode = GetStepCodeBySource(iResCode);
|
|
|
+ if (ms_nextstepcode != "" && ms_nextstepcode != stepcode)
|
|
|
+ {
|
|
|
+ oErrMessage = "当前序列号" + iSN + "下一工序" + ms_nextstepcode;
|
|
|
+ return false;
|
|
|
+ }
|
|
|
if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null" || (ms_status == "3" && ms_stepcode == stepcode))
|
|
|
{
|
|
|
if (ms_status == "3")
|
|
|
@@ -1291,7 +1299,7 @@ namespace UMESDLLService
|
|
|
oErrorMessage = "";
|
|
|
try
|
|
|
{
|
|
|
- string url = "http://10.98.0.21:8099/mes/mobile/login.action";//html调用的地址
|
|
|
+ string url = "http://218.64.89.153:8099/mes/mobile/login.action";//html调用的地址
|
|
|
HttpWebRequest webrequest = (HttpWebRequest)WebRequest.Create(url);
|
|
|
if (webrequest == null)
|
|
|
{
|