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

김민성 수석님. 구매 관련 수정

Browse Source
This commit is contained in:
chi
2019-12-12 16:01:21 +09:00
parent e0dd8f9482
commit d73a2e212a
9 changed files with 161 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
DLL/Newtonsoft.Json.dll Normal file
View File

Binary file not shown.

8
Project/Device/Barcode.cs
View File

@@ -354,7 +354,7 @@ namespace Project.Device
/// <summary>
/// 시리얼포트의 핀 상태값이 변경될 때 발생합니다.
/// </summary>
public event EventHandler<System.IO.Ports.SerialPinChangedEventArgs> serialPinchanged;
//public event EventHandler<System.IO.Ports.SerialPinChangedEventArgs> serialPinchanged;
#endregion
@@ -817,7 +817,7 @@ namespace Project.Device
errorMessage = string.Empty;
_isSync = true;
byte[] recvbuf = null;
Boolean bRet = false;
// Boolean bRet = false;
//171214
if (!IsOpen)
@@ -980,13 +980,13 @@ namespace Project.Device
if (!bTimeOut)
{
recvbuf = _buffer.ToArray();
bRet = true;
//bRet = true;
}
}
catch (Exception ex)
{
errorMessage = ex.Message;
bRet = false;
//bRet = false;
}
}

13
Project/EETGW.csproj
View File

@@ -133,18 +133,6 @@
</Reference>
<Reference Include="Microsoft.ReportViewer.Common, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
<Reference Include="Microsoft.ReportViewer.WinForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="StackExchange.Redis, Version=1.0.316.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.1.0.481\lib\net45\StackExchange.Redis.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="StackExchange.Redis.Extender, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.Extender.1.0.5\lib\StackExchange.Redis.Extender.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
@@ -383,7 +371,6 @@
<None Include="dsMSSQL.xss">
<DependentUpon>dsMSSQL.xsd</DependentUpon>
</None>
<None Include="packages.config" />
<None Include="Properties\app.manifest" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>

4
Project/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("19.11.29.1630")]
[assembly: AssemblyFileVersion("19.11.29.1630")]
[assembly: AssemblyVersion("19.12.11.0950")]
[assembly: AssemblyFileVersion("19.12.11.0950")]

82
Project/StateMachine/_BW.cs
View File

@@ -17,49 +17,49 @@ namespace Project
{
while (bBW)
{
if (redisConnection == null)
{
var ts = DateTime.Now - redisTryTime;
if (ts.TotalMinutes > 5)
{
Console.WriteLine("redis conn : 10.131.36.57:6379");
try
{
redisConnection = StackExchange.Redis.ConnectionMultiplexer.Connect("10.131.36.57:6379");
}
catch (Exception ex)
{
//if (redisConnection == null)
//{
// var ts = DateTime.Now - redisTryTime;
// if (ts.TotalMinutes > 5)
// {
// Console.WriteLine("redis conn : 10.131.36.57:6379");
// try
// {
// redisConnection = StackExchange.Redis.ConnectionMultiplexer.Connect("10.131.36.57:6379");
// }
// catch (Exception ex)
// {
}
}
}
else
{
if (redisConnection.IsConnected)
{
if (this.db == null)
{
try
{
Console.WriteLine("redis connected setting db");
this.db = redisConnection.GetDatabase();
var getStr = this.db.StringGet("test");
Console.WriteLine(getStr);
}
catch (Exception ex)
{
Pub.log.AddE("REDIS " + ex.Message);
}
// }
// }
//}
//else
//{
// if (redisConnection.IsConnected)
// {
// if (this.db == null)
// {
// try
// {
// Console.WriteLine("redis connected setting db");
// this.db = redisConnection.GetDatabase();
// var getStr = this.db.StringGet("test");
// Console.WriteLine(getStr);
// }
// catch (Exception ex)
// {
// Pub.log.AddE("REDIS " + ex.Message);
// }
}
}
else
{
Console.WriteLine("resetting redis connection");
redisConnection.Dispose();
redisConnection = null;
}
}
// }
// }
// else
// {
// Console.WriteLine("resetting redis connection");
// redisConnection.Dispose();
// redisConnection = null;
// }
//}
System.Threading.Thread.Sleep(5000);

14
Project/StateMachine/_TMDisplay.cs
View File

@@ -23,13 +23,13 @@ namespace Project
}
else sbBWRun.BackColor = Color.Red;
sbBCD.BackColor = Pub.barcode.IsInit ? Color.Lime : Color.Red;
if (redisConnection == null) this.sbRedis.ForeColor = Color.DimGray;
else if (redisConnection.IsConnected)
{
if (db == null) this.sbRedis.ForeColor = Color.Blue;
else this.sbRedis.ForeColor = Color.Green;
}
else this.sbRedis.ForeColor = Color.Red;
//if (redisConnection == null) this.sbRedis.ForeColor = Color.DimGray;
//else if (redisConnection.IsConnected)
//{
// if (db == null) this.sbRedis.ForeColor = Color.Blue;
// else this.sbRedis.ForeColor = Color.Green;
//}
//else this.sbRedis.ForeColor = Color.Red;
}
}

195
Project/_Common/fUserList.Designer.cs generated
View File

@@ -53,17 +53,6 @@
this.btDevel = new System.Windows.Forms.ToolStripDropDownButton();
this.한글이름분리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dv1 = new System.Windows.Forms.DataGridView();
this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.iDChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.passwordChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.mailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.autoResizeColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.cmbdept = new System.Windows.Forms.ToolStripComboBox();
this.btRef = new System.Windows.Forms.ToolStripButton();
this.textBox1 = new System.Windows.Forms.TextBox();
this.dvc_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dvc_level = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -77,7 +66,18 @@
this.hpDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.placeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.autoResizeColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
this.iDChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.passwordChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.mailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.cmbdept = new System.Windows.Forms.ToolStripComboBox();
this.btRef = new System.Windows.Forms.ToolStripButton();
this.textBox1 = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -109,6 +109,7 @@
this.tam.LineCodeTableAdapter = null;
this.tam.ProjectsTableAdapter = null;
this.tam.UpdateOrder = Project.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
this.tam.UserGroupTableAdapter = null;
this.tam.UsersTableAdapter = this.ta;
//
// bn
@@ -287,92 +288,6 @@
this.dv1.Size = new System.Drawing.Size(755, 373);
this.dv1.TabIndex = 1;
//
// cm1
//
this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.autoResizeColumnToolStripMenuItem,
this.toolStripMenuItem2,
this.iDChangeToolStripMenuItem,
this.passwordChangeToolStripMenuItem,
this.toolStripMenuItem1,
this.mailToolStripMenuItem});
this.cm1.Name = "cm1";
this.cm1.Size = new System.Drawing.Size(181, 126);
//
// iDChangeToolStripMenuItem
//
this.iDChangeToolStripMenuItem.Name = "iDChangeToolStripMenuItem";
this.iDChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.iDChangeToolStripMenuItem.Text = "ID Change";
this.iDChangeToolStripMenuItem.Click += new System.EventHandler(this.iDChangeToolStripMenuItem_Click);
//
// passwordChangeToolStripMenuItem
//
this.passwordChangeToolStripMenuItem.Name = "passwordChangeToolStripMenuItem";
this.passwordChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.passwordChangeToolStripMenuItem.Text = "Password Change";
this.passwordChangeToolStripMenuItem.Click += new System.EventHandler(this.passwordChangeToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6);
//
// mailToolStripMenuItem
//
this.mailToolStripMenuItem.Name = "mailToolStripMenuItem";
this.mailToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.mailToolStripMenuItem.Text = "Mail";
this.mailToolStripMenuItem.Click += new System.EventHandler(this.mailToolStripMenuItem_Click);
//
// autoResizeColumnToolStripMenuItem
//
this.autoResizeColumnToolStripMenuItem.Name = "autoResizeColumnToolStripMenuItem";
this.autoResizeColumnToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.autoResizeColumnToolStripMenuItem.Text = "AutoResize Column";
this.autoResizeColumnToolStripMenuItem.Click += new System.EventHandler(this.autoResizeColumnToolStripMenuItem_Click);
//
// toolStrip1
//
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripLabel1,
this.cmbdept,
this.btRef});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(755, 25);
this.toolStrip1.TabIndex = 2;
this.toolStrip1.Text = "toolStrip1";
//
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
this.toolStripLabel1.Size = new System.Drawing.Size(43, 22);
this.toolStripLabel1.Text = "Depart";
//
// cmbdept
//
this.cmbdept.Name = "cmbdept";
this.cmbdept.Size = new System.Drawing.Size(121, 25);
//
// btRef
//
this.btRef.Image = ((System.Drawing.Image)(resources.GetObject("btRef.Image")));
this.btRef.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btRef.Name = "btRef";
this.btRef.Size = new System.Drawing.Size(66, 22);
this.btRef.Text = "Refresh";
this.btRef.Click += new System.EventHandler(this.btRef_Click);
//
// textBox1
//
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ads_title", true));
this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.textBox1.Location = new System.Drawing.Point(0, 398);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(755, 21);
this.textBox1.TabIndex = 3;
//
// dvc_id
//
this.dvc_id.DataPropertyName = "id";
@@ -470,11 +385,97 @@
this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn";
this.memoDataGridViewTextBoxColumn.Width = 66;
//
// cm1
//
this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.autoResizeColumnToolStripMenuItem,
this.toolStripMenuItem2,
this.iDChangeToolStripMenuItem,
this.passwordChangeToolStripMenuItem,
this.toolStripMenuItem1,
this.mailToolStripMenuItem});
this.cm1.Name = "cm1";
this.cm1.Size = new System.Drawing.Size(181, 104);
//
// autoResizeColumnToolStripMenuItem
//
this.autoResizeColumnToolStripMenuItem.Name = "autoResizeColumnToolStripMenuItem";
this.autoResizeColumnToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.autoResizeColumnToolStripMenuItem.Text = "AutoResize Column";
this.autoResizeColumnToolStripMenuItem.Click += new System.EventHandler(this.autoResizeColumnToolStripMenuItem_Click);
//
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(177, 6);
//
// iDChangeToolStripMenuItem
//
this.iDChangeToolStripMenuItem.Name = "iDChangeToolStripMenuItem";
this.iDChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.iDChangeToolStripMenuItem.Text = "ID Change";
this.iDChangeToolStripMenuItem.Click += new System.EventHandler(this.iDChangeToolStripMenuItem_Click);
//
// passwordChangeToolStripMenuItem
//
this.passwordChangeToolStripMenuItem.Name = "passwordChangeToolStripMenuItem";
this.passwordChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.passwordChangeToolStripMenuItem.Text = "Password Change";
this.passwordChangeToolStripMenuItem.Click += new System.EventHandler(this.passwordChangeToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6);
//
// mailToolStripMenuItem
//
this.mailToolStripMenuItem.Name = "mailToolStripMenuItem";
this.mailToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.mailToolStripMenuItem.Text = "Mail";
this.mailToolStripMenuItem.Click += new System.EventHandler(this.mailToolStripMenuItem_Click);
//
// toolStrip1
//
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripLabel1,
this.cmbdept,
this.btRef});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(755, 25);
this.toolStrip1.TabIndex = 2;
this.toolStrip1.Text = "toolStrip1";
//
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
this.toolStripLabel1.Size = new System.Drawing.Size(43, 22);
this.toolStripLabel1.Text = "Depart";
//
// cmbdept
//
this.cmbdept.Name = "cmbdept";
this.cmbdept.Size = new System.Drawing.Size(300, 25);
//
// btRef
//
this.btRef.Image = ((System.Drawing.Image)(resources.GetObject("btRef.Image")));
this.btRef.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btRef.Name = "btRef";
this.btRef.Size = new System.Drawing.Size(66, 22);
this.btRef.Text = "Refresh";
this.btRef.Click += new System.EventHandler(this.btRef_Click);
//
// textBox1
//
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ads_title", true));
this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.textBox1.Location = new System.Drawing.Point(0, 398);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(755, 21);
this.textBox1.TabIndex = 3;
//
// fUserList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

18
Project/fMain.cs
View File

@@ -6,7 +6,7 @@ using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using StackExchange.Redis;
//using StackExchange.Redis;
namespace Project
{
@@ -48,12 +48,12 @@ namespace Project
return;
}
//close redis
if (this.redisConnection != null && this.redisConnection.IsConnected && this.db != null)
{
this.redisConnection.Close();
this.redisConnection.Dispose();
}
////close redis
//if (this.redisConnection != null && this.redisConnection.IsConnected && this.db != null)
//{
// this.redisConnection.Close();
// this.redisConnection.Dispose();
//}
Pub.log.Add("Program Close");
Pub.log.Flush();
@@ -61,8 +61,8 @@ namespace Project
if (bw.IsBusy) bw.CancelAsync();
}
ConnectionMultiplexer redisConnection;
IDatabase db;
//ConnectionMultiplexer redisConnection;
//IDatabase db;
private void __Load(object sender, EventArgs e)
{

6
Project/packages.config
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
<package id="StackExchange.Redis" version="1.0.481" targetFramework="net45" />
<package id="StackExchange.Redis.Extender" version="1.0.5" targetFramework="net45" />
</packages>