Amkor/ATV_STDLabelAttach
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

offline 모드에서 ip/mac 조회하도록 함. ip가 없으면 reel generate 가 동작하지 않음

Browse Source
This commit is contained in:
ChiKyun Kim
2025-09-28 14:43:00 +09:00
parent 16da4a5ffa
commit 1ebbb83866
5 changed files with 69 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Handler/Project/Properties/Settings.Designer.cs generated
View File

@@ -12,7 +12,7 @@ namespace Project.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

6
Handler/Project/Properties/Settings.settings
View File

@@ -16,7 +16,7 @@
</Setting>
<Setting Name="CS" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=10.201.11.21,50150;Initial Catalog=WMS;Persist Security Info=True;User ID=wmsadm;Password=78#4AmWnh1!!;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
@@ -24,7 +24,7 @@
</Setting>
<Setting Name="WMS_DEV" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=10.201.11.21,50150;Initial Catalog=WMS;Persist Security Info=True;User ID=wmsadm;Password=78#4AmWnh1!!;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
@@ -32,7 +32,7 @@
</Setting>
<Setting Name="WMS_PRD" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=V1SPCSQL,51122;Initial Catalog=WMS;Persist Security Info=True;User ID=wmsadm;Password="2!x2$yY8R;}$";Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>

68
Handler/Project/Pub.cs
View File

@@ -1,6 +1,7 @@
using AR;
using Emgu.CV.BgSegm;
using System;
using System.CodeDom;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
@@ -1097,7 +1098,7 @@ namespace Project
public static void initCore()
{
system_mot = new System_MotParameter(UTIL.MakePath("Data","System_mot.xml"));
system_mot = new System_MotParameter(UTIL.MakePath("Data", "System_mot.xml"));
system_mot.Load();
//setting
@@ -1239,27 +1240,17 @@ namespace Project
public static string IP { get; set; }
public static string MAC { get; set; }
public static string HOSTNAME { get; set; }
/// <summary>
/// 프로그램 사용기록 추가
/// </summary>
/// <param name="prgmName"></param>
/// <param name="develop"></param>
/// <param name="prgmVersion"></param>
public static void CheckNRegister3(string prgmName, string develop, string prgmVersion)
{
if (prgmName.Length > 50) prgmName = prgmName.Substring(0, 50); //길이제한
var task = Task.Factory.StartNew(() =>
{
try
public static void GetIPMac()
{
string ip = "";
string mac = "";
// string prgmName = Application.ProductName;
try
{
var nif = NetworkInterface.GetAllNetworkInterfaces();
var host = Dns.GetHostEntry(Dns.GetHostName());
string fullname = System.Net.Dns.GetHostEntry("").HostName;
HOSTNAME = System.Net.Dns.GetHostEntry("").HostName;
foreach (IPAddress r in host.AddressList)
{
string str = r.ToString();
@@ -1284,13 +1275,42 @@ namespace Project
}
}
if (ip == "" || mac == "")
}
catch (Exception ex)
{
ip = "";
mac = "";
}
IP = ip;
MAC = mac;
}
/// <summary>
/// 프로그램 사용기록 추가
/// </summary>
/// <param name="prgmName"></param>
/// <param name="develop"></param>
/// <param name="prgmVersion"></param>
public static void CheckNRegister3(string prgmName, string develop, string prgmVersion)
{
if (prgmName.Length > 50) prgmName = prgmName.Substring(0, 50); //길이제한
var task = Task.Factory.StartNew(() =>
{
GetIPMac();
try
{
if (IP == "" || MAC == "")
{
return;
}
SqlConnection conn = new SqlConnection("Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!");
SqlConnection conn = new SqlConnection("Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&DJ+ug-D");
conn.Open();
string ProcName = "AddPrgmUser3";
SqlCommand cmd = new SqlCommand(ProcName, conn)
@@ -1299,10 +1319,10 @@ namespace Project
};
SqlParameter param = cmd.Parameters.Add("@mac", SqlDbType.NVarChar, 50);
param.Value = mac;
param.Value = MAC;
param = cmd.Parameters.Add("@ip", SqlDbType.NVarChar, 50);
param.Value = ip;
param.Value = IP;
param = cmd.Parameters.Add("@pgrm", SqlDbType.NVarChar, 50);
param.Value = prgmName;
@@ -1320,13 +1340,12 @@ namespace Project
param.Value = System.Environment.UserName;
param = cmd.Parameters.Add("@hostname", SqlDbType.NVarChar, 100);
param.Value = fullname;
param.Value = HOSTNAME;
cmd.ExecuteNonQuery();
conn.Close();
IP = ip;
MAC = mac;
}
catch (Exception ex)
{
@@ -1644,11 +1663,12 @@ namespace Project
string NewID = string.Empty;
string Message = string.Empty;
var ip = PUB.IP ?? "127.0.0.1";
var retval = ta.X_SP_GET_UNIT_ID_LABEL(SETTING.Data.WMS_PROGRAM_ID,
SETTING.Data.WMS_CENTER_CD, sid,
SETTING.Data.WMS_REG_USERID,
PUB.IP,
ip,
ref NewID,
ref Message);

2
Handler/Project/RunCode/Step/_STEP_INIT.cs
View File

@@ -95,7 +95,7 @@ namespace Project
//
if (SETTING.User.LastModelV != "") PUB.SelectModelV(SETTING.User.LastModelV, false);
var motionmodel = SETTING.User.LastModelM;
if (motionmodel.isEmpty()) motionmodel = PUB.Result.vModel.Motion;
if (motionmodel.isEmpty()) motionmodel = PUB.Result.vModel.Motion ?? string.Empty;
if (motionmodel.ToUpper().StartsWith("CONV")) PUB.flag.set(eVarBool.Use_Conveyor, true, "load");
else PUB.flag.set(eVarBool.Use_Conveyor, false, "load");
PUB.SelectModelM(motionmodel, false);

1
Handler/Project/fMain.cs
View File

@@ -451,6 +451,7 @@ namespace Project
PUB.log.Add("Program Start");
if (SETTING.Data.OnlineMode)
PUB.CheckNRegister3(Application.ProductName, "chi", Application.ProductVersion);
else PUB.GetIPMac();
if (SETTING.Data.EnableDebugMode)
{