Browse Source

SOP功能提交

callm 2 years ago
parent
commit
6a083cc772

+ 1 - 1
FileWatcher/AutoAnalysisDevice.cs

@@ -123,7 +123,7 @@ namespace FileWatcher
 
 
         private void ConnectDB()
         private void ConnectDB()
         {
         {
-            DataHelper.DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11678)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+            DataHelper.DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.101.253)(PORT=11678)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
             dh = new DataHelper();
             dh = new DataHelper();
         }
         }
 
 

+ 2 - 2
FileWatcher/DataHelper.cs

@@ -9,9 +9,9 @@ namespace FileWatcher
    public class DataHelper
    public class DataHelper
     {
     {
         //系统默认的的连接字符串
         //系统默认的的连接字符串
-        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.1.81.208)(PORT=11665)))(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=192.168.101.253)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
         //用户选择的数据库的连接字符串
         //用户选择的数据库的连接字符串
-        public static string DBConnectionString= "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11665)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        public static string DBConnectionString= "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.101.253)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
         public static OracleConnection connection = null;
         public static OracleConnection connection = null;
         OracleCommand command = null;
         OracleCommand command = null;
         int ReconnectTime = 0;
         int ReconnectTime = 0;

+ 3 - 0
FileWatcher/FileWatcher.csproj

@@ -40,6 +40,9 @@
     <Reference Include="Newtonsoft.Json">
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\TestProject\tool\Newtonsoft.Json.dll</HintPath>
       <HintPath>..\TestProject\tool\Newtonsoft.Json.dll</HintPath>
     </Reference>
     </Reference>
+    <Reference Include="NPOI">
+      <HintPath>..\UAS-MES\Tool\NPOI.dll</HintPath>
+    </Reference>
     <Reference Include="Oracle.ManagedDataAccess, Version=4.121.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
     <Reference Include="Oracle.ManagedDataAccess, Version=4.121.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <SpecificVersion>False</SpecificVersion>
       <HintPath>tool\Oracle.ManagedDataAccess.dll</HintPath>
       <HintPath>tool\Oracle.ManagedDataAccess.dll</HintPath>

+ 12 - 0
FileWatcher/LogicHandler.cs

@@ -39,6 +39,18 @@ namespace FileWatcher
             dh.ExecuteSql(sql.ToString(), "insert", iCaller, iUserCode, iLineCode, iSourceCode, iMakeCode, iOperate, iResult, iSncode, iCheckno);
             dh.ExecuteSql(sql.ToString(), "insert", iCaller, iUserCode, iLineCode, iSourceCode, iMakeCode, iOperate, iResult, iSncode, iCheckno);
         }
         }
 
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public static string GetPiInoutCode(string iCaller, string iType)
+        {
+            string Code = "";
+            string[] param = new string[] { iCaller, iType, Code };
+            dh.CallProcedure("SP_GETMAXNUMBER", ref param);
+            return param[2];
+        }
+
         public static void AutoPassLog(string iSN, string iSource, string iMakeCode, string iDate, string iStepCode, string iLineCode, string iFileName, string iIFNG, string iIFAutoSN, int iMiss, string iTestPart, string iNGPart)
         public static void AutoPassLog(string iSN, string iSource, string iMakeCode, string iDate, string iStepCode, string iLineCode, string iFileName, string iIFNG, string iIFAutoSN, int iMiss, string iTestPart, string iNGPart)
         {
         {
             sql.Clear();
             sql.Clear();

+ 1 - 1
FileWatcher/Login.cs

@@ -18,7 +18,7 @@ namespace FileWatcher
         private void CheckLogin_Click(object sender, EventArgs e)
         private void CheckLogin_Click(object sender, EventArgs e)
         {
         {
             string ErrMessage = "";
             string ErrMessage = "";
-            DataHelper.DBConnectionString = "Password=select!#%*(;User ID=" + Master.Text + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=81.71.42.91)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+            DataHelper.DBConnectionString = "Password=select!#%*(;User ID=" + Master.Text + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.101.253)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
             //重新执行一遍构造函数使得重置之后的链接字符串生效
             //重新执行一遍构造函数使得重置之后的链接字符串生效
             dh = new DataHelper();
             dh = new DataHelper();
             AutoAnalysisXmlByStep.dh = dh;
             AutoAnalysisXmlByStep.dh = dh;

+ 19 - 19
FileWatcher/Program.cs

@@ -26,26 +26,26 @@ namespace FileWatcher
                 Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException);
                 Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException);
                 //处理非UI线程异常
                 //处理非UI线程异常
                 AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
                 AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
-                //if (!Directory.Exists(AutoAnalysisXml.CachePathFolder))
-                //    Directory.CreateDirectory(AutoAnalysisXml.CachePathFolder);
-                //FileStream fcaches = new FileStream(AutoAnalysisXml.CachePath, FileMode.OpenOrCreate, FileAccess.ReadWrite);
-                //fcaches.Close();
-                //FileInfo info = new FileInfo(AutoAnalysisXml.CachePath);
-                //if (info.Length == 0)
-                //{
-                //    XmlDocument doc = new XmlDocument();
-                //    //创建类型声明节点  
-                //    XmlNode node = doc.CreateXmlDeclaration("1.0", "utf-8", "");
-                //    doc.AppendChild(node);
-                //    //创建根节点  
-                //    XmlElement xeRoot = doc.CreateElement("cacheInfo");
-                //    doc.AppendChild(xeRoot);
-                //    doc.Save(AutoAnalysisXml.CachePath);
-                //}
-                //Application.EnableVisualStyles();
-                //Application.SetCompatibleTextRenderingDefault(false);
+                if (!Directory.Exists(AutoAnalysisXml.CachePathFolder))
+                    Directory.CreateDirectory(AutoAnalysisXml.CachePathFolder);
+                FileStream fcaches = new FileStream(AutoAnalysisXml.CachePath, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+                fcaches.Close();
+                FileInfo info = new FileInfo(AutoAnalysisXml.CachePath);
+                if (info.Length == 0)
+                {
+                    XmlDocument doc = new XmlDocument();
+                    //创建类型声明节点  
+                    XmlNode node = doc.CreateXmlDeclaration("1.0", "utf-8", "");
+                    doc.AppendChild(node);
+                    //创建根节点  
+                    XmlElement xeRoot = doc.CreateElement("cacheInfo");
+                    doc.AppendChild(xeRoot);
+                    doc.Save(AutoAnalysisXml.CachePath);
+                }
+                Application.EnableVisualStyles();
+                Application.SetCompatibleTextRenderingDefault(false);
                 if (principal.IsInRole(WindowsBuiltInRole.Administrator))
                 if (principal.IsInRole(WindowsBuiltInRole.Administrator))
-                    Application.Run(new SOP("zhangz","123"));
+                    Application.Run(new Login());
                 else
                 else
                 {
                 {
                     //创建启动对象
                     //创建启动对象