万利达接口修改，输出上料内容Json序列号

UAS_MesInterface(4.0)/MesHelper.cs

@@ -5,6 +5,7 @@ using System.ComponentModel;
 using System.Data;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Web.Script.Serialization;
 
 namespace BenQGuru.eMES.DLLService
 {
@@ -23,7 +24,7 @@ namespace BenQGuru.eMES.DLLService
         bool SetMaster(string Master);
         bool SetTestDetail(string iSN, string iTestResult, string iResCode, string[] iTestDetail, out string oErrMessage);
         bool GetMEIOrNetCodeRange(string iSnCode, 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 oID4, out string oID5, out string oErrMessage);
-        bool SetIMEIInfo(string iSnCode, string iIMEI1, out string oErrMessage);
+        bool SetIMEIInfo(string iSN, string iIMEI1, string iIMEI2, string iIMEI3, string iMEID, string iNET, string iID1, string iID2, string iID3, out string oErrMessage);
         bool GetMobileAllInfo(string iSnCode, out string oWIFI, out string oBT, out string oCode1, out string oCode2, out string oCode3, 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 oID4, out string oID5, 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);
@@ -748,7 +749,7 @@ namespace BenQGuru.eMES.DLLService
         /// <param name="oErrorMessage"></param>
         /// <returns></returns>
         [Description("设置IMEI信息")]
-        public bool SetIMEIInfo(string iSN, string iIMEI1, out string oErrMessage)
+        public bool SetIMEIInfo(string iSN, string iIMEI1, string iIMEI2, string iIMEI3, string iMEID, string iNET, string iID1, string iID2, string iID3, out string oErrMessage)
         {
             if (iSN == "")
             {
@@ -756,7 +757,7 @@ namespace BenQGuru.eMES.DLLService
                 return false;
             }
             oErrMessage = "";
-            string[] param = new string[] { iSN, iIMEI1, "", "", "", "", "", "", "", "", oErrMessage };
+            string[] param = new string[] { iSN, iIMEI1, iIMEI2, iIMEI3, iMEID, iNET, "", 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);
             oErrMessage = param[10];
@@ -810,7 +811,7 @@ namespace BenQGuru.eMES.DLLService
                 oErrMessage = "SN不能为空";
                 return false;
             }
-            if (CheckExist("makeserial", "ms_sncode='" + iSN + "' and ms_makecode='"+iMO+"'"))
+            if (CheckExist("makeserial", "ms_sncode='" + iSN + "' and ms_makecode='" + iMO + "'"))
             {
                 oErrMessage = "SN" + iSN + "已存在于工单" + iMO;
                 return false;
@@ -1247,6 +1248,8 @@ namespace BenQGuru.eMES.DLLService
         [Description("获取上料信息")]
         public bool GetMaterialInfo(string iSN, out string oResult, out string oErrMessage)
         {
+            JavaScriptSerializer jss = new JavaScriptSerializer();
+            Dictionary<string, string> oInfo = new Dictionary<string, string>();
             oErrMessage = "";
             oResult = "";
             if (iSN == "")
@@ -1285,13 +1288,10 @@ namespace BenQGuru.eMES.DLLService
                         //获取出来的参数使用^分割
                         if (param[i] != "" && param[i] != "null" && param[i] != null)
                         {
-                            oResult += param[i].Split('^')[0] + "^" + param[i].Split('^')[1] + "#";
+                            oInfo.Add(param[i].Split('^')[0], param[i].Split('^')[1]);
                         }
                     }
-                    if (oResult.IndexOf("#") > 0)
-                    {
-                        oResult = oResult.Substring(0, oResult.Length - 1);
-                    }
+                    oResult = jss.Serialize(oInfo);
                     oErrMessage = "";
                     return true;
                 }

UAS_MesInterface(4.0)/UAS_MesInterface(4.0).csproj

@@ -38,6 +38,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.OracleClient" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />