耦合接口修改

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 iIMEI4, string iMEID, string iNETCODE, string iID1, string iID2, string iID3, 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 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=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;
         //用户选择的数据库的连接字符串
@@ -124,9 +124,12 @@ namespace UMESDLLService
                 return false;
             }
             string SNcode = iSN;
-            if (!GetInfoByMaterial(iSN, out iSN, out oErrMessage))
+            if (getFieldDataByCondition("source left join step on SC_STEPCODE=st_code", "nvl(st_getsn,'0')", "sc_code='" + iResCode + "'").ToString() != "0")
             {
-                oErrMessage = "";
+                if (!GetInfoByMaterial(iSN, out iSN, out oErrMessage))
+                {
+                    oErrMessage = "";
+                }
             }
             if (iSN == "")
             {
@@ -277,7 +280,6 @@ namespace UMESDLLService
             oInfo = "";
             string oWIFI = "";
             string oBT = "";
-            string oNetCard = "";
             string oCode1 = "";
             string oCode2 = "";
             string oCdoe3 = "";
@@ -289,15 +291,14 @@ namespace UMESDLLService
             oErrMessage = "";
             string omakeCode = "";
             GetRcardMOInfo(iSN, out omakeCode, out 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);
+            string[] param = new string[] { iSN, omakeCode, oWIFI, oBT, oCode1, oCode2, oCdoe3, oErrMessage };
+            string[] ParamName = new string[] { "v_i_sncode", "v_i_macode", "v_o_mac", "v_o_bt", "v_o_code1", "v_o_code2", "v_o_code3", "v_o_errmsg" };
+            CallProcedure("CS_GETADDRESSBYMAKECODE", ParamName, ref param);
             oInfo += "MAC:" + param[2].ToString() + "^".Replace("null", "");
             oInfo += "BT:" + param[3].ToString() + "^".Replace("null", "");
-            oInfo += "NETCARD:" + param[4].ToString() + "^".Replace("null", "");
-            oInfo += "Code1:" + param[5].ToString() + "^".Replace("null", "");
-            oInfo += "Code2:" + param[6].ToString() + "^".Replace("null", "");
-            oInfo += "Code3:" + param[7].ToString() + "";
+            oInfo += "Code1:" + param[4].ToString() + "^".Replace("null", "");
+            oInfo += "Code2:" + param[5].ToString() + "^".Replace("null", "");
+            oInfo += "Code3:" + param[6].ToString() + "";
             oErrMessage = param[7];
             if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
                 return true;
@@ -329,8 +330,6 @@ namespace UMESDLLService
             oInfo = "";
             string oIMEI1 = "";
             string oIMEI2 = "";
-            string oIMEI3 = "";
-            string oIMEI4 = "";
             string oMEID = "";
             string oNetCode = "";
             string oPSN = "";
@@ -345,20 +344,18 @@ namespace UMESDLLService
             }
 
             oErrMessage = "";
-            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);
+            string[] param = new string[] { iSN, "", iIMEI1, iNetCode, oIMEI1, oIMEI2, "", 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_TEST", 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", "");
+            oInfo += "MEID:" + param[7].ToString() + "^".Replace("null", "");
+            oInfo += "NETCODE:" + param[8].ToString() + "^".Replace("null", "");
+            oInfo += "PSN:" + param[9].ToString() + "^".Replace("null", "");
+            oInfo += "ID1:" + param[10].ToString() + "^".Replace("null", "");
+            oInfo += "ID2:" + param[11].ToString() + "^".Replace("null", "");
+            oInfo += "ID3:" + param[12].ToString() + "".Replace("null", "");
             oErrMessage = param[13];
             if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
                 return true;
@@ -428,12 +425,12 @@ namespace UMESDLLService
             Dictionary<string, string> oInfo = new Dictionary<string, string>();
             oErrMessage = "";
             oJson = "";
-            //if (iSN == "")
-            //{
-            //    oErrMessage = "SN不能为空";
-            //    return false;
-            //}
-            //string MacInfo;
+            if (iSN == "")
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            string MacInfo;
             //if (!GetAddressRangeByMO(iSN, out MacInfo, out oErrMessage))
             //{
             //    if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
@@ -463,14 +460,13 @@ namespace UMESDLLService
             //}
             //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))
+            //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;
@@ -573,7 +569,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 == "")
             {
@@ -581,9 +577,9 @@ namespace UMESDLLService
                 return false;
             }
             oErrMessage = "";
-            string[] param = new string[] { iSN, iMac, iBT, iNetCard, 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);
+            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_code1", "v_i_code2", "v_i_code3", "v_o_errmsg" };
+            CallProcedure("CS_SETADDRESSINFO", ParamName, ref param);
             oErrMessage = param[6];
             if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
                 return true;
@@ -784,7 +780,7 @@ namespace UMESDLLService
         /// <param name="oErrorMessage"></param>
         /// <returns></returns>
         [Description("设置IMEI信息")]
-        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)
+        public bool SetIMEIInfo(string iSN, string iIMEI1, string iIMEI2, string iIMEI3, string iMEID, string iNETCODE, string iID1, string iID2, string iID3, out string oErrMessage)
         {
             if (iSN == "")
             {
@@ -792,9 +788,9 @@ namespace UMESDLLService
                 return false;
             }
             oErrMessage = "";
-            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);
+            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);
             oErrMessage = param[10];
             if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
                 return true;
@@ -870,11 +866,6 @@ 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")
@@ -1303,7 +1294,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)
                 {