接口程序修改

UAS_CustomerInterface/MesHelper.cs

@@ -1,6 +1,7 @@
 using Oracle.ManagedDataAccess.Client;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Data;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -12,7 +13,7 @@ namespace UAS.MES
     [InterfaceType(ComInterfaceType.InterfaceIsDual)]
     public interface IMESHelper
     {
-        [DispId(12)]
+        [DispId(14)]
         bool CheckRoutePassed(string iSN, string iResCode, out string oErrMessage);
         bool GetRcardMOInfo(string iSN, out string oMoCode, out string oErrMessage);
         bool CheckUserAndResourcePassed(string iUserCode, string iResCode, string iPassWord, out string oErrMessage);
@@ -20,12 +21,13 @@ namespace UAS.MES
         bool SetAddressInfo(string iSN, string iWIFI, 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 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 iSnCode, string iIMEI1, string iIMEI2, string iIMEI3, out string oErrMessage);
+        bool SetKeyInfo(string iSN, string iKey1, string iKey2, string iKey3, 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);
         bool GoMo(string iMO, string iSN, string iResCode, out string oErrMessage);
-        bool GetSNAllInfo(string iSN, out string oMakeCode, out string oSaleCode, out string oProdType, out string oSoftVersion1, out string oSoftVersion2, out string oSoftVersion3, out string oMaterialCode1, out string oMaterialCode2, out string oMaterialCode3, out string oMAC, out string oBT, 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 oErrMessage);
+        bool GetSNAllInfo(string iSN, out string oMakeCode, out string oSaleCode, out string oProdType, out string oSoftVersion1, out string oSoftVersion2, out string oSoftVersion3, out string oMaterialCode1, out string oMaterialCode2, out string oMaterialCode3, out string oMaterialCode4, out string oMaterialCode5, out string oMAC, out string oBT, 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 oItem1, out string oItem2, out string oItem3, out string oItem4, out string oErrMessage);
     }
 
     [Guid("707D771D-AA71-4BC1-B2DA-05CBBA868362")]
@@ -39,7 +41,7 @@ namespace UAS.MES
         //用于存放批量执行的SQL
         List<string> sqls = new List<string>();
         //系统默认的的连接字符串
-        private string ConnectionStrings = "Data Source=192.168.230.200/orcl;User ID=MES;PassWord=select!#%*(;";
+        private string ConnectionStrings = "Data Source=192.168.230.200/orcl;User ID=MES_TEST;PassWord=select!#%*(;";
         //用户选择的数据库的连接字符串
         private OracleConnection connection;
         //用户选择的数据库的连接字符串
@@ -57,6 +59,7 @@ namespace UAS.MES
         /// <param name="iResCode"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("验证登陆信息")]
         public bool CheckRoutePassed(string iSN, string iResCode, out string oErrMessage)
         {
             if (iSN == "")
@@ -103,6 +106,7 @@ namespace UAS.MES
         /// <param name="iResCode"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("验证用户身份信息和岗位资源")]
         public bool CheckUserAndResourcePassed(string iUserCode, string iResCode, string iPassWord, out string oErrMessage)
         {
             oErrMessage = "";
@@ -172,6 +176,7 @@ namespace UAS.MES
         /// <param name="oCdoe3"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("分配Mac地址和BT地址")]
         public bool GetAddressRangeByMO(string iSN, out string oWIFI, out string oBT, out string oCode1, out string oCode2, out string oCdoe3, out string oErrMessage)
         {
             oWIFI = "";
@@ -220,6 +225,7 @@ namespace UAS.MES
         /// <param name="oID3"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("获取IMEI，网标信息")]
         public bool GetMEIOrNetCodeRange(string iSN, 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)
         {
             oIMEI1 = "";
@@ -263,6 +269,7 @@ namespace UAS.MES
         /// <param name="oMoCode"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("获取工单信息")]
         public bool GetRcardMOInfo(string iSN, out string oMoCode, out string oErrMessage)
         {
             //取MakeProcess表中的执行记录ID最大的一个工单的号码
@@ -306,6 +313,7 @@ namespace UAS.MES
         /// <param name="oID5"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("获取序列号关联信息")]
         public bool GetMobileAllInfo(string iSN, 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 oErrMessage)
         {
             oBT = "";
@@ -399,6 +407,7 @@ namespace UAS.MES
         /// <param name="iCode3"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("保存Mac地址和BT地址")]
         public bool SetAddressInfo(string iSN, string iWIFI, string iBT, string iCode1, string iCode2, string iCode3, out string oErrMessage)
         {
             if (iSN == "")
@@ -417,6 +426,7 @@ namespace UAS.MES
                 return false;
         }
 
+        [Description("执行过站")]
         public bool SetStepFinish(string iMakeCode, string iSourceCode, string iSN, string iMPKind, string iResult, string iUserCode, string iErrCode, out string oErrMessage)
         {
             if (iSN == "")
@@ -452,8 +462,10 @@ namespace UAS.MES
                             InsertSQL.Add(sql.ToString().Replace(":bc_code", "'" + BadCode[i] + "'"));
                         }
                         ExecuteSQLTran(InsertSQL.ToArray());
+                        oErrMessage = "测试NG，请重新测试或者判定为不良";
+                        return false;
                         //将不良的序列号的状态码设为3
-                        ExecuteSql("update makeserial set ms_status='3' where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'", "update");
+                        //ExecuteSql("update makeserial set ms_status='3' where ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'", "update");
                     }
                     break;
                 default:
@@ -491,6 +503,7 @@ namespace UAS.MES
         /// <param name="iUserCode"></param>
         /// <param name="oErrorMessage"></param>
         /// <returns></returns>
+        [Description("转号过站")]
         public bool SetMobileData(string iTSN, string iSN, string iSourceCode, string iOperater, string iResult, string iErrCode, string flag, out string oErrorMessage)
         {
             oErrorMessage = "";
@@ -541,6 +554,7 @@ namespace UAS.MES
         /// <param name="iTestResult"></param>
         /// <param name="oErrMessage"></param>                                                      
         /// <returns></returns>
+        [Description("上传测试结果")]
         public bool SetTestDetail(string iSN, string iTestResult, string iResCode, string[] iTestDetail, out string oErrMessage)
         {
             if (iSN == "" || iSN == null)
@@ -581,7 +595,8 @@ namespace UAS.MES
         /// <param name="iID3"></param>
         /// <param name="oErrorMessage"></param>
         /// <returns></returns>
-        public bool SetIMEIInfo(string iSN, string iIMEI1, out string oErrMessage)
+        [Description("保存IMEI信息")]
+        public bool SetIMEIInfo(string iSN, string iIMEI1, string iIMEI2, string iIMEI3, out string oErrMessage)
         {
             if (iSN == "")
             {
@@ -589,9 +604,28 @@ namespace UAS.MES
                 return false;
             }
             oErrMessage = "";
-            string[] param = new string[] { iSN, iIMEI1, "", "", "", "", "", "", "", "", oErrMessage };
+            string[] param = new string[] { iSN, iIMEI1, iIMEI2, iIMEI3, "", "", "", "", "", "", 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_SETKEYINFO", ParamName, ref param);
+            oErrMessage = param[10];
+            if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
+                return true;
+            else
+                return false;
+        }
+
+        [Description("保存Key信息")]
+        public bool SetKeyInfo(string iSnCode, string iKey1, string iKey2, string iKey3, out string oErrMessage)
+        {
+            if (iSnCode == "")
+            {
+                oErrMessage = "SN不能为空";
+                return false;
+            }
+            oErrMessage = "";
+            string[] param = new string[] { iSnCode, "", "", "", "", "", "", iKey1, iKey2, iKey3, 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);
+            CallProcedure("CS_SETKEYINFO", ParamName, ref param);
             oErrMessage = param[10];
             if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
                 return true;
@@ -609,6 +643,7 @@ namespace UAS.MES
         /// <param name="iErrCode"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
+        [Description("调用过站方法")]
         public bool SetPcbaData(string iSN, string iResCode, string iOperator, string iResult, string iErrCode, out string oErrMessage)
         {
             if (iSN == "")
@@ -629,6 +664,7 @@ namespace UAS.MES
                 return false;
         }
 
+        [Description("序列号归属工单")]
         public bool GoMo(string iMO, string iSN, string iResCode, out string oErrMessage)
         {
             if (iSN == "")
@@ -1043,7 +1079,7 @@ namespace UAS.MES
             }
         }
         /// <summary>
-        /// 获取序列号所有的信息
+        /// 获取序列号全部信息
         /// </summary>
         /// <param name="iSN"></param>
         /// <param name="oMakeCode"></param>
@@ -1066,9 +1102,14 @@ namespace UAS.MES
         /// <param name="oID1"></param>
         /// <param name="oID2"></param>
         /// <param name="oID3"></param>
+        /// <param name="oItem1"></param>
+        /// <param name="oItem2"></param>
+        /// <param name="oItem3"></param>
+        /// <param name="oItem4"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
-        public bool GetSNAllInfo(string iSN, out string oMakeCode, out string oSaleCode, out string oProdType, out string oSoftVersion1, out string oSoftVersion2, out string oSoftVersion3, out string oMaterialCode1, out string oMaterialCode2, out string oMaterialCode3, out string oMAC, out string oBT, 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 oErrMessage)
+        [Description("获取SN信息")]
+        public bool GetSNAllInfo(string iSN, out string oMakeCode, out string oSaleCode, out string oProdType, out string oSoftVersion1, out string oSoftVersion2, out string oSoftVersion3, out string oMaterialCode1, out string oMaterialCode2, out string oMaterialCode3, out string oMaterialCode4, out string oMaterialCode5, out string oMAC, out string oBT, 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 oItem1, out string oItem2, out string oItem3, out string oItem4, out string oErrMessage)
         {
             oMakeCode = "";
             oSaleCode = "";
@@ -1079,6 +1120,8 @@ namespace UAS.MES
             oMaterialCode1 = "";
             oMaterialCode2 = "";
             oMaterialCode3 = "";
+            oMaterialCode4 = "";
+            oMaterialCode5 = "";
             oMAC = "";
             oBT = "";
             oIMEI1 = "";
@@ -1090,6 +1133,10 @@ namespace UAS.MES
             oID1 = "";
             oID2 = "";
             oID3 = "";
+            oItem1 = "";
+            oItem2 = "";
+            oItem3 = "";
+            oItem4 = "";
             oErrMessage = "";
             if (iSN == "")
             {
@@ -1097,8 +1144,8 @@ namespace UAS.MES
                 return false;
             }
             oErrMessage = "";
-            string[] param = new string[] { iSN, oMakeCode,oSaleCode,oProdType,oSoftVersion1,oSoftVersion2,oSoftVersion3,oMaterialCode1,oMaterialCode2,oMaterialCode3, oMAC, oBT, oIMEI1,oIMEI2,oIMEI3,oMEID,oNetCode,oPSN,oID1,oID2,oID3, oErrMessage };
-            string[] ParamName = new string[] { "v_i_sncode", "v_o_makecode", "v_o_salecode", "v_o_prodtype", "v_o_softverision1", "v_o_softverision2", "v_o_softverision3", "v_o_materialcode1", "v_o_materialcode2", "v_o_materialcode3", "v_o_mac", "v_o_bt", "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" };
+            string[] param = new string[] { iSN, oMakeCode, oSaleCode, oProdType, oSoftVersion1, oSoftVersion2, oSoftVersion3, oMaterialCode1, oMaterialCode2, oMaterialCode3, oMAC, oBT, oIMEI1, oIMEI2, oIMEI3, oMEID, oNetCode, oPSN, oID1, oID2, oID3, oItem1, oItem2, oItem3, oItem4, oErrMessage, oMaterialCode4, oMaterialCode5 };
+            string[] ParamName = new string[] { "v_i_sncode", "v_o_makecode", "v_o_salecode", "v_o_prodtype", "v_o_softverision1", "v_o_softverision2", "v_o_softverision3", "v_o_materialcode1", "v_o_materialcode2", "v_o_materialcode3", "v_o_mac", "v_o_bt", "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_item1", "v_o_item2", "v_o_item3", "v_o_item4", "v_o_errmsg", "v_o_materialcode4", "v_o_materialcode5" };
             CallProcedure("CS_DLLGETSNINFO", ParamName, ref param);
             oMakeCode = param[1];
             oSaleCode = param[2];
@@ -1120,7 +1167,13 @@ namespace UAS.MES
             oID1 = param[18];
             oID2 = param[19];
             oID3 = param[20];
-            oErrMessage = param[21];
+            oItem1 = param[21];
+            oItem2 = param[22];
+            oItem3 = param[23];
+            oItem4 = param[24];
+            oErrMessage = param[25];
+            oMaterialCode4 = param[26];
+            oMaterialCode5 = param[27];
             if (oErrMessage == "" || oErrMessage == null || oErrMessage == "null")
                 return true;
             else