|
|
@@ -205,7 +205,7 @@ namespace UAS_MES.PublicMethod
|
|
|
string[] param = new string[] { iSnCode, iMakeCode, iSourceCode, oErrMessage };
|
|
|
dh.CallProcedure("CS_CHECKSTEPSNANDMACODE", ref param);
|
|
|
oErrMessage = param[3];
|
|
|
- if (oErrMessage == "" || oErrMessage == null)
|
|
|
+ if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
|
|
|
return true;
|
|
|
else
|
|
|
return false;
|
|
|
@@ -440,26 +440,26 @@ namespace UAS_MES.PublicMethod
|
|
|
/// <param name="iMakeCode"></param>
|
|
|
/// <param name="oMac"></param>
|
|
|
/// <param name="oBT"></param>
|
|
|
- /// <param name="oID1"></param>
|
|
|
- /// <param name="oID2"></param>
|
|
|
- /// <param name="oID3"></param>
|
|
|
+ /// <param name="oCode1"></param>
|
|
|
+ /// <param name="oCode2"></param>
|
|
|
+ /// <param name="oCdoe3"></param>
|
|
|
/// <param name="oErrorMessage"></param>
|
|
|
/// <returns></returns>
|
|
|
- public static bool GetAddressRangeByMakeCode(string iSnCode, string iMakeCode, out string oMac, out string oBT, out string oID1, out string oID2, out string oID3, out string oErrorMessage)
|
|
|
+ public static bool GetAddressRangeByMakeCode(string iSnCode, string iMakeCode, out string oMac, out string oBT, out string oCode1, out string oCode2, out string oCdoe3, out string oErrorMessage)
|
|
|
{
|
|
|
oMac = "";
|
|
|
oBT = "";
|
|
|
- oID1 = "";
|
|
|
- oID2 = "";
|
|
|
- oID3 = "";
|
|
|
+ oCode1 = "";
|
|
|
+ oCode2 = "";
|
|
|
+ oCdoe3 = "";
|
|
|
oErrorMessage = "";
|
|
|
- string[] param = new string[] { iSnCode, iMakeCode, oMac, oBT, oID1, oID2, oID3, oErrorMessage };
|
|
|
+ string[] param = new string[] { iSnCode, iMakeCode, oMac, oBT, oCode1, oCode2, oCdoe3, oErrorMessage };
|
|
|
dh.CallProcedure("CS_GETADDRESSBYMAKECODE", ref param);
|
|
|
oMac = param[2];
|
|
|
oBT = param[3];
|
|
|
- oID1 = param[4];
|
|
|
- oID2 = param[5];
|
|
|
- oID3 = param[6];
|
|
|
+ oCode1 = param[4];
|
|
|
+ oCode2 = param[5];
|
|
|
+ oCdoe3 = param[6];
|
|
|
oErrorMessage = param[7];
|
|
|
if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
|
|
|
return true;
|
|
|
@@ -488,7 +488,7 @@ namespace UAS_MES.PublicMethod
|
|
|
/// <param name="oID3"></param>
|
|
|
/// <param name="oErrorMessage"></param>
|
|
|
/// <returns></returns>
|
|
|
- public static bool GetIMEIOrNetCodeRange(string iSnCode, string iMakeCode, string iIMEI1, string iNetCode, out string oIMEI1, out string oIMEI2, out string oIMEI3, out string oMEID, out string oNetCode, out string oPSN, out string oBT, out string oID1, out string oID2, out string oID3, out string oErrorMessage)
|
|
|
+ public static bool GetIMEIOrNetCodeRange(string iSnCode, string iMakeCode, string iIMEI1, string iNetCode, out string oIMEI1, out string oIMEI2, out string oIMEI3, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3, out string oErrorMessage)
|
|
|
{
|
|
|
oIMEI1 = "";
|
|
|
oIMEI2 = "";
|
|
|
@@ -496,12 +496,11 @@ namespace UAS_MES.PublicMethod
|
|
|
oMEID = "";
|
|
|
oNetCode = "";
|
|
|
oPSN = "";
|
|
|
- oBT = "";
|
|
|
oID1 = "";
|
|
|
oID2 = "";
|
|
|
oID3 = "";
|
|
|
oErrorMessage = "";
|
|
|
- string[] param = new string[] { iSnCode, iMakeCode, iIMEI1, iNetCode, oIMEI1, oIMEI2, oIMEI3, oMEID, oNetCode, oPSN, oBT, oID1, oID2, oID3, oErrorMessage };
|
|
|
+ string[] param = new string[] { iSnCode, iMakeCode, iIMEI1, iNetCode, oIMEI1, oIMEI2, oIMEI3, oMEID, oNetCode, oPSN, oID1, oID2, oID3, oErrorMessage };
|
|
|
dh.CallProcedure("CS_GETIMEIORNETCODERANGE", ref param);
|
|
|
oIMEI1 = param[4];
|
|
|
oIMEI2 = param[5];
|
|
|
@@ -509,11 +508,10 @@ namespace UAS_MES.PublicMethod
|
|
|
oMEID = param[7];
|
|
|
oNetCode = param[8];
|
|
|
oPSN = param[9];
|
|
|
- oBT = param[10];
|
|
|
- oID1 = param[11];
|
|
|
- oID2 = param[12];
|
|
|
- oID3 = param[13];
|
|
|
- oErrorMessage = param[14];
|
|
|
+ oID1 = param[10];
|
|
|
+ oID2 = param[11];
|
|
|
+ oID3 = param[12];
|
|
|
+ oErrorMessage = param[13];
|
|
|
if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
|
|
|
return true;
|
|
|
else
|
|
|
@@ -533,7 +531,7 @@ namespace UAS_MES.PublicMethod
|
|
|
oMakeCode = "";
|
|
|
oErrorMessage = "";
|
|
|
string ms_id = dh.getFieldDataByCondition("MakeSerial", "max(ms_id) ms_id", "ms_sncode='" + iSnCode + "' or ms_firstsn in (select firstsn from makesnrelation where sn='" + iSnCode + "')").ToString();
|
|
|
- oMakeCode = dh.getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id='" + ms_id+"'").ToString();
|
|
|
+ oMakeCode = dh.getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id='" + ms_id + "'").ToString();
|
|
|
if (oMakeCode != "")
|
|
|
return true;
|
|
|
else
|
|
|
@@ -646,9 +644,10 @@ namespace UAS_MES.PublicMethod
|
|
|
oID3 = "";
|
|
|
//通过序列号获取最近操作的工单号
|
|
|
string MakeCode;
|
|
|
- if (GetMakeInfo(iSnCode, out MakeCode, out oErrorMessage))
|
|
|
+ string ms_id = dh.getFieldDataByCondition("makeserial", "ms_id", "ms_sncode='" + iSnCode + "'").ToString();
|
|
|
+ if (ms_id != "")
|
|
|
{
|
|
|
- DataTable dt = dh.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_sncode='" + iSnCode + "'' and ms_makecode='" + MakeCode + "' ");
|
|
|
+ DataTable dt = dh.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 + "'");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
oMac = dt.Rows[0]["ms_mac"].ToString();
|
|
|
@@ -665,6 +664,7 @@ namespace UAS_MES.PublicMethod
|
|
|
oID1 = dt.Rows[0]["ms_othid3"].ToString();
|
|
|
oID2 = dt.Rows[0]["ms_othid3"].ToString();
|
|
|
oID3 = dt.Rows[0]["ms_othid3"].ToString();
|
|
|
+ oErrorMessage = "";
|
|
|
return true;
|
|
|
}
|
|
|
else
|
|
|
@@ -674,7 +674,10 @@ namespace UAS_MES.PublicMethod
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
+ {
|
|
|
+ oErrorMessage = "序列号" + iSnCode + "不存在";
|
|
|
return false;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -898,7 +901,7 @@ namespace UAS_MES.PublicMethod
|
|
|
oErrorMessage = "";
|
|
|
string[] param = new string[] { iMakeCode, iSourceCode, iSN, iUserCode, oErrorMessage };
|
|
|
dh.CallProcedure("CS_SETSTEPFINISH", ref param);
|
|
|
- if (oErrorMessage == "" || oErrorMessage == null)
|
|
|
+ if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
|
|
|
return true;
|
|
|
else
|
|
|
return false;
|
|
|
@@ -952,13 +955,13 @@ namespace UAS_MES.PublicMethod
|
|
|
/// <param name="iID3"></param>
|
|
|
/// <param name="oErrorMessage"></param>
|
|
|
/// <returns></returns>
|
|
|
- public static bool SetIMEIInfo(string iSnCode,string iIMEI1, string iIMEI2, string iIMEI3, string iMEID, string iNetCode, string iPSN, string iID1, string iID2, string iID3, out string oErrMessage)
|
|
|
+ public static bool SetIMEIInfo(string iSnCode, string iIMEI1, string iIMEI2, string iIMEI3, string iMEID, string iNetCode, string iPSN, string iID1, string iID2, string iID3, out string oErrMessage)
|
|
|
{
|
|
|
oErrMessage = "";
|
|
|
string[] param = new string[] { iSnCode, iIMEI1, iIMEI2, iIMEI3, iMEID, iNetCode, iPSN, iID1, iID2, iID3, oErrMessage };
|
|
|
dh.CallProcedure("CS_SETIMEIINFO", ref param);
|
|
|
oErrMessage = param[10];
|
|
|
- if (oErrMessage == "" || oErrMessage == null)
|
|
|
+ if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
|
|
|
return true;
|
|
|
else
|
|
|
return false;
|
章政