diff --git a/HMI/Project/AGV4.csproj b/HMI/Project/AGV4.csproj
index 7424e1a..f613f26 100644
--- a/HMI/Project/AGV4.csproj
+++ b/HMI/Project/AGV4.csproj
@@ -41,7 +41,7 @@
true
Full
False
- ..\..\..\..\..\Amkor\AGV4\
+ ..\..\..\..\..\amkor\AGV4\
TRACE;DEBUG;NOSPEECH
prompt
4
diff --git a/HMI/Project/PUB.cs b/HMI/Project/PUB.cs
index 119f475..7ad6537 100644
--- a/HMI/Project/PUB.cs
+++ b/HMI/Project/PUB.cs
@@ -436,8 +436,9 @@ namespace Project
///
///
///
- public static void CheckNRegister3(string prgmName, string develop, string prgmVersion)
+ public static void CheckNRegister5(string prgmName, string develop, string prgmVersion,string mcid, string remark)
{
+ if (System.Diagnostics.Debugger.IsAttached) mcid += $"*";
if (prgmName.Length > 50) prgmName = prgmName.Substring(0, 50); //길이제한
var task = Task.Factory.StartNew(() =>
{
@@ -478,7 +479,7 @@ namespace Project
var conn = new SqlConnection(AGV4.Properties.Settings.Default.CS);// "Data Source=10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!");
conn.Open();
- string ProcName = "AddPrgmUser3";
+ string ProcName = "AddPrgmUser5";
var cmd = new SqlCommand(ProcName, conn)
{
CommandType = CommandType.StoredProcedure
@@ -508,7 +509,13 @@ namespace Project
param = cmd.Parameters.Add("@hostname", SqlDbType.NVarChar, 100);
param.Value = fullname;
- cmd.ExecuteNonQuery();
+ param = cmd.Parameters.Add("@mcid", SqlDbType.VarChar, 10);
+ param.Value = mcid;
+
+ param = cmd.Parameters.Add("@remark", SqlDbType.VarChar, 255);
+ param.Value = remark;
+
+ var cnt = cmd.ExecuteNonQuery();
conn.Close();
IP = ip;
diff --git a/HMI/Project/Properties/AssemblyInfo.cs b/HMI/Project/Properties/AssemblyInfo.cs
index 1ad68da..d1cea37 100644
--- a/HMI/Project/Properties/AssemblyInfo.cs
+++ b/HMI/Project/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("26.02.09.0840")]
-[assembly: AssemblyFileVersion("26.02.09.0840")]
+[assembly: AssemblyVersion("26.02.25.1600")]
+[assembly: AssemblyFileVersion("26.02.25.1600")]
diff --git a/HMI/Project/StateMachine/_TMDisplay.cs b/HMI/Project/StateMachine/_TMDisplay.cs
index 8abae22..0291afb 100644
--- a/HMI/Project/StateMachine/_TMDisplay.cs
+++ b/HMI/Project/StateMachine/_TMDisplay.cs
@@ -3,6 +3,7 @@ using COMM;
using System;
using System.Drawing;
using Project.StateMachine;
+using System.Windows.Forms;
namespace Project
{
@@ -311,6 +312,9 @@ namespace Project
{
//남은디스크확인
CheckFreeSpace();
+
+ //사용기록 업데이트
+ PUB.CheckNRegister5(Application.ProductName, "chi", Application.ProductVersion, PUB.setting.MCID, PUB.setting.AGV_ADDRESS);
tm5minute = DateTime.Now;
}
#endregion
diff --git a/HMI/Project/fMain.cs b/HMI/Project/fMain.cs
index a74d24a..71dbaa1 100644
--- a/HMI/Project/fMain.cs
+++ b/HMI/Project/fMain.cs
@@ -254,7 +254,7 @@ namespace Project
Update_Count();
PUB.log.Add("프로그램 실행 기록 추가");
- PUB.CheckNRegister3(Application.ProductName, "chi", Application.ProductVersion);
+ PUB.CheckNRegister5(Application.ProductName, "chi", Application.ProductVersion,PUB.setting.MCID,PUB.setting.AGV_ADDRESS);
if (PUB.setting.StartLog)
MenuLog.PerformClick();
diff --git a/HMI/TestProject/Test_ACS/MainForm.cs b/HMI/TestProject/Test_ACS/MainForm.cs
index f7fdd61..ecc0ebe 100644
--- a/HMI/TestProject/Test_ACS/MainForm.cs
+++ b/HMI/TestProject/Test_ACS/MainForm.cs
@@ -358,7 +358,7 @@ namespace Test_ACS
{
// LiftControl: data = TargetID(2 hex) + LiftCommand(1 byte)
var targetID = selectedAGV.ToString("X2");
- var dataStr = targetID + liftCmd.ToString("X2");
+ var dataStr = targetID + ((byte)liftCmd).ToString("X2");
SendCommand(AGVCommandHE.LiftControl, dataStr);
}