diff --git a/JobReportMailService/Properties/AssemblyInfo.cs b/JobReportMailService/Properties/AssemblyInfo.cs
index 9b34613..5c84a5d 100644
--- a/JobReportMailService/Properties/AssemblyInfo.cs
+++ b/JobReportMailService/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
// 기본값으로 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("21.05.28.1120")]
-[assembly: AssemblyFileVersion("21.05.28.1120")]
+[assembly: AssemblyVersion("21.05.31.0930")]
+[assembly: AssemblyFileVersion("21.05.31.0930")]
diff --git a/JobReportMailService/fJobReportWeek.cs b/JobReportMailService/fJobReportWeek.cs
index 5e05011..df3fcd1 100644
--- a/JobReportMailService/fJobReportWeek.cs
+++ b/JobReportMailService/fJobReportWeek.cs
@@ -154,7 +154,7 @@ namespace JobReportMailService
//이 날짜가 휴일인지 체크한다.
db = new EEEntities();
- var Holyinfo = db.HolidayLIst.Where(t => t.pdate == jobdata.package).FirstOrDefault();
+ var Holyinfo = db.HolidayLIst.Where(t => t.pdate == jobdata.pdate).FirstOrDefault();
if (Holyinfo != null && Holyinfo.free != null && (bool)(Holyinfo.free)) continue;
//이날짜에는 8시간을 근무 해야 한다
diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index 498a69d..e60577c 100644
--- a/Project/Properties/AssemblyInfo.cs
+++ b/Project/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("21.05.25.1500")]
-[assembly: AssemblyFileVersion("21.05.25.1500")]
+[assembly: AssemblyVersion("21.05.31.1330")]
+[assembly: AssemblyFileVersion("21.05.31.1330")]
diff --git a/SubProject/FCM0000/Item/fLovItem.Designer.cs b/SubProject/FCM0000/Item/fLovItem.Designer.cs
index 348808a..60e4b49 100644
--- a/SubProject/FCM0000/Item/fLovItem.Designer.cs
+++ b/SubProject/FCM0000/Item/fLovItem.Designer.cs
@@ -154,7 +154,7 @@
priceLabel.AutoSize = true;
priceLabel.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
priceLabel.ForeColor = System.Drawing.Color.White;
- priceLabel.Location = new System.Drawing.Point(24, 371);
+ priceLabel.Location = new System.Drawing.Point(24, 388);
priceLabel.Name = "priceLabel";
priceLabel.Size = new System.Drawing.Size(42, 21);
priceLabel.TabIndex = 18;
@@ -166,7 +166,7 @@
label1.AutoSize = true;
label1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
label1.ForeColor = System.Drawing.Color.White;
- label1.Location = new System.Drawing.Point(24, 402);
+ label1.Location = new System.Drawing.Point(24, 419);
label1.Name = "label1";
label1.Size = new System.Drawing.Size(42, 21);
label1.TabIndex = 20;
@@ -178,7 +178,7 @@
label2.AutoSize = true;
label2.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
label2.ForeColor = System.Drawing.Color.White;
- label2.Location = new System.Drawing.Point(24, 340);
+ label2.Location = new System.Drawing.Point(24, 357);
label2.Name = "label2";
label2.Size = new System.Drawing.Size(42, 21);
label2.TabIndex = 22;
@@ -190,7 +190,6 @@
this.bn.BindingSource = this.bs;
this.bn.CountItem = this.bindingNavigatorCountItem;
this.bn.DeleteItem = null;
- this.bn.Dock = System.Windows.Forms.DockStyle.Bottom;
this.bn.ImageScalingSize = new System.Drawing.Size(30, 30);
this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.bindingNavigatorMoveFirstItem,
@@ -207,7 +206,7 @@
this.tbFind,
this.btFind,
this.btAdd});
- this.bn.Location = new System.Drawing.Point(0, 624);
+ this.bn.Location = new System.Drawing.Point(0, 0);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
@@ -263,7 +262,6 @@
//
this.bindingNavigatorPositionItem.AccessibleName = "위치";
this.bindingNavigatorPositionItem.AutoSize = false;
- this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem.Text = "0";
@@ -315,7 +313,6 @@
// tbFind
//
this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbFind.Name = "tbFind";
this.tbFind.Size = new System.Drawing.Size(150, 37);
this.tbFind.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
@@ -358,9 +355,9 @@
this.panel1.Controls.Add(priceLabel);
this.panel1.Controls.Add(this.priceTextBox);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel1.Location = new System.Drawing.Point(794, 0);
+ this.panel1.Location = new System.Drawing.Point(794, 37);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(290, 438);
+ this.panel1.Size = new System.Drawing.Size(290, 455);
this.panel1.TabIndex = 2;
//
// linkLabel1
@@ -369,7 +366,7 @@
this.linkLabel1.AutoSize = true;
this.linkLabel1.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.linkLabel1.ForeColor = System.Drawing.Color.White;
- this.linkLabel1.Location = new System.Drawing.Point(11, 184);
+ this.linkLabel1.Location = new System.Drawing.Point(11, 201);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(58, 21);
this.linkLabel1.TabIndex = 27;
@@ -383,7 +380,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.pictureBox1.BackColor = System.Drawing.Color.Black;
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.pictureBox1.Location = new System.Drawing.Point(74, 184);
+ this.pictureBox1.Location = new System.Drawing.Point(74, 201);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(202, 146);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -394,7 +391,7 @@
//
this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "unit", true));
- this.textBox3.Location = new System.Drawing.Point(237, 337);
+ this.textBox3.Location = new System.Drawing.Point(237, 354);
this.textBox3.Name = "textBox3";
this.textBox3.ReadOnly = true;
this.textBox3.Size = new System.Drawing.Size(38, 25);
@@ -404,7 +401,7 @@
//
this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "scale", true));
- this.textBox2.Location = new System.Drawing.Point(75, 337);
+ this.textBox2.Location = new System.Drawing.Point(75, 354);
this.textBox2.Name = "textBox2";
this.textBox2.ReadOnly = true;
this.textBox2.Size = new System.Drawing.Size(156, 25);
@@ -414,7 +411,7 @@
//
this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true));
- this.textBox1.Location = new System.Drawing.Point(75, 400);
+ this.textBox1.Location = new System.Drawing.Point(75, 417);
this.textBox1.Name = "textBox1";
this.textBox1.ReadOnly = true;
this.textBox1.Size = new System.Drawing.Size(200, 25);
@@ -448,14 +445,14 @@
this.memoTextBox.Multiline = true;
this.memoTextBox.Name = "memoTextBox";
this.memoTextBox.ReadOnly = true;
- this.memoTextBox.Size = new System.Drawing.Size(200, 94);
+ this.memoTextBox.Size = new System.Drawing.Size(200, 111);
this.memoTextBox.TabIndex = 13;
//
// priceTextBox
//
this.priceTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.priceTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "price", true));
- this.priceTextBox.Location = new System.Drawing.Point(75, 369);
+ this.priceTextBox.Location = new System.Drawing.Point(75, 386);
this.priceTextBox.Name = "priceTextBox";
this.priceTextBox.ReadOnly = true;
this.priceTextBox.Size = new System.Drawing.Size(200, 25);
@@ -485,11 +482,11 @@
this.fpSpread1.AccessibleDescription = "";
this.fpSpread1.ContextMenuStrip = this.cm1;
this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.fpSpread1.Location = new System.Drawing.Point(0, 0);
+ this.fpSpread1.Location = new System.Drawing.Point(0, 37);
this.fpSpread1.Name = "fpSpread1";
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread1_Sheet1});
- this.fpSpread1.Size = new System.Drawing.Size(794, 438);
+ this.fpSpread1.Size = new System.Drawing.Size(794, 455);
this.fpSpread1.TabIndex = 4;
//
// cm1
@@ -722,7 +719,7 @@
this.panel2.Controls.Add(this.arDatagridView1);
this.panel2.Controls.Add(this.label3);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel2.Location = new System.Drawing.Point(0, 438);
+ this.panel2.Location = new System.Drawing.Point(0, 492);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(1084, 186);
this.panel2.TabIndex = 7;
@@ -730,7 +727,7 @@
// fLovItem
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.ClientSize = new System.Drawing.Size(1084, 661);
+ this.ClientSize = new System.Drawing.Size(1084, 678);
this.Controls.Add(this.fpSpread1);
this.Controls.Add(this.panel1);
this.Controls.Add(this.panel2);
diff --git a/SubProject/FCM0000/Item/fLovItem.cs b/SubProject/FCM0000/Item/fLovItem.cs
index 78d26f7..4c94c5c 100644
--- a/SubProject/FCM0000/Item/fLovItem.cs
+++ b/SubProject/FCM0000/Item/fLovItem.cs
@@ -50,14 +50,17 @@ namespace FCM0000
this.fpSpread1.KeyDown += (s1, e1) => { btOK.PerformClick(); };
this.fpSpread1.CellDoubleClick += (s1, e1) => { btOK.PerformClick(); };
this.tbFind.Text = search_;
+ this.StartPosition = FormStartPosition.CenterScreen;
}
private void fLovItem_Load(object sender, EventArgs e)
{
- refreshData(this.tbFind.Text);
this.Show();
Application.DoEvents();
- if (this.bs.Count >0) fpSpread1.Focus();
+
+ refreshData(this.tbFind.Text);
+
+ if (this.bs.Count > 0) fpSpread1.Focus();
else
{
tbFind.Focus();
@@ -68,9 +71,10 @@ namespace FCM0000
Boolean searchOk = false;
void refreshData(string search)
{
- if(search == "")
+ if (search == "")
{
- // MessageBox.Show("검색어가 없습니다.");
+
+ FCOMMON.Util.MsgI("(품명,모델,SID)을 검색 한 후 없는 경우 '품목추가' 버튼을 이용해서 추가 하시기 바랍니다");
tbFind.Focus();
}
else
@@ -84,8 +88,8 @@ namespace FCM0000
this.arDatagridView1.AutoResizeColumns();
searchOk = true;
}
-
-
+
+
}
private void itemsBindingNavigatorSaveItem_Click(object sender, EventArgs e)
@@ -146,7 +150,7 @@ namespace FCM0000
if (img1 != null) this.pictureBox1.Image = img1;
else this.pictureBox1.Image = null;
}
- catch
+ catch
{
this.pictureBox1.Image = null;
}
@@ -219,14 +223,19 @@ namespace FCM0000
void Find()
{
var search = tbFind.Text.Trim();
- refreshData(search);
+ if (search.isEmpty())
+ {
+ FCOMMON.Util.MsgE("검색어를 입력하세요");
+ return;
+ }
+ else refreshData(search);
tbFind.SelectAll();
tbFind.Focus();
}
private void btAdd_Click(object sender, EventArgs e)
{
- if(searchOk==false)
+ if (searchOk == false)
{
FCOMMON.Util.MsgE("먼저 검색을 통해서 아이템을 찾은 후 없다면 신규추가를 눌러 주세요");
tbFind.Focus();
@@ -234,15 +243,15 @@ namespace FCM0000
return;
}
var f = new Item.fItemAdd();
- if(f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+ if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
itemName = f.tbName.Text.Trim();
item = f.newIDX;
itemmodel = f.tbModel.Text.Trim();
itemManu = f.tbManu.Text.Trim();
decimal price;
- decimal.TryParse(f.tbPrice.Text.Replace(",",""),out price);
- itemprice =price;// decimal.Parse(f.tbPrice.Text.Trim().Replace(",",""));
+ decimal.TryParse(f.tbPrice.Text.Replace(",", ""), out price);
+ itemprice = price;// decimal.Parse(f.tbPrice.Text.Trim().Replace(",",""));
SID = f.tbSid.Text.Trim();
itemUnit = f.tbUnit.Text.Trim();
itemSupply = f.tbSupply.Text.Trim();
diff --git a/SubProject/FCM0000/Item/fLovItem.resx b/SubProject/FCM0000/Item/fLovItem.resx
index 49b9bf5..6b4a385 100644
--- a/SubProject/FCM0000/Item/fLovItem.resx
+++ b/SubProject/FCM0000/Item/fLovItem.resx
@@ -230,19 +230,19 @@
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
- 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
+ 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
@@ -295,6 +295,15 @@
705, 17
+
+ True
+
+
+ 705, 17
+
+
+ 614, 17
+
614, 17
diff --git a/SubProject/FCM0000/fLovProject.Designer.cs b/SubProject/FCM0000/fLovProject.Designer.cs
index a3b26f4..4326517 100644
--- a/SubProject/FCM0000/fLovProject.Designer.cs
+++ b/SubProject/FCM0000/fLovProject.Designer.cs
@@ -36,7 +36,8 @@
System.Windows.Forms.Label edateLabel;
System.Windows.Forms.Label memoLabel;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLovProject));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsMSSQL = new FCM0000.dsMSSQL();
@@ -60,11 +61,15 @@
this.memoTextBox = new System.Windows.Forms.TextBox();
this.ta = new FCM0000.dsMSSQLTableAdapters.ProjectsTableAdapter();
this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager();
+ this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.sdate = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.status = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.userManager = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.reqstaffDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
+ this.tbFind = new System.Windows.Forms.ToolStripTextBox();
+ this.btFGind = new System.Windows.Forms.ToolStripButton();
pdateLabel = new System.Windows.Forms.Label();
requestLabel = new System.Windows.Forms.Label();
reqstaffLabel = new System.Windows.Forms.Label();
@@ -150,7 +155,10 @@
this.bindingNavigatorMoveNextItem,
this.bindingNavigatorMoveLastItem,
this.bindingNavigatorSeparator2,
- this.btOK});
+ this.btOK,
+ this.toolStripLabel1,
+ this.tbFind,
+ this.btFGind});
this.bn.Location = new System.Drawing.Point(0, 459);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
@@ -247,8 +255,8 @@
this.btOK.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.btOK.Image = ((System.Drawing.Image)(resources.GetObject("btOK.Image")));
this.btOK.Name = "btOK";
- this.btOK.Size = new System.Drawing.Size(76, 22);
- this.btOK.Text = "Select(&O)";
+ this.btOK.Size = new System.Drawing.Size(68, 22);
+ this.btOK.Text = "선택(&O)";
this.btOK.Click += new System.EventHandler(this.itemsBindingNavigatorSaveItem_Click);
//
// dv
@@ -260,21 +268,22 @@
this.dv.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
this.dv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.idx,
this.sdate,
this.status,
this.nameDataGridViewTextBoxColumn,
this.userManager,
this.reqstaffDataGridViewTextBoxColumn});
this.dv.DataSource = this.bs;
- dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle1.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(1, 3, 1, 3);
- dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dv.DefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle4.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle4.Padding = new System.Windows.Forms.Padding(1, 3, 1, 3);
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dv.DefaultCellStyle = dataGridViewCellStyle4;
this.dv.Dock = System.Windows.Forms.DockStyle.Fill;
this.dv.Location = new System.Drawing.Point(0, 0);
this.dv.Name = "dv";
@@ -381,6 +390,16 @@
this.tam.StaffTableAdapter = null;
this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
//
+ // idx
+ //
+ this.idx.DataPropertyName = "idx";
+ dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
+ this.idx.DefaultCellStyle = dataGridViewCellStyle3;
+ this.idx.HeaderText = "IDX";
+ this.idx.Name = "idx";
+ this.idx.ReadOnly = true;
+ this.idx.Width = 56;
+ //
// sdate
//
this.sdate.DataPropertyName = "sdate";
@@ -423,6 +442,30 @@
this.reqstaffDataGridViewTextBoxColumn.Name = "reqstaffDataGridViewTextBoxColumn";
this.reqstaffDataGridViewTextBoxColumn.ReadOnly = true;
//
+ // toolStripLabel1
+ //
+ this.toolStripLabel1.Name = "toolStripLabel1";
+ this.toolStripLabel1.Size = new System.Drawing.Size(31, 22);
+ this.toolStripLabel1.Text = "검색";
+ //
+ // toolStripTextBox1
+ //
+ this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
+ this.tbFind.Name = "toolStripTextBox1";
+ this.tbFind.Size = new System.Drawing.Size(100, 25);
+ this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.toolStripTextBox1_KeyDown);
+ //
+ // btFGind
+ //
+ this.btFGind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ this.btFGind.Image = ((System.Drawing.Image)(resources.GetObject("btFGind.Image")));
+ this.btFGind.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.btFGind.Name = "btFGind";
+ this.btFGind.Size = new System.Drawing.Size(23, 22);
+ this.btFGind.Text = "toolStripButton1";
+ this.btFGind.Click += new System.EventHandler(this.btFGind_Click);
+ //
// fLovProject
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -472,10 +515,14 @@
private System.Windows.Forms.TextBox edateTextBox;
private System.Windows.Forms.TextBox memoTextBox;
private dsMSSQLTableAdapters.TableAdapterManager tam;
+ private System.Windows.Forms.DataGridViewTextBoxColumn idx;
private System.Windows.Forms.DataGridViewTextBoxColumn sdate;
private System.Windows.Forms.DataGridViewTextBoxColumn status;
private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn userManager;
private System.Windows.Forms.DataGridViewTextBoxColumn reqstaffDataGridViewTextBoxColumn;
+ private System.Windows.Forms.ToolStripLabel toolStripLabel1;
+ private System.Windows.Forms.ToolStripTextBox tbFind;
+ private System.Windows.Forms.ToolStripButton btFGind;
}
}
\ No newline at end of file
diff --git a/SubProject/FCM0000/fLovProject.cs b/SubProject/FCM0000/fLovProject.cs
index 503d307..af3aae8 100644
--- a/SubProject/FCM0000/fLovProject.cs
+++ b/SubProject/FCM0000/fLovProject.cs
@@ -16,7 +16,7 @@ namespace FCM0000
string keyword = string.Empty;
string keyword2 = string.Empty;
- public fLovProject(string search_,string stat_="")
+ public fLovProject(string search_, string stat_ = "")
{
InitializeComponent();
Title = string.Empty;
@@ -25,34 +25,38 @@ namespace FCM0000
this.keyword = search_;
this.keyword2 = stat_;
this.KeyPreview = true;
- this.KeyDown += (s1, e1) => {
+ this.KeyDown += (s1, e1) =>
+ {
if (e1.KeyCode == Keys.Escape) this.Close();
};
-
+
}
private void fLovItem_Load(object sender, EventArgs e)
{
//search data
- // var dt = this.ta.GetSearch(this.keyword);
+ // var dt = this.ta.GetSearch(this.keyword);
this.ta.FillSearch(this.dsMSSQL.Projects,
"%" + this.keyword + "%",
FCOMMON.info.Login.gcode,
"%" + this.keyword2 + "%");
+
+ this.StartPosition = FormStartPosition.CenterScreen;
+ bs.Filter = "status <> '취소'";
}
private void bs_CurrentChanged(object sender, EventArgs e)
{
-
+
}
private void dv_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter)
{
-
+
btOK.PerformClick();
- }
+ }
}
private void itemsBindingNavigatorSaveItem_Click(object sender, EventArgs e)
@@ -79,5 +83,34 @@ namespace FCM0000
{
btOK.PerformClick();
}
+
+ private void toolStripTextBox1_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter) btFGind.PerformClick();
+ }
+
+ private void btFGind_Click(object sender, EventArgs e)
+ {
+ var search = tbFind.Text.Trim();
+ if (search.isEmpty())
+ {
+ bs.Filter = "status <> '취소'";
+
+ tbFind.BackColor = SystemColors.Control;
+ }
+ else
+ {
+ if (search.IsNumeric()) bs.Filter = "idx=" + search;
+ else
+ {
+ var Filter = "(name like ? or reqstaff like ? or usermanager like ?) and status <> '취소'";
+ Filter = Filter.Replace("?", "'%" + search.Replace("'", "''") + "%'");
+ bs.Filter = Filter;
+ tbFind.BackColor = Color.Lime;
+ }
+ }
+ tbFind.Focus();
+ tbFind.SelectAll();
+ }
}
}
diff --git a/SubProject/FCM0000/fLovProject.resx b/SubProject/FCM0000/fLovProject.resx
index d442e9f..5093e68 100644
--- a/SubProject/FCM0000/fLovProject.resx
+++ b/SubProject/FCM0000/fLovProject.resx
@@ -192,6 +192,27 @@
dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAInSURBVDhPYxh8oKl/9qMlG/b8b5049z+IP3nBOjA7NDbl
+ FlgBIVDe1Pdo3Y7DQA2pYAMyimr+981e8R9o8BOwAlwgKbvkf9f0Jf9rO6f+b5s0/7+JpR3YAAc3n/9Z
+ JXX/C6pawWJWdi7LtbS0eIBSTCB5hvnz93MUVrd5NPXNBjsVyP7v4R/238Ur4H9OWcP/2LS8/xE5Tf9r
+ Jy77X9IyBSzHxcVTBdTKCDagvn4/y5QF6x4uWrfrf255ExhXT1z1f8ryXf97l2z71Th9w//a3vn/o3Ob
+ /4cnF4JdyMzC8gColRlswMyZM1lBNk9bvPF/dmn9f5CfU3LL/0cn5/xX09ID2whyCUw8Lr0A5LV/QMwK
+ NiAtLY3VNyTmp4Wt03+vwIj/xha2/7X1jf/LKCg9FRUVNZCUkd0qJiH1X0FJ9b+ouOR/Xj7+/4yMjO+A
+ WiFhAALeQVGHQQG36/CZ/6u2HPjfPWPZf2NLuxUgORUNnRWVLRP+r91xCCwHihE+PoHDYI0w4Ood9Ce/
+ ohlsQFpB5f/4jML/usbmV0FyCoqqV0ExADIgNb/if3ph9X8OTq4/YI0w4Oju+x9mAEyRurb+T6AUo7iU
+ zDtQwMEMAIUFKysbOIrhwNrRDRzPoAQEUgAKTF0js/+CSkr8iqrqV0AGgGIJJgcMA1QDQAnEwMQSHHiq
+ mjr/FVXU/0vLKvwXFhaW4uUXvM3Jxf2fjZ0dFH0gjTA8KAADAwCEhSHF3/fidwAAAABJRU5ErkJggg==
+
+
+
+ 81, 17
+
+
+ True
+
True
diff --git a/SubProject/WebServer/App.config b/SubProject/WebServer/App.config
index bb34a86..4ddbd88 100644
--- a/SubProject/WebServer/App.config
+++ b/SubProject/WebServer/App.config
@@ -3,6 +3,9 @@
+
+
+
@@ -32,4 +35,88 @@
+
+
+
+ {
+ "basicGoods": [
+ {
+ "id": "1234561",
+ "name": "Mineral Water 550ml",
+ "barcode": "12421432143214321",
+ "price": "2.00",
+ "num": "1",
+ "amount": "2.00"
+ },
+ {
+ "id": "1234562",
+ "name": "Herbal tea 300ml",
+ "barcode": "12421432143214322",
+ "price": "3.00",
+ "num": "2",
+ "amount": "6.00"
+ },
+ {
+ "id": "1234563",
+ "name": "Delicious potato chips",
+ "barcode": "12421432143214323",
+ "price": "7.00",
+ "num": "4",
+ "amount": "28.00"
+ },
+ {
+ "id": "1234564",
+ "name": "Specially delicious egg rolls",
+ "barcode": "12421432143214324",
+ "price": "8.50",
+ "num": "3",
+ "amount": "25.50"
+ }
+ ],
+ "basicProgress": [
+ {
+ "key": "1",
+ "time": "2017-10-01 14:10",
+ "rate": "Contact Clients",
+ "status": "Processing",
+ "operator": "Pickup Assistant ID1234",
+ "cost": "5mins"
+ },
+ {
+ "key": "2",
+ "time": "2017-10-01 14:05",
+ "rate": "Pickup Guy Departs",
+ "status": "Success",
+ "operator": "Pickup Assistant ID1234",
+ "cost": "1h"
+ },
+ {
+ "key": "3",
+ "time": "2017-10-01 13:05",
+ "rate": "Pick-up person takes orders",
+ "status": "Success",
+ "operator": "Pickup Assistant ID1234",
+ "cost": "5mins"
+ },
+ {
+ "key": "4",
+ "time": "2017-10-01 13:00",
+ "rate": "Apply For Approval",
+ "status": "Success",
+ "operator": "system",
+ "cost": "1h"
+ },
+ {
+ "key": "5",
+ "time": "2017-10-01 12:00",
+ "rate": "Initiated a Return Request",
+ "status": "Success",
+ "operator": "user",
+ "cost": "5mins"
+ }
+ ]
+}
+
+
+
\ No newline at end of file
diff --git a/SubProject/WebServer/Controller/CommonController.cs b/SubProject/WebServer/Controller/CommonController.cs
new file mode 100644
index 0000000..aeb8164
--- /dev/null
+++ b/SubProject/WebServer/Controller/CommonController.cs
@@ -0,0 +1,34 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Web.Http;
+
+namespace WebServer
+{
+ public class CommonController : BaseController
+ {
+
+ [HttpGet]
+ public HttpResponseMessage List()
+ {
+ var db = new EEEntities();
+ var liast = db.Common.Where(t => t.gcode == "EET1P").OrderBy(t => t.code).ToArray();
+
+
+ //System.Web.Http.Results.JsonResult
+ var json = JObject.FromObject(liast);
+ return new HttpResponseMessage()
+ {
+ Content = new StringContent(
+ json.ToString(),
+ System.Text.Encoding.UTF8,
+ "application/json")
+ };
+
+
+ }
+
+
+ }
+}
diff --git a/SubProject/WebServer/Controller/HomeController.cs b/SubProject/WebServer/Controller/HomeController.cs
index 0d71172..caa7034 100644
--- a/SubProject/WebServer/Controller/HomeController.cs
+++ b/SubProject/WebServer/Controller/HomeController.cs
@@ -26,7 +26,7 @@ namespace WebServer
[HttpGet]
public string Test()
{
- return "test";
+ return Properties.Settings.Default.json;
}
[HttpGet]
diff --git a/SubProject/WebServer/Properties/Settings.Designer.cs b/SubProject/WebServer/Properties/Settings.Designer.cs
new file mode 100644
index 0000000..d36ab7c
--- /dev/null
+++ b/SubProject/WebServer/Properties/Settings.Designer.cs
@@ -0,0 +1,59 @@
+//------------------------------------------------------------------------------
+//
+// 이 코드는 도구를 사용하여 생성되었습니다.
+// 런타임 버전:4.0.30319.42000
+//
+// 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면
+// 이러한 변경 내용이 손실됩니다.
+//
+//------------------------------------------------------------------------------
+
+namespace WebServer.Properties {
+
+
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
+ private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+ public static Settings Default {
+ get {
+ return defaultInstance;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("{\n \"basicGoods\": [\n {\n \"id\": \"1234561\",\n \"name\": \"Mineral Water 550" +
+ "ml\",\n \"barcode\": \"12421432143214321\",\n \"price\": \"2.00\",\n \"num\": \"" +
+ "1\",\n \"amount\": \"2.00\"\n },\n {\n \"id\": \"1234562\",\n \"name\": \"He" +
+ "rbal tea 300ml\",\n \"barcode\": \"12421432143214322\",\n \"price\": \"3.00\",\n " +
+ " \"num\": \"2\",\n \"amount\": \"6.00\"\n },\n {\n \"id\": \"1234563\",\n " +
+ " \"name\": \"Delicious potato chips\",\n \"barcode\": \"12421432143214323\",\n \"" +
+ "price\": \"7.00\",\n \"num\": \"4\",\n \"amount\": \"28.00\"\n },\n {\n \"id" +
+ "\": \"1234564\",\n \"name\": \"Specially delicious egg rolls\",\n \"barcode\": \"1" +
+ "2421432143214324\",\n \"price\": \"8.50\",\n \"num\": \"3\",\n \"amount\": \"25." +
+ "50\"\n }\n ],\n \"basicProgress\": [\n {\n \"key\": \"1\",\n \"time\": \"2017-" +
+ "10-01 14:10\",\n \"rate\": \"Contact Clients\",\n \"status\": \"Processing\",\n " +
+ " \"operator\": \"Pickup Assistant ID1234\",\n \"cost\": \"5mins\"\n },\n {\n " +
+ " \"key\": \"2\",\n \"time\": \"2017-10-01 14:05\",\n \"rate\": \"Pickup Guy Depar" +
+ "ts\",\n \"status\": \"Success\",\n \"operator\": \"Pickup Assistant ID1234\",\n " +
+ " \"cost\": \"1h\"\n },\n {\n \"key\": \"3\",\n \"time\": \"2017-10-01 13:05\"," +
+ "\n \"rate\": \"Pick-up person takes orders\",\n \"status\": \"Success\",\n \"" +
+ "operator\": \"Pickup Assistant ID1234\",\n \"cost\": \"5mins\"\n },\n {\n \"" +
+ "key\": \"4\",\n \"time\": \"2017-10-01 13:00\",\n \"rate\": \"Apply For Approval\"," +
+ "\n \"status\": \"Success\",\n \"operator\": \"system\",\n \"cost\": \"1h\"\n }" +
+ ",\n {\n \"key\": \"5\",\n \"time\": \"2017-10-01 12:00\",\n \"rate\": \"Initi" +
+ "ated a Return Request\",\n \"status\": \"Success\",\n \"operator\": \"user\",\n " +
+ " \"cost\": \"5mins\"\n }\n ]\n}")]
+ public string json {
+ get {
+ return ((string)(this["json"]));
+ }
+ set {
+ this["json"] = value;
+ }
+ }
+ }
+}
diff --git a/SubProject/WebServer/Properties/Settings.settings b/SubProject/WebServer/Properties/Settings.settings
new file mode 100644
index 0000000..2b7d8b1
--- /dev/null
+++ b/SubProject/WebServer/Properties/Settings.settings
@@ -0,0 +1,86 @@
+
+
+
+
+
+ {
+ "basicGoods": [
+ {
+ "id": "1234561",
+ "name": "Mineral Water 550ml",
+ "barcode": "12421432143214321",
+ "price": "2.00",
+ "num": "1",
+ "amount": "2.00"
+ },
+ {
+ "id": "1234562",
+ "name": "Herbal tea 300ml",
+ "barcode": "12421432143214322",
+ "price": "3.00",
+ "num": "2",
+ "amount": "6.00"
+ },
+ {
+ "id": "1234563",
+ "name": "Delicious potato chips",
+ "barcode": "12421432143214323",
+ "price": "7.00",
+ "num": "4",
+ "amount": "28.00"
+ },
+ {
+ "id": "1234564",
+ "name": "Specially delicious egg rolls",
+ "barcode": "12421432143214324",
+ "price": "8.50",
+ "num": "3",
+ "amount": "25.50"
+ }
+ ],
+ "basicProgress": [
+ {
+ "key": "1",
+ "time": "2017-10-01 14:10",
+ "rate": "Contact Clients",
+ "status": "Processing",
+ "operator": "Pickup Assistant ID1234",
+ "cost": "5mins"
+ },
+ {
+ "key": "2",
+ "time": "2017-10-01 14:05",
+ "rate": "Pickup Guy Departs",
+ "status": "Success",
+ "operator": "Pickup Assistant ID1234",
+ "cost": "1h"
+ },
+ {
+ "key": "3",
+ "time": "2017-10-01 13:05",
+ "rate": "Pick-up person takes orders",
+ "status": "Success",
+ "operator": "Pickup Assistant ID1234",
+ "cost": "5mins"
+ },
+ {
+ "key": "4",
+ "time": "2017-10-01 13:00",
+ "rate": "Apply For Approval",
+ "status": "Success",
+ "operator": "system",
+ "cost": "1h"
+ },
+ {
+ "key": "5",
+ "time": "2017-10-01 12:00",
+ "rate": "Initiated a Return Request",
+ "status": "Success",
+ "operator": "user",
+ "cost": "5mins"
+ }
+ ]
+}
+
+
+
\ No newline at end of file
diff --git a/SubProject/WebServer/WebServer.csproj b/SubProject/WebServer/WebServer.csproj
index f957b38..ddf595b 100644
--- a/SubProject/WebServer/WebServer.csproj
+++ b/SubProject/WebServer/WebServer.csproj
@@ -132,6 +132,7 @@
Model1.tt
+
@@ -200,6 +201,11 @@
Model1.tt
+
+ True
+ True
+ Settings.settings
+
Model1.tt
@@ -232,6 +238,10 @@
Model1.edmx
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+