|
|
@@ -533,7 +533,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
|
|
|
@@ -842,17 +842,17 @@ namespace UAS_MES.PublicMethod
|
|
|
/// 保存Mac地址和BT地址
|
|
|
/// </summary>
|
|
|
/// <param name="iSN"></param>
|
|
|
- /// <param name="iWIFI"></param>
|
|
|
+ /// <param name="iMac"></param>
|
|
|
/// <param name="iBT"></param>
|
|
|
/// <param name="iCode1"></param>
|
|
|
/// <param name="iCode2"></param>
|
|
|
/// <param name="iCode3"></param>
|
|
|
/// <param name="oErrorMessage"></param>
|
|
|
/// <returns></returns>
|
|
|
- public static bool SetAddressInfo(string iSN, string iWIFI, string iBT, string iCode1, string iCode2, string iCode3, out string oErrorMessage)
|
|
|
+ public static bool SetAddressInfo(string iSN, string iMac, string iBT, string iCode1, string iCode2, string iCode3, out string oErrorMessage)
|
|
|
{
|
|
|
oErrorMessage = "";
|
|
|
- string[] param = new string[] { iSN, iWIFI, iBT, iCode1, iCode2, iCode3, oErrorMessage };
|
|
|
+ string[] param = new string[] { iSN, iMac, iBT, iCode1, iCode2, iCode3, oErrorMessage };
|
|
|
dh.CallProcedure("CS_SETADDRESSINFO", ref param);
|
|
|
oErrorMessage = param[6];
|
|
|
if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
|
|
|
@@ -952,12 +952,12 @@ namespace UAS_MES.PublicMethod
|
|
|
/// <param name="iID3"></param>
|
|
|
/// <param name="oErrorMessage"></param>
|
|
|
/// <returns></returns>
|
|
|
- public static bool SetIMEIInfo(string iSnCode, string iMakeCode, 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, iMakeCode, iIMEI1, iIMEI2, iIMEI3, iMEID, iNetCode, iPSN, iID1, iID2, iID3, oErrMessage };
|
|
|
+ string[] param = new string[] { iSnCode, iIMEI1, iIMEI2, iIMEI3, iMEID, iNetCode, iPSN, iID1, iID2, iID3, oErrMessage };
|
|
|
dh.CallProcedure("CS_SETIMEIINFO", ref param);
|
|
|
- oErrMessage = param[11];
|
|
|
+ oErrMessage = param[10];
|
|
|
if (oErrMessage == "" || oErrMessage == null)
|
|
|
return true;
|
|
|
else
|